Merge branch 'main' into feature/expand-pulsar-tls-configuration

dapr · May 16, 2024 · c20651a · c20651a
2 parents 9ebd09f + 70fd16a
commit c20651a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bindings/azure/eventhubs/metadata.yaml b/bindings/azure/eventhubs/metadata.yaml
@@ -90,8 +90,8 @@ builtinAuthenticationProfiles:
           entity management is enabled.
 metadata:
   # Input-only metadata
-  # consumerGroup is an alias for consumerId, if both are defined consumerId takes precedence.
-  - name: consumerId
+  # consumerGroup is an alias for consumerID, if both are defined consumerID takes precedence.
+  - name: consumerID
     type: string
     required: true # consumerGroup is an alias for this field, let's promote this to default
     binding:
@@ -108,7 +108,7 @@ metadata:
       output: false
     description: |
       The name of the Event Hubs Consumer Group to listen on.
-      Alias to consumerId.
+      Alias to consumerID.
     example: '"group1"'
     deprecated: true
   - name: storageAccountKey

diff --git a/pubsub/azure/eventhubs/metadata.yaml b/pubsub/azure/eventhubs/metadata.yaml
@@ -97,7 +97,7 @@ metadata:
     description: |
       Storage container name.
     example: '"myeventhubstoragecontainer"'
-  - name: consumerId
+  - name: consumerID
     type: string
     required: true # consumerGroup is an alias for this field, let's promote this to default
     description: |

diff --git a/pubsub/rabbitmq/rabbitmq.go b/pubsub/rabbitmq/rabbitmq.go
@@ -521,7 +521,7 @@ func (r *rabbitMQ) subscribeForever(ctx context.Context, req pubsub.SubscribeReq
 
 			msgs, err = channel.Consume(
 				q.Name,
-				queueName,          // consumerId
+				queueName,          // consumerID
 				r.metadata.AutoAck, // autoAck
 				false,              // exclusive
 				false,              // noLocal