Merge branch 'master' into runtime-listen-addresses

dapr · Apr 18, 2024 · d6ea4da · d6ea4da
2 parents ccc92bb + fa211af
commit d6ea4da
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/pkg/actors/reminders/reminders.go b/pkg/actors/reminders/reminders.go
@@ -854,7 +854,7 @@ func (r *reminders) getRemindersForActorType(ctx context.Context, actorType stri
  return reminderRefs, actorMetadata, nil
 }
 
-// getActorMetadata gets the metadata object for the given actor type.
+// getActorTypeMetadata gets the metadata object for the given actor type.
 // If "migrate" is true, it also performs migration of reminders if needed. Note that this should be set to "true" only by a caller who owns a lock via evaluationChan.
 func (r *reminders) getActorTypeMetadata(ctx context.Context, actorType string, migrate bool) (*ActorMetadata, error) {
  storeName, store, err := r.stateStoreProviderFn()

diff --git a/pkg/api/grpc/grpc.go b/pkg/api/grpc/grpc.go
@@ -123,7 +123,7 @@ func NewAPI(opts APIOpts) API {
  }
 }
 
-// validateAndGetPubsbuAndTopic validates the request parameters and returns the pubsub interface, pubsub name, topic name, rawPayload metadata if set
+// validateAndGetPubsubAndTopic validates the request parameters and returns the pubsub interface, pubsub name, topic name, rawPayload metadata if set
 // or an error.
 func (a *api) validateAndGetPubsubAndTopic(pubsubName, topic string, reqMeta map[string]string) (pubsub.PubSub, string, string, bool, error) {
  var err error

diff --git a/pkg/apis/httpEndpoint/v1alpha1/types.go b/pkg/apis/httpEndpoint/v1alpha1/types.go
@@ -103,7 +103,7 @@ func (h HTTPEndpoint) HasTLSClientCert() bool {
  return h.Spec.ClientTLS != nil && h.Spec.ClientTLS.Certificate != nil && h.Spec.ClientTLS.Certificate.Value != nil
 }
 
-// HasTLSClientKey returns a bool indicating if the HTTP endpoint contains a tls client key
+// HasTLSPrivateKey returns a bool indicating if the HTTP endpoint contains a tls client key
 func (h HTTPEndpoint) HasTLSPrivateKey() bool {
  return h.Spec.ClientTLS != nil && h.Spec.ClientTLS.PrivateKey != nil && h.Spec.ClientTLS.PrivateKey.Value != nil
 }

diff --git a/pkg/messaging/v1/invoke_method_request.go b/pkg/messaging/v1/invoke_method_request.go
@@ -273,7 +273,7 @@ func (imr *InvokeMethodRequest) ResetMessageData() {
  imr.r.GetMessage().GetData().Reset()
 }
 
-// ContenType returns the content type of the message.
+// ContentType returns the content type of the message.
 func (imr *InvokeMethodRequest) ContentType() string {
  m := imr.r.GetMessage()
  if m == nil {

diff --git a/pkg/messaging/v1/invoke_method_response.go b/pkg/messaging/v1/invoke_method_response.go
@@ -230,7 +230,7 @@ func (imr *InvokeMethodResponse) ResetMessageData() {
  imr.r.GetMessage().GetData().Reset()
 }
 
-// ContenType returns the content type of the message.
+// ContentType returns the content type of the message.
 func (imr *InvokeMethodResponse) ContentType() string {
  m := imr.r.GetMessage()
  if m == nil {