Merge pull request #119 from ownmfa/bconway_update_go_1_21

Update to Go 1.21
ownmfa · Aug 15, 2023 · 495429c · 495429c
2 parents eea46c8 + c8374a8
commit 495429c
Show file tree

Hide file tree

Showing 120 changed files with 8,423 additions and 2,440 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     container:
-      image: golang:1.20-alpine
+      image: golang:1.21-alpine
       env:
         GOFLAGS: -buildvcs=false
         TEST_REDIS_HOST: redis

diff --git a/Makefile b/Makefile
@@ -28,7 +28,9 @@ install:
 	-ldflags="-w" ./$${x}; done
 
 lint:
-	go install honnef.co/go/tools/cmd/staticcheck@latest
+# https://github.com/dominikh/go-tools/issues/1433
+#	go install honnef.co/go/tools/cmd/staticcheck@latest
+	go install honnef.co/go/tools/cmd/staticcheck@master
 	staticcheck -version
 # staticcheck defaults are all,-ST1000,-ST1003,-ST1016,-ST1020,-ST1021,-ST1022
 	staticcheck -checks all ./...

diff --git a/api/go/Dockerfile b/api/go/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine
+FROM golang:1.21-alpine
 
 RUN apk update && apk upgrade
 RUN apk add --no-cache make protobuf protobuf-dev git

diff --git a/api/go/message/ownmfa_notifier_in.pb.go b/api/go/message/ownmfa_notifier_in.pb.go
diff --git a/api/go/token/ownmfa_page.pb.go b/api/go/token/ownmfa_page.pb.go
diff --git a/api/go/token/ownmfa_web.pb.go b/api/go/token/ownmfa_web.pb.go
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -6,7 +6,7 @@
 # docker buildx build -f build/Dockerfile -t ghcr.io/ownmfa/hermes:${TAG} --push .
 # docker buildx rm
 # docker logout ghcr.io
-FROM golang:1.20-alpine AS build
+FROM golang:1.21-alpine AS build
 
 # Add packages needed to support builds and tests
 RUN apk update && apk upgrade

diff --git a/build/deploy/hermes/docker-compose.yml b/build/deploy/hermes/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   hermes-api:
-    image: ghcr.io/ownmfa/hermes:dadbd9f2
+    image: ghcr.io/ownmfa/hermes:aafe23c5
     command: hermes-api
     restart: on-failure
     depends_on:
@@ -35,7 +35,7 @@ services:
       - "traefik.http.services.hermes-grpc.loadbalancer.server.scheme=h2c"
 
   hermes-notifier:
-    image: ghcr.io/ownmfa/hermes:dadbd9f2
+    image: ghcr.io/ownmfa/hermes:aafe23c5
     command: hermes-notifier
     restart: on-failure
     environment:

diff --git a/go.mod b/go.mod
@@ -1,25 +1,25 @@
 module github.com/ownmfa/hermes
 
-go 1.20
+go 1.21.0
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/google/uuid v1.3.0
 	github.com/gregdel/pushover v1.2.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
-	github.com/jackc/pgx/v5 v5.4.1
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2
+	github.com/jackc/pgx/v5 v5.4.3
 	github.com/jellydator/ttlcache/v3 v3.0.1
 	github.com/mennanov/fmutils v0.2.0
 	github.com/nsqio/go-nsq v1.1.0
-	github.com/ownmfa/api/go v1.0.26
+	github.com/ownmfa/api/go v1.0.27
 	github.com/redis/go-redis/v9 v9.0.5
-	github.com/rs/zerolog v1.29.1
+	github.com/rs/zerolog v1.30.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/smira/go-statsd v1.3.2
 	github.com/stretchr/testify v1.8.4
-	go.uber.org/mock v0.1.0
-	golang.org/x/crypto v0.10.0
-	google.golang.org/grpc v1.56.1
+	go.uber.org/mock v0.2.0
+	golang.org/x/crypto v0.12.0
+	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.31.0
 )
 
@@ -32,17 +32,17 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/kr/text v0.1.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	golang.org/x/net v0.11.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	google.golang.org/genproto v0.0.0-20230629202037-9506855d4529 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	google.golang.org/genproto v0.0.0-20230814215434-ca7cfce7776a // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230814215434-ca7cfce7776a // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230814215434-ca7cfce7776a // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )