Merge pull request #3573 from uselagoon/additional-go-dep-updates

chore: update go version and dependency bumps for services
uselagoon · Oct 19, 2023 · 1576f0a · 1576f0a
2 parents 6688bdd + 2e665bb
commit 1576f0a
Show file tree

Hide file tree

Showing 19 changed files with 2,652 additions and 218 deletions.
diff --git a/services/actions-handler/Dockerfile b/services/actions-handler/Dockerfile
@@ -1,7 +1,7 @@
 # build the binary
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
-FROM golang:1.18-alpine3.17 AS builder
+FROM golang:1.21-alpine AS builder
 # bring in all the packages
 COPY . /go/src/github.com/uselagoon/lagoon/services/actions-handler/
 WORKDIR /go/src/github.com/uselagoon/lagoon/services/actions-handler/

diff --git a/services/actions-handler/go.mod b/services/actions-handler/go.mod
@@ -1,6 +1,6 @@
 module github.com/uselagoon/lagoon/services/actions-handler
 
-go 1.18
+go 1.21
 
 require (
 	github.com/cheshir/go-mq/v2 v2.0.1

diff --git a/services/actions-handler/go.sum b/services/actions-handler/go.sum
@@ -591,6 +591,7 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
+github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 h1:JAEbJn3j/FrhdWA9jW8B5ajsLIjeuEHLi8xE4fk997o=
 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=

diff --git a/services/backup-handler/Dockerfile b/services/backup-handler/Dockerfile
@@ -1,7 +1,7 @@
 # build the binary
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
-FROM golang:1.18-alpine3.17 AS builder
+FROM golang:1.21-alpine AS builder
 
 # bring in all the packages
 COPY . /go/src/github.com/uselagoon/lagoon/services/backup-handler/

diff --git a/services/backup-handler/go.mod b/services/backup-handler/go.mod
@@ -1,12 +1,12 @@
 module github.com/uselagoon/lagoon/services/backup-handler
 
-go 1.18
+go 1.21
 
 require (
-	github.com/amazeeio/lagoon-cli v0.0.0-20200309230012-d971a4d07053
 	github.com/google/uuid v1.3.0
 	github.com/isayme/go-amqp-reconnect v0.0.0-20210303120416-fc811b0bcda2
 	github.com/streadway/amqp v1.0.0
+	github.com/uselagoon/lagoon-cli v0.19.0
 )
 
 require (

diff --git a/services/backup-handler/go.sum b/services/backup-handler/go.sum
diff --git a/services/backup-handler/internal/handler/main.go b/services/backup-handler/internal/handler/main.go
@@ -7,10 +7,10 @@ import (
 	"net/http"
 	"regexp"
 
-	"github.com/amazeeio/lagoon-cli/pkg/api"
 	"github.com/google/uuid"
 	"github.com/isayme/go-amqp-reconnect/rabbitmq"
 	"github.com/streadway/amqp"
+	"github.com/uselagoon/lagoon-cli/pkg/api"
 )
 
 // BackupInterface .
@@ -41,7 +41,7 @@ type RabbitBroker struct {
 type GraphQLEndpoint struct {
 	Endpoint        string `json:"endpoint"`
 	JWTAudience     string `json:"audience"`
-	TokenSigningKey string `json:"tokenSigningKey`
+	TokenSigningKey string `json:"tokenSigningKey"`
 }
 
 // NewBackupHandler .

diff --git a/services/backup-handler/internal/handler/main_test.go b/services/backup-handler/internal/handler/main_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/amazeeio/lagoon-cli/pkg/api"
+	"github.com/uselagoon/lagoon-cli/pkg/api"
 )
 
 func checkEqual(t *testing.T, got, want interface{}, msgs ...interface{}) {

diff --git a/services/logs2notifications/Dockerfile b/services/logs2notifications/Dockerfile
@@ -1,7 +1,7 @@
 # build the binary
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
-FROM golang:1.18-alpine3.17 AS builder
+FROM golang:1.21-alpine AS builder
 # bring in all the packages
 COPY . /go/src/github.com/uselagoon/lagoon/services/logs2notifications/
 WORKDIR /go/src/github.com/uselagoon/lagoon/services/logs2notifications/

diff --git a/services/logs2notifications/go.mod b/services/logs2notifications/go.mod
@@ -1,10 +1,10 @@
 module github.com/uselagoon/lagoon/services/logs2notifications
 
-go 1.18
+go 1.21
 
 require (
 	github.com/aws/aws-sdk-go v1.41.11
-	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/machinebox/graphql v0.2.3-0.20181106130121-3a9253180225
 	github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2
@@ -13,22 +13,14 @@ require (
 )
 
 require (
-	github.com/NeowayLabs/wabbit v0.0.0-20200409220312-12e68ab5b0c6 // indirect
+	github.com/NeowayLabs/wabbit v0.0.0-20210927194032-73ad61d1620e // indirect
 	github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
-	github.com/fsouza/go-dockerclient v1.7.3 // indirect
-	github.com/google/uuid v1.1.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/matryer/is v1.4.0 // indirect
-	github.com/pborman/uuid v1.2.0 // indirect
+	github.com/pborman/uuid v1.2.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71 // indirect
-	github.com/stretchr/testify v1.4.0 // indirect
-	github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218 // indirect
+	github.com/rabbitmq/amqp091-go v1.7.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 )
-
-// Fixes for AppID
-replace github.com/cheshir/go-mq v1.0.2 => github.com/shreddedbacon/go-mq v0.0.0-20200419104937-b8e9af912ead
-
-replace github.com/NeowayLabs/wabbit v0.0.0-20200409220312-12e68ab5b0c6 => github.com/shreddedbacon/wabbit v0.0.0-20200419104837-5b7b769d7204