Refactoring package names

Signed-off-by: TKTheTechie <thomas.kunnumpurath@solace.com>

pubsub/solace/amqp/amqp_test.go

@@ -17,11 +17,12 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"errors"
+	"testing"
+
 	mdata "github.com/dapr/components-contrib/metadata"
 	"github.com/dapr/components-contrib/pubsub"
 	"github.com/dapr/kit/logger"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func getFakeProperties() map[string]string {

tests/config/pubsub/solace/amqp/pubsub.yml

@@ -1,9 +1,7 @@
 apiVersion: dapr.io/v1alpha1
 kind: Component
-metadata:
-  name: solace
 spec:
-  type: pubsub.amqp
+  type: pubsub.solace.amqp
   version: v1
   metadata:
     - name: url
@@ -14,4 +12,3 @@ spec:
       value: 'default'
     - name: anonymous
       value: true
-

tests/config/pubsub/tests.yml

@@ -12,7 +12,7 @@
 componentType: pubsub
 components:
   - component: azure.eventhubs
-    operations: ["publish", "subscribe", "multiplehandlers", "bulkpublish"]
+    operations: ['publish', 'subscribe', 'multiplehandlers', 'bulkpublish']
     config:
       pubsubName: azure-eventhubs
       testTopicName: eventhubs-pubsub-topic
@@ -42,13 +42,13 @@ components:
       testMultiTopic2Name: dapr-conf-queue-multi2
       checkInOrderProcessing: false
   - component: redis
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
     config:
       checkInOrderProcessing: false
   - component: natsstreaming
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
   - component: jetstream
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
   - component: kafka
     allOperations: true
   - component: kafka
@@ -58,30 +58,29 @@ components:
     profile: confluent
     allOperations: true
   - component: pulsar
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
   - component: mqtt
     profile: mosquitto
-    operations: ["publish", "subscribe", "multiplehandlers"]
-  - component: amqp
-    profile: solace
-    operations: ["publish", "subscribe"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
+  - component: solace.amqp
+    operations: ['publish', 'subscribe']
   - component: mqtt
     profile: emqx
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
   - component: mqtt
     profile: vernemq
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
   - component: hazelcast
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
   - component: rabbitmq
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
     config:
       checkInOrderProcessing: false
   - component: in-memory
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
   - component: aws.snssqs
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']
     config:
       checkInOrderProcessing: false
   - component: kubemq
-    operations: ["publish", "subscribe", "multiplehandlers"]
+    operations: ['publish', 'subscribe', 'multiplehandlers']

tests/conformance/common.go

@@ -50,7 +50,6 @@ import (
 	b_postgres "github.com/dapr/components-contrib/bindings/postgres"
 	b_rabbitmq "github.com/dapr/components-contrib/bindings/rabbitmq"
 	b_redis "github.com/dapr/components-contrib/bindings/redis"
-	p_amqp "github.com/dapr/components-contrib/pubsub/amqp"
 	p_snssqs "github.com/dapr/components-contrib/pubsub/aws/snssqs"
 	p_eventhubs "github.com/dapr/components-contrib/pubsub/azure/eventhubs"
 	p_servicebusqueues "github.com/dapr/components-contrib/pubsub/azure/servicebus/queues"
@@ -65,6 +64,7 @@ import (
 	p_pulsar "github.com/dapr/components-contrib/pubsub/pulsar"
 	p_rabbitmq "github.com/dapr/components-contrib/pubsub/rabbitmq"
 	p_redis "github.com/dapr/components-contrib/pubsub/redis"
+	p_solaceamqp "github.com/dapr/components-contrib/pubsub/solace/amqp"
 	ss_azure "github.com/dapr/components-contrib/secretstores/azure/keyvault"
 	ss_hashicorp_vault "github.com/dapr/components-contrib/secretstores/hashicorp/vault"
 	ss_kubernetes "github.com/dapr/components-contrib/secretstores/kubernetes"
@@ -402,8 +402,8 @@ func loadPubSub(tc TestComponent) pubsub.PubSub {
 		pubsub = p_snssqs.NewSnsSqs(testLogger)
 	case "kubemq":
 		pubsub = p_kubemq.NewKubeMQ(testLogger)
-	case "amqp":
-		pubsub = p_amqp.NewAMQPPubsub(testLogger)
+	case "solace.amqp":
+		pubsub = p_solaceamqp.NewAMQPPubsub(testLogger)
 	default:
 		return nil
 	}