For bindings, use strings for source and destination names.

Author: lukebakken

rabbitmq_amqp/amqp_binding.go

@@ -9,10 +9,11 @@ type AMQPBindingInfo struct {
 }
 
 type AMQPBinding struct {
-	sourceExchange   IExchangeSpecification
-	destinationQueue IQueueSpecification
-	bindingKey       string
-	management       *AmqpManagement
+	sourceName      string
+	destinationName string
+	toQueue         bool
+	bindingKey      string
+	management      *AmqpManagement
 }
 
 func newAMQPBinding(management *AmqpManagement) *AMQPBinding {
@@ -25,28 +26,54 @@ func (b *AMQPBinding) Key(bindingKey string) IBindingSpecification {
 }
 
 func (b *AMQPBinding) SourceExchange(exchangeSpec IExchangeSpecification) IBindingSpecification {
-	b.sourceExchange = exchangeSpec
+	b.sourceName = exchangeSpec.GetName()
+	b.toQueue = false
+	return b
+}
+
+func (b *AMQPBinding) SourceExchangeName(exchangeName string) IBindingSpecification {
+	b.sourceName = exchangeName
+	b.toQueue = false
+	return b
+}
+
+func (b *AMQPBinding) DestinationExchange(exchangeSpec IExchangeInfo) IBindingSpecification {
+	b.destinationName = exchangeSpec.GetName()
+	b.toQueue = false
+	return b
+}
+
+func (b *AMQPBinding) DestinationExchangeName(exchangeName string) IBindingSpecification {
+	b.destinationName = exchangeName
+	b.toQueue = false
 	return b
 }
 
 func (b *AMQPBinding) DestinationQueue(queueSpec IQueueSpecification) IBindingSpecification {
-	b.destinationQueue = queueSpec
+	b.destinationName = queueSpec.GetName()
+	b.toQueue = true
+	return b
+}
+
+func (b *AMQPBinding) DestinationQueueName(queueName string) IBindingSpecification {
+	b.destinationName = queueName
+	b.toQueue = true
 	return b
 }
 
 func (b *AMQPBinding) Bind(ctx context.Context) error {
 	path := bindingPath()
 	kv := make(map[string]any)
 	kv["binding_key"] = b.bindingKey
-	kv["source"] = b.sourceExchange.GetName()
-	kv["destination_queue"] = b.destinationQueue.GetName()
+	kv["source"] = b.sourceName
+	kv["destination_queue"] = b.destinationName
 	kv["arguments"] = make(map[string]any)
 	_, err := b.management.Request(ctx, kv, path, commandPost, []int{responseCode204})
 	return err
 }
 
 func (b *AMQPBinding) Unbind(ctx context.Context) error {
-	bindingPathWithExchangeQueueKey := bindingPathWithExchangeQueueKey(b.sourceExchange, b.destinationQueue, b.bindingKey)
+	bindingPathWithExchangeQueueKey := bindingPathWithExchangeQueueKey(b.toQueue, b.sourceName, b.destinationName, b.bindingKey)
 	_, err := b.management.Request(ctx, amqp.Null{}, bindingPathWithExchangeQueueKey, commandDelete, []int{responseCode204})
 	return err
 }

rabbitmq_amqp/common.go

@@ -86,14 +86,16 @@ func bindingPath() string {
 	return "/" + Bindings
 }
 
-func bindingPathWithExchangeQueueKey(exchangeSpec IExchangeSpecification, queueSpec IQueueSpecification, key string) string {
-	exchangeName := exchangeSpec.GetName()
-	exchangeNameEncoded := encodePathSegments(exchangeName)
-	queueName := queueSpec.GetName()
-	queueNameEncoded := encodePathSegments(queueName)
+func bindingPathWithExchangeQueueKey(toQueue bool, sourceName, destinationName, key string) string {
+	sourceNameEncoded := encodePathSegments(sourceName)
+	destinationNameEncoded := encodePathSegments(destinationName)
 	keyEncoded := encodePathSegments(key)
-	format := "/%s/src=%s;dstq=%s;key=%s;args="
-	return fmt.Sprintf(format, Bindings, exchangeNameEncoded, queueNameEncoded, keyEncoded)
+	destinationType := "dste"
+	if toQueue {
+		destinationType = "dstq"
+	}
+	format := "/%s/src=%s;%s=%s;key=%s;args="
+	return fmt.Sprintf(format, Bindings, sourceNameEncoded, destinationType, destinationNameEncoded, keyEncoded)
 
 }
 

rabbitmq_amqp/entities.go

@@ -87,7 +87,9 @@ type IExchangeSpecification interface {
 
 type IBindingSpecification interface {
 	SourceExchange(exchangeSpec IExchangeSpecification) IBindingSpecification
+	SourceExchangeName(exchangeName string) IBindingSpecification
 	DestinationQueue(queueSpec IQueueSpecification) IBindingSpecification
+	DestinationQueueName(queueName string) IBindingSpecification
 	Key(bindingKey string) IBindingSpecification
 	Bind(ctx context.Context) error
 	Unbind(ctx context.Context) error