Skip to content

Commit

Permalink
Bump to v4
Browse files Browse the repository at this point in the history
  • Loading branch information
akarl committed May 20, 2024
1 parent 7141a08 commit af657ed
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ test: compose ## Run all tests (with race detection)

coverage:
go test -coverprofile c.out ./...
@sed -i "s%github.com/0x4b53/amqp-rpc/v3/%amqp-rpc/%" c.out
@sed -i "s%github.com/0x4b53/amqp-rpc/v4/%amqp-rpc/%" c.out

.PHONY: all compose compose-down help hooks lint test
2 changes: 1 addition & 1 deletion amqprpctest/client.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package amqprpctest

import (
amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"
)

// NewTestClient returns a client with a custom send function to use for testing.
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: '3'
services:
rabbitmq:
image: rabbitmq:3-management
image: rabbitmq:3.11.16-management
expose:
- "5672"
- "15672"
Expand Down
2 changes: 1 addition & 1 deletion examples/client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"time"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/fanout/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"

amqp "github.com/rabbitmq/amqp091-go"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/middlewares/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/google/uuid"
amqp "github.com/rabbitmq/amqp091-go"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions examples/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"
"syscall"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpcmw "github.com/0x4b53/amqp-rpc/v3/middleware"
amqprpc "github.com/0x4b53/amqp-rpc/v4"
amqprpcmw "github.com/0x4b53/amqp-rpc/v4/middleware"

amqp "github.com/rabbitmq/amqp091-go"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/tls-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"os"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"

amqp "github.com/rabbitmq/amqp091-go"
)
Expand Down
9 changes: 4 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
module github.com/0x4b53/amqp-rpc/v3
module github.com/0x4b53/amqp-rpc/v4

go 1.20

require (
github.com/google/uuid v1.3.0
github.com/rabbitmq/amqp091-go v1.8.1
github.com/stretchr/testify v1.8.4
github.com/google/uuid v1.6.0
github.com/rabbitmq/amqp091-go v1.10.0
github.com/stretchr/testify v1.9.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
31 changes: 8 additions & 23 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
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/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
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/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.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA=
github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
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=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
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/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2 changes: 1 addition & 1 deletion middleware/ack.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package middleware
import (
"context"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"
amqp "github.com/rabbitmq/amqp091-go"
)

Expand Down
2 changes: 1 addition & 1 deletion middleware/ack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
amqp "github.com/rabbitmq/amqp091-go"
"github.com/stretchr/testify/assert"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"
)

func TestAckDelivery(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion middleware/panic_recovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

amqp "github.com/rabbitmq/amqp091-go"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"
)

// PanicRecovery is a middleware that will recover any panics caused by a
Expand Down
2 changes: 1 addition & 1 deletion middleware/panic_recovery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
amqp "github.com/rabbitmq/amqp091-go"
"github.com/stretchr/testify/assert"

amqprpc "github.com/0x4b53/amqp-rpc/v3"
amqprpc "github.com/0x4b53/amqp-rpc/v4"
)

func TestPanicRecovery(t *testing.T) {
Expand Down

0 comments on commit af657ed

Please sign in to comment.