Merge branch 'main' of git.k6n.net:mats/go-order-manager

.gitea/workflows/build.yaml

@@ -9,9 +9,9 @@ jobs:
 #      - name: Check out repository code
 #        uses: actions/checkout@v4
 #      - name: Build docker image
-#        run: docker build --progress=plain -t registry.knatofs.se/go-cart-actor-amd64:latest .
+#        run: docker build --progress=plain -t registry.k6n.net/go-cart-actor-amd64:latest .
 #      - name: Push to registry
-#        run: docker push registry.knatofs.se/go-cart-actor-amd64:latest
+#        run: docker push registry.k6n.net/go-cart-actor-amd64:latest
 #      - name: Deploy to Kubernetes
 #        run: kubectl apply -f deployment/deployment.yaml -n cart
 #      - name: Rollout amd64 deployment
@@ -23,8 +23,8 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Build docker image
-        run: docker build --progress=plain -t registry.knatofs.se/go-order-manager .
+        run: docker build --progress=plain -t registry.k6n.net/go-order-manager .
       - name: Push to registry
-        run: docker push registry.knatofs.se/go-order-manager
+        run: docker push registry.k6n.net/go-order-manager
       - name: Rollout arm64 deployment
         run: kubectl rollout restart deployment/order-manager-arm64 -n dev

main.go

@@ -128,7 +128,6 @@ func main() {
 	}
 	client := &RabbitTransportClient{
 		Url:        amqpUrl,
-		OrderTopic: "orders",
 		ClientName: "OrderClient",
 	}
 

order_client.go

@@ -12,9 +12,7 @@ type UpdateHandler interface {
 }
 
 type RabbitTransportClient struct {
-	Url string
+	Url        string
-
-	OrderTopic string
 	ClientName string
 	handler    UpdateHandler
 	connection *amqp.Connection
@@ -22,22 +20,19 @@ type RabbitTransportClient struct {
 	quit       chan bool
 }
 
-func (t *RabbitTransportClient) declareBindAndConsume(topic string) (<-chan amqp.Delivery, error) {
+func (t *RabbitTransportClient) declareBindAndConsume() (<-chan amqp.Delivery, error) {
 	q, err := t.channel.QueueDeclare(
-		"",    // name
+		"order-queue", // name
-		false, // durable
+		false,         // durable
-		false, // delete when unused
+		false,         // delete when unused
-		true,  // exclusive
+		false,         // exclusive
-		false, // no-wait
+		false,         // no-wait
-		nil,   // arguments
+		nil,           // arguments
 	)
 	if err != nil {
 		return nil, err
 	}
-	err = t.channel.QueueBind(q.Name, topic, topic, false, nil)
+
-	if err != nil {
-		return nil, err
-	}
 	return t.channel.Consume(
 		q.Name,
 		"",
@@ -65,11 +60,11 @@ func (t *RabbitTransportClient) Connect(handler UpdateHandler) error {
 	}
 	t.handler = handler
 	t.channel = ch
-	toAdd, err := t.declareBindAndConsume(t.OrderTopic)
+	toAdd, err := t.declareBindAndConsume()
 	if err != nil {
 		return err
 	}
-	log.Printf("Connected to rabbit upsert topic: %s", t.OrderTopic)
+	log.Printf("Connected to rabbit order topic")
 	go func(msgs <-chan amqp.Delivery) {
 		for d := range msgs {