Update module github.com/cheshir/go-mq to v2

uselagoon · Feb 12, 2024 · 8917928 · 8917928
1 parent b82f729
commit 8917928
Show file tree

Hide file tree

Showing 7 changed files with 1,278 additions and 40 deletions.
diff --git a/go.mod b/go.mod
@@ -4,15 +4,15 @@ go 1.21
 
 require (
 	github.com/Khan/genqlient v0.6.0
-	github.com/cheshir/go-mq v1.0.2
+	github.com/cheshir/go-mq/v2 v2.0.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/joho/godotenv v1.5.1
 	github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2
 	github.com/stretchr/testify v1.8.4
 )
 
 require (
-	github.com/NeowayLabs/wabbit v0.0.0-20200409220312-12e68ab5b0c6 // indirect
+	github.com/NeowayLabs/wabbit v0.0.0-20210927194032-73ad61d1620e // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
@@ -27,18 +27,17 @@ require (
 	github.com/moby/sys/mount v0.3.3 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pborman/uuid v1.2.0 // indirect
+	github.com/pborman/uuid v1.2.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rabbitmq/amqp091-go v1.7.0 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/rs/xid v1.2.1 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.10 // indirect
 	golang.org/x/crypto v0.16.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
 
@@ -50,9 +49,7 @@ replace (
 require (
 	github.com/CycloneDX/cyclonedx-go v0.8.0
 	github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
-	github.com/fsouza/go-dockerclient v1.7.3 // indirect
 	github.com/minio/minio-go/v7 v7.0.21
-	github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218 // indirect
 	golang.org/x/net v0.19.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1
 )

diff --git a/go.sum b/go.sum
diff --git a/internal/handler/main.go b/internal/handler/main.go
@@ -22,7 +22,7 @@ import (
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 
-	"github.com/cheshir/go-mq"
+	"github.com/cheshir/go-mq/v2"
 	"github.com/matryer/try"
 	"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient"
 	"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient/jwt"

diff --git a/internal/handler/main_test.go b/internal/handler/main_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	cdx "github.com/CycloneDX/cyclonedx-go"
-	"github.com/cheshir/go-mq"
+	"github.com/cheshir/go-mq/v2"
 	"github.com/joho/godotenv"
 	"github.com/stretchr/testify/mock"
 	"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient"

diff --git a/internal/handler/messaging.go b/internal/handler/messaging.go
@@ -3,7 +3,7 @@ package handler
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/cheshir/go-mq"
+	"github.com/cheshir/go-mq/v2"
 	"log/slog"
 	"sort"
 	"strconv"

diff --git a/internal/handler/processing.go b/internal/handler/processing.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"github.com/Khan/genqlient/graphql"
-	"github.com/cheshir/go-mq"
+	"github.com/cheshir/go-mq/v2"
 	"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient"
 	"log/slog"
 	"net/http"

diff --git a/main.go b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/cheshir/go-mq"
+	"github.com/cheshir/go-mq/v2"
 	"github.com/uselagoon/lagoon/services/insights-handler/internal/handler"
 	"log/slog"
 	"os"