diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 5c60cf8..5087d3d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -42,7 +42,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.23 - name: Build run: go build -v ./... - name: Test diff --git a/Dockerfile b/Dockerfile index 742805c..2e26a4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 AS builder +FROM golang:1.23 AS builder ARG VERSION=dev ARG USER=outbox diff --git a/docker-compose-test.yml b/docker-compose-test.yml index 7cccad0..75fa9f8 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -6,6 +6,7 @@ networks: services: mysql: image: mysql:8.0.24 + platform: linux/x86_64 container_name: ob-mysql restart: always command: --default-authentication-plugin=mysql_native_password @@ -20,6 +21,7 @@ services: - MYSQL_DATABASE=test_outbox postgres: image: postgres:13.2-alpine + platform: linux/x86_64 container_name: ob-postgres restart: always ports: diff --git a/docker-compose.yml b/docker-compose.yml index 7cacf33..cad7f11 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: - outbox-nw postgres: image: postgres:13.2-alpine + platform: linux/x86_64 container_name: postgres ports: - 5432:5432 diff --git a/event/event.go b/event/event.go index 60fe2b5..ed4f60c 100644 --- a/event/event.go +++ b/event/event.go @@ -6,9 +6,8 @@ import ( "encoding/json" "errors" - "github.com/streadway/amqp" - "github.com/aws/aws-sdk-go/service/sqs" + amqp "github.com/rabbitmq/amqp091-go" ) // OutboxRow represents the outbox rows in DB diff --git a/go.mod b/go.mod index f5d417a..a35f006 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,16 @@ module github.com/kamal-github/outbox -go 1.19 +go 1.23 require ( github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/aws/aws-sdk-go v1.38.30 github.com/go-sql-driver/mysql v1.6.0 github.com/golang/mock v1.5.0 - github.com/kamal-github/angora v0.2.0 + github.com/kamal-github/angora v0.4.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/lib/pq v1.10.1 - github.com/streadway/amqp v1.0.0 + github.com/rabbitmq/amqp091-go v1.10.0 github.com/stretchr/testify v1.7.0 go.uber.org/zap v1.16.0 ) diff --git a/go.sum b/go.sum index 1909eff..7f8a695 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/kamal-github/angora v0.2.0 h1:rFKi30HVaYZrZdzYBobFlHMREQ73gO/Oi3P175AOOW4= -github.com/kamal-github/angora v0.2.0/go.mod h1:nGBmvjk9RzmI03orNENuE4JQpHClI7VFA9TQGr9Eaa0= +github.com/kamal-github/angora v0.4.0 h1:BG5gSz3DrCwzW/AoQYPmdE4dKE6rxoiMxY8ISKoe9qg= +github.com/kamal-github/angora v0.4.0/go.mod h1:FEZVZK5qliUOooz68wUENw+FfqrXOxjEc/89TJYgo/Y= github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -35,9 +35,9 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw= +github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo= -github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -45,6 +45,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= diff --git a/pubsub/rabbit.go b/pubsub/rabbit.go index 58541b2..b26f655 100644 --- a/pubsub/rabbit.go +++ b/pubsub/rabbit.go @@ -7,7 +7,7 @@ import ( "github.com/kamal-github/angora" "github.com/kamal-github/outbox/event" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" "go.uber.org/zap" ) diff --git a/pubsub/rabbit_test.go b/pubsub/rabbit_test.go index 06efe11..df14519 100644 --- a/pubsub/rabbit_test.go +++ b/pubsub/rabbit_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" "github.com/golang/mock/gomock" diff --git a/test/integration_test.go b/test/integration_test.go index 24a2eb9..d0be569 100644 --- a/test/integration_test.go +++ b/test/integration_test.go @@ -16,7 +16,7 @@ import ( "github.com/kamal-github/outbox/event" "github.com/kamal-github/outbox/internal/config" "github.com/kamal-github/outbox/pubsub" - "github.com/streadway/amqp" + amqp "github.com/rabbitmq/amqp091-go" "github.com/stretchr/testify/assert" "go.uber.org/zap" )