Merge branch 'master' into workflow-dev

.devcontainer/devcontainer.json

@@ -9,7 +9,9 @@
 
 		// Uncomment to disable docker-in-docker and automatically proxy default /var/run/docker.sock to
 		// the localhost bind-mount /var/run/docker-host.sock.
-		// "BIND_LOCALHOST_DOCKER": "true"
+		// "BIND_LOCALHOST_DOCKER": "true",
+
+		"GOLANG_PROTOBUF_REGISTRATION_CONFLICT": "true"
 	},
 	"extensions": [
 		"golang.go",

tests/certification/pubsub/azure/servicebus/topics/components/authentication/service_bus.yaml

@@ -4,7 +4,7 @@ metadata:
   name: messagebus
   namespace: default
 spec:
-  type: pubsub.azure.servicebus
+  type: pubsub.azure.servicebus.topics
   version: v1
   metadata:
     - name: consumerID

tests/certification/pubsub/azure/servicebus/topics/components/consumer_one/service_bus.yaml

@@ -4,7 +4,7 @@ metadata:
   name: messagebus
   namespace: default
 spec:
-  type: pubsub.azure.servicebus
+  type: pubsub.azure.servicebus.topics
   version: v1
   metadata:
     - name: consumerID

tests/certification/pubsub/azure/servicebus/topics/components/consumer_two/service_bus.yaml

@@ -4,7 +4,7 @@ metadata:
   name: messagebus
   namespace: default
 spec:
-  type: pubsub.azure.servicebus
+  type: pubsub.azure.servicebus.topics
   version: v1
   metadata:
     - name: consumerID

tests/certification/pubsub/azure/servicebus/topics/components/default_ttl/service_bus.yaml

@@ -4,7 +4,7 @@ metadata:
   name: messagebus
   namespace: default
 spec:
-  type: pubsub.azure.servicebus
+  type: pubsub.azure.servicebus.topics
   version: v1
   metadata:
     - name: consumerID

tests/certification/pubsub/azure/servicebus/topics/components/entity_mgmt/service_bus.yaml

@@ -4,7 +4,7 @@ metadata:
   name: messagebus
   namespace: default
 spec:
-  type: pubsub.azure.servicebus
+  type: pubsub.azure.servicebus.topics
   version: v1
   metadata:
     - name: consumerID

tests/certification/pubsub/azure/servicebus/topics/servicebus_test.go

@@ -25,7 +25,7 @@ import (
 
 	// Pub-Sub.
 
-	pubsub_servicebus "github.com/dapr/components-contrib/pubsub/azure/servicebus.topics"
+	pubsub_servicebus "github.com/dapr/components-contrib/pubsub/azure/servicebus/topics"
 	secretstore_env "github.com/dapr/components-contrib/secretstores/local/env"
 	pubsub_loader "github.com/dapr/dapr/pkg/components/pubsub"
 	secretstores_loader "github.com/dapr/dapr/pkg/components/secretstores"
@@ -1050,7 +1050,7 @@ func componentRuntimeOptions() []runtime.Option {
 
 	pubsubRegistry := pubsub_loader.NewRegistry()
 	pubsubRegistry.Logger = log
-	pubsubRegistry.RegisterComponent(pubsub_servicebus.NewAzureServiceBus, "azure.servicebus")
+	pubsubRegistry.RegisterComponent(pubsub_servicebus.NewAzureServiceBusTopics, "azure.servicebus.topics")
 
 	secretstoreRegistry := secretstores_loader.NewRegistry()
 	secretstoreRegistry.Logger = log