From 3fd15e414ebb07350645c25ebb056bd4bacead60 Mon Sep 17 00:00:00 2001 From: Joakim Olsson Date: Thu, 5 Oct 2023 06:25:33 +0000 Subject: [PATCH] chore(deps): bump github.com/sparetimecoders/goamqp from 0.1.5 to 0.2.0 Bumps [github.com/sparetimecoders/goamqp](https://github.com/sparetimecoders/goamqp) from 0.1.5 to 0.2.0. - [Release notes](https://github.com/sparetimecoders/goamqp/releases) - [Commits](https://github.com/sparetimecoders/goamqp/compare/v0.1.5...v0.2.0) --- cmd/service/service.go | 21 ++++----------------- go.mod | 6 +++--- go.sum | 11 ++++++----- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/cmd/service/service.go b/cmd/service/service.go index e120dd6..38103fa 100644 --- a/cmd/service/service.go +++ b/cmd/service/service.go @@ -101,23 +101,7 @@ func start(closeEvents chan error, logger *log.Entry, connectToAmqpFunc func(url return fmt.Errorf("event migrations: %w", err) } - publisher, err := goamqp.NewPublisher( - goamqp.Route{ - Type: domain.SubGraphUpdated{}, - Key: "SubGraph.Updated", - }, - goamqp.Route{ - Type: domain.OrganizationAdded{}, - Key: "Organization.Added", - }, - goamqp.Route{ - Type: domain.APIKeyAdded{}, - Key: "Organization.APIKeyAdded", - }, - ) - if err != nil { - return fmt.Errorf("failed to create publisher: %v", err) - } + publisher := goamqp.NewPublisher() eventPublisher, err := amqp.New(publisher) if err != nil { return fmt.Errorf("failed to create event publisher: %v", err) @@ -142,6 +126,9 @@ func start(closeEvents chan error, logger *log.Entry, connectToAmqpFunc func(url goamqp.TransientEventStreamConsumer("SubGraph.Updated", serviceCache.Update, domain.SubGraphUpdated{}), goamqp.TransientEventStreamConsumer("Organization.Added", serviceCache.Update, domain.OrganizationAdded{}), goamqp.TransientEventStreamConsumer("Organization.APIKeyAdded", serviceCache.Update, domain.APIKeyAdded{}), + goamqp.WithTypeMapping("SubGraph.Updated", domain.SubGraphUpdated{}), + goamqp.WithTypeMapping("Organization.Added", domain.OrganizationAdded{}), + goamqp.WithTypeMapping("Organization.APIKeyAdded", domain.APIKeyAdded{}), } if err := conn.Start(rootCtx, setups...); err != nil { return fmt.Errorf("failed to setup AMQP: %v", err) diff --git a/go.mod b/go.mod index e9a6e54..d04670a 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/pressly/goose/v3 v3.15.0 github.com/rs/cors v1.10.1 - github.com/sparetimecoders/goamqp v0.1.5 + github.com/sparetimecoders/goamqp v0.2.0 github.com/stretchr/testify v1.8.4 github.com/vektah/gqlparser/v2 v2.5.10 github.com/wundergraph/graphql-go-tools v1.66.4 @@ -30,14 +30,14 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/mock v1.4.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/golang-lru/v2 v2.0.3 // indirect github.com/jensneuse/byte-template v0.0.0-20200214152254-4f3cf06e5c68 // indirect github.com/lib/pq v1.10.9 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rabbitmq/amqp091-go v1.8.1 // indirect + github.com/rabbitmq/amqp091-go v1.9.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.0 // indirect github.com/tidwall/gjson v1.14.3 // indirect diff --git a/go.sum b/go.sum index 898b92b..2c98a49 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,9 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hashicorp/golang-lru/v2 v2.0.3 h1:kmRrRLlInXvng0SmLxmQpQkpbYAvcXm7NPDrgxJa9mE= @@ -101,8 +102,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pressly/goose/v3 v3.15.0 h1:6tY5aDqFknY6VZkorFGgZtWygodZQxfmmEF4rqyJW9k= github.com/pressly/goose/v3 v3.15.0/go.mod h1:LlIo3zGccjb/YUgG+Svdb9Er14vefRdlDI7URCDrwYo= github.com/rabbitmq/amqp091-go v1.5.0/go.mod h1:JsV0ofX5f1nwOGafb8L5rBItt9GyhfQfcJj+oyz0dGg= -github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA= -github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= +github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo= +github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= @@ -120,8 +121,8 @@ github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUr github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= github.com/sparetimecoders/goamqp v0.1.3/go.mod h1:BKUl32yHsxpKEZEn7oEgyKB8Y0C4dk5n+17FModO6iM= -github.com/sparetimecoders/goamqp v0.1.5 h1:vzU+OQYaSR27YiBUTELqgGz4qgGMKRdlIVlhXVE4jJs= -github.com/sparetimecoders/goamqp v0.1.5/go.mod h1:O0q6uBlvtArzO0VwaE35JdQljzIGkNO1ps1ldy52ePo= +github.com/sparetimecoders/goamqp v0.2.0 h1:S1oJ2NUJxoTBSfRx5BsKb1eKRaNninm301neym5bzrs= +github.com/sparetimecoders/goamqp v0.2.0/go.mod h1:TWWNPccknku8b6xA8nLb76ll882zQw6TXzophis3+2k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=