API consistency with .NET client

examples/getting_started/main.go

@@ -48,7 +48,7 @@ func main() {
 	}
 	fmt.Printf("Exchange %s created.\n", exchangeInfo.GetName())
 
-	bindingSpec := management.Binding().SourceExchange(exchangeInfo.GetName()).DestinationQueue(queueInfo.GetName()).Key("routing-key")
+	bindingSpec := management.Binding().SourceExchange(exchangeSpec).DestinationQueue(queueSpec).Key("routing-key")
 
 	err = bindingSpec.Bind(context.Background())
 	if err != nil {

go.mod

@@ -3,20 +3,20 @@ module github.com/rabbitmq/rabbitmq-amqp-go-client
 go 1.22.0
 
 require (
+	github.com/Azure/go-amqp v1.1.1-0.20240913224415-f631e6909719
+	github.com/google/uuid v1.6.0
 	github.com/onsi/ginkgo/v2 v2.20.2
 	github.com/onsi/gomega v1.34.2
 )
 
 require (
-	github.com/Azure/go-amqp v1.1.1-0.20240913224415-f631e6909719 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
+	github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/tools v0.25.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,7 +1,5 @@
 github.com/Azure/go-amqp v1.1.1-0.20240913224415-f631e6909719 h1:rL7yrEV9yputQV7T+Y9eJVmTVkK4B0aHlBc8TUITC5A=
 github.com/Azure/go-amqp v1.1.1-0.20240913224415-f631e6909719/go.mod h1:vZAogwdrkbyK3Mla8m/CxSc/aKdnTZ4IbPxl51Y5WZE=
-github.com/Gsantomaggio/go-amqp v0.0.0-20240905094626-af192b497e48 h1:etxEtd7qkhJD34gpQesPbZuMJrqkc+ZOXqR3diVfGWs=
-github.com/Gsantomaggio/go-amqp v0.0.0-20240905094626-af192b497e48/go.mod h1:vZAogwdrkbyK3Mla8m/CxSc/aKdnTZ4IbPxl51Y5WZE=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
@@ -12,8 +10,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
-github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 h1:c5FlPPgxOn7kJz3VoPLkQYQXGBS3EklQ4Zfi57uOuqQ=
+github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
@@ -24,14 +22,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
+golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

rabbitmq_amqp/amqp_binding.go

@@ -9,10 +9,11 @@ type AMQPBindingInfo struct {
 }
 
 type AMQPBinding struct {
-	sourceExchangeName string
-	destinationQueue   string
-	bindingKey         string
-	management         *AmqpManagement
+	sourceName      string
+	destinationName string
+	toQueue         bool
+	bindingKey      string
+	management      *AmqpManagement
 }
 
 func newAMQPBinding(management *AmqpManagement) *AMQPBinding {
@@ -24,31 +25,55 @@ func (b *AMQPBinding) Key(bindingKey string) IBindingSpecification {
 	return b
 }
 
-func (b *AMQPBinding) SourceExchange(exchangeName string) IBindingSpecification {
-	b.sourceExchangeName = exchangeName
+func (b *AMQPBinding) SourceExchange(exchangeSpec IExchangeSpecification) IBindingSpecification {
+	b.sourceName = exchangeSpec.GetName()
+	b.toQueue = false
 	return b
 }
 
-func (b *AMQPBinding) DestinationQueue(queueName string) IBindingSpecification {
-	b.destinationQueue = queueName
+func (b *AMQPBinding) SourceExchangeName(exchangeName string) IBindingSpecification {
+	b.sourceName = exchangeName
+	b.toQueue = false
 	return b
 }
 
-func (b *AMQPBinding) Bind(ctx context.Context) error {
+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.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.sourceExchangeName
-	kv["destination_queue"] = b.destinationQueue
+	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.sourceExchangeName, 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/amqp_binding_test.go

@@ -7,7 +7,6 @@ import (
 )
 
 var _ = Describe("AMQP Bindings test ", func() {
-
 	var connection IConnection
 	var management IManagement
 	BeforeEach(func() {
@@ -26,9 +25,9 @@ var _ = Describe("AMQP Bindings test ", func() {
 		Expect(connection.Close(context.Background())).To(BeNil())
 	})
 
-	It("AMQP Bindings between Exchange and Queue Should success ", func() {
-		const exchangeName = "Exchange_AMQP Bindings between Exchange and Queue Should success"
-		const queueName = "Queue_AMQP Bindings between Exchange and Queue Should success"
+	It("AMQP Bindings between Exchange and Queue Should succeed", func() {
+		const exchangeName = "Exchange_AMQP Bindings between Exchange and Queue should uccess"
+		const queueName = "Queue_AMQP Bindings between Exchange and Queue should succeed"
 		exchangeSpec := management.Exchange(exchangeName)
 		exchangeInfo, err := exchangeSpec.Declare(context.TODO())
 		Expect(err).To(BeNil())
@@ -41,9 +40,7 @@ var _ = Describe("AMQP Bindings test ", func() {
 		Expect(queueInfo).NotTo(BeNil())
 		Expect(queueInfo.GetName()).To(Equal(queueName))
 
-		bindingSpec := management.Binding().SourceExchange(exchangeName).
-			DestinationQueue(queueName).
-			Key("routing-key")
+		bindingSpec := management.Binding().SourceExchange(exchangeSpec).DestinationQueue(queueSpec).Key("routing-key")
 		err = bindingSpec.Bind(context.TODO())
 		Expect(err).To(BeNil())
 		err = bindingSpec.Unbind(context.TODO())
@@ -52,7 +49,5 @@ var _ = Describe("AMQP Bindings test ", func() {
 		Expect(err).To(BeNil())
 		err = queueSpec.Delete(context.TODO())
 		Expect(err).To(BeNil())
-
 	})
-
 })

rabbitmq_amqp/amqp_connection.go

@@ -44,7 +44,6 @@ func (c *ConnectionSettings) Port(port int) IConnectionSettings {
 }
 
 func (c *ConnectionSettings) User(userName string) IConnectionSettings {
-
 	c.user = userName
 	return c
 }
@@ -71,7 +70,6 @@ func (c *ConnectionSettings) GetHost() string {
 func (c *ConnectionSettings) Host(hostName string) IConnectionSettings {
 	c.host = hostName
 	return c
-
 }
 
 func (c *ConnectionSettings) GetPort() int {
@@ -170,6 +168,7 @@ func (a *AmqpConnection) Open(ctx context.Context, connectionSettings IConnectio
 
 	err = a.Management().Open(ctx, a)
 	if err != nil {
+		// TODO close connection?
 		return err
 	}
 	return nil

rabbitmq_amqp/amqp_connection_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 var _ = Describe("AMQP Connection Test", func() {
-	It("AMQP SASLTypeAnonymous Connection should success", func() {
+	It("AMQP SASLTypeAnonymous Connection should succeed", func() {
 		amqpConnection := NewAmqpConnection()
 		Expect(amqpConnection).NotTo(BeNil())
 		Expect(amqpConnection).To(BeAssignableToTypeOf(&AmqpConnection{}))
@@ -17,11 +17,14 @@ var _ = Describe("AMQP Connection Test", func() {
 		Expect(connectionSettings).NotTo(BeNil())
 		connectionSettings.SaslMechanism(SaslMechanism{Type: Anonymous})
 		Expect(connectionSettings).To(BeAssignableToTypeOf(&ConnectionSettings{}))
-		err := amqpConnection.Open(context.TODO(), connectionSettings)
+
+		err := amqpConnection.Open(context.Background(), connectionSettings)
+		Expect(err).To(BeNil())
+		err = amqpConnection.Close(context.Background())
 		Expect(err).To(BeNil())
 	})
 
-	It("AMQP SASLTypePlain Connection should success", func() {
+	It("AMQP SASLTypePlain Connection should succeed", func() {
 		amqpConnection := NewAmqpConnection()
 		Expect(amqpConnection).NotTo(BeNil())
 		Expect(amqpConnection).To(BeAssignableToTypeOf(&AmqpConnection{}))
@@ -30,7 +33,10 @@ var _ = Describe("AMQP Connection Test", func() {
 		Expect(connectionSettings).NotTo(BeNil())
 		Expect(connectionSettings).To(BeAssignableToTypeOf(&ConnectionSettings{}))
 		connectionSettings.SaslMechanism(SaslMechanism{Type: Plain})
-		err := amqpConnection.Open(context.TODO(), connectionSettings)
+
+		err := amqpConnection.Open(context.Background(), connectionSettings)
+		Expect(err).To(BeNil())
+		err = amqpConnection.Close(context.Background())
 		Expect(err).To(BeNil())
 	})
 
@@ -42,12 +48,12 @@ var _ = Describe("AMQP Connection Test", func() {
 		Expect(connectionSettings).NotTo(BeNil())
 		Expect(connectionSettings).To(BeAssignableToTypeOf(&ConnectionSettings{}))
 		connectionSettings.Host("localhost").Port(1234)
-		err := amqpConnection.Open(context.TODO(), connectionSettings)
+
+		err := amqpConnection.Open(context.Background(), connectionSettings)
 		Expect(err).NotTo(BeNil())
 	})
 
 	It("AMQP Connection should fail due of wrong host", func() {
-
 		amqpConnection := NewAmqpConnection()
 		Expect(amqpConnection).NotTo(BeNil())
 		Expect(amqpConnection).To(BeAssignableToTypeOf(&AmqpConnection{}))
@@ -56,11 +62,12 @@ var _ = Describe("AMQP Connection Test", func() {
 		Expect(connectionSettings).NotTo(BeNil())
 		Expect(connectionSettings).To(BeAssignableToTypeOf(&ConnectionSettings{}))
 		connectionSettings.Host("wronghost").Port(5672)
-		err := amqpConnection.Open(context.TODO(), connectionSettings)
+
+		err := amqpConnection.Open(context.Background(), connectionSettings)
 		Expect(err).NotTo(BeNil())
 	})
 
-	It("AMQP Connection should fail due of context cancelled", func() {
+	It("AMQP Connection should fail due to context cancellation", func() {
 		amqpConnection := NewAmqpConnection()
 		Expect(amqpConnection).NotTo(BeNil())
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
@@ -69,12 +76,12 @@ var _ = Describe("AMQP Connection Test", func() {
 		Expect(err).NotTo(BeNil())
 	})
 
-	It("AMQP Connection should receive events ", func() {
+	It("AMQP Connection should receive events", func() {
 		amqpConnection := NewAmqpConnection()
 		Expect(amqpConnection).NotTo(BeNil())
 		ch := make(chan *StatusChanged, 1)
 		amqpConnection.NotifyStatusChange(ch)
-		err := amqpConnection.Open(context.TODO(), NewConnectionSettings())
+		err := amqpConnection.Open(context.Background(), NewConnectionSettings())
 		Expect(err).To(BeNil())
 		recv := <-ch
 		Expect(recv).NotTo(BeNil())
@@ -88,7 +95,6 @@ var _ = Describe("AMQP Connection Test", func() {
 
 		Expect(recv.From).To(Equal(Open))
 		Expect(recv.To).To(Equal(Closed))
-
 	})
 
 	//It("AMQP TLS Connection should success with SASLTypeAnonymous ", func() {
@@ -103,8 +109,7 @@ var _ = Describe("AMQP Connection Test", func() {
 	//	})
 	//	Expect(connectionSettings).NotTo(BeNil())
 	//	Expect(connectionSettings).To(BeAssignableToTypeOf(&ConnectionSettings{}))
-	//	err := amqpConnection.Open(context.TODO(), connectionSettings)
+	//	err := amqpConnection.Open(context.Background(), connectionSettings)
 	//	Expect(err).To(BeNil())
 	//})
-
 })

rabbitmq_amqp/amqp_exchange.go

@@ -34,7 +34,6 @@ func newAmqpExchange(management *AmqpManagement, name string) *AmqpExchange {
 }
 
 func (e *AmqpExchange) Declare(ctx context.Context) (IExchangeInfo, error) {
-
 	path := exchangePath(e.name)
 	kv := make(map[string]any)
 	kv["auto_delete"] = e.isAutoDelete

rabbitmq_amqp/amqp_exchange_test.go

@@ -7,7 +7,6 @@ import (
 )
 
 var _ = Describe("AMQP Exchange test ", func() {
-
 	var connection IConnection
 	var management IManagement
 	BeforeEach(func() {
@@ -26,8 +25,8 @@ var _ = Describe("AMQP Exchange test ", func() {
 		Expect(connection.Close(context.Background())).To(BeNil())
 	})
 
-	It("AMQP Exchange Declare with Default and Delete should success ", func() {
-		const exchangeName = "AMQP Exchange Declare and Delete  with Default should success"
+	It("AMQP Exchange Declare with Default and Delete should succeed", func() {
+		const exchangeName = "AMQP Exchange Declare and Delete with Default should succeed"
 		exchangeSpec := management.Exchange(exchangeName)
 		exchangeInfo, err := exchangeSpec.Declare(context.TODO())
 		Expect(err).To(BeNil())
@@ -37,8 +36,8 @@ var _ = Describe("AMQP Exchange test ", func() {
 		Expect(err).To(BeNil())
 	})
 
-	It("AMQP Exchange Declare with Topic and Delete should success ", func() {
-		const exchangeName = "AMQP Exchange Declare with Topic and Delete should success"
+	It("AMQP Exchange Declare with Topic and Delete should succeed", func() {
+		const exchangeName = "AMQP Exchange Declare with Topic and Delete should succeed"
 		exchangeSpec := management.Exchange(exchangeName).ExchangeType(ExchangeType{Topic})
 		exchangeInfo, err := exchangeSpec.Declare(context.TODO())
 		Expect(err).To(BeNil())
@@ -48,8 +47,8 @@ var _ = Describe("AMQP Exchange test ", func() {
 		Expect(err).To(BeNil())
 	})
 
-	It("AMQP Exchange Declare with FanOut and Delete should success ", func() {
-		const exchangeName = "AMQP Exchange Declare with FanOut and Delete should success"
+	It("AMQP Exchange Declare with FanOut and Delete should succeed", func() {
+		const exchangeName = "AMQP Exchange Declare with FanOut and Delete should succeed"
 		exchangeSpec := management.Exchange(exchangeName).ExchangeType(ExchangeType{FanOut})
 		exchangeInfo, err := exchangeSpec.Declare(context.TODO())
 		Expect(err).To(BeNil())
@@ -58,5 +57,4 @@ var _ = Describe("AMQP Exchange test ", func() {
 		err = exchangeSpec.Delete(context.TODO())
 		Expect(err).To(BeNil())
 	})
-
 })