Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update go version and dependency bumps for services #3573

Merged
merged 1 commit into from
Oct 19, 2023
Merged

chore: update go version and dependency bumps for services #3573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/actions-handler/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion services/actions-handler/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions services/actions-handler/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion services/backup-handler/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
4 changes: 2 additions & 2 deletions services/backup-handler/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
129 changes: 37 additions & 92 deletions services/backup-handler/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions services/backup-handler/internal/handler/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion services/backup-handler/internal/handler/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}) {
Expand Down
2 changes: 1 addition & 1 deletion services/logs2notifications/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
20 changes: 6 additions & 14 deletions services/logs2notifications/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Loading