From 7a70299080213d9b7aae25de9bc00037edff4ed0 Mon Sep 17 00:00:00 2001 From: Cassondra Foesch Date: Tue, 5 Sep 2023 11:23:39 +0000 Subject: [PATCH] dependency updates --- go.mod | 28 +++++++++++++++++++++------- masher/Dockerfile | 6 +++--- masher/masher | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index aeee0c9..fc19df6 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,27 @@ module github.com/puellanivis/breton -go 1.16 +go 1.21 require ( - github.com/aws/aws-sdk-go v1.44.240 + github.com/aws/aws-sdk-go v1.45.2 github.com/pkg/errors v0.9.1 - github.com/pkg/sftp v1.13.5 - github.com/prometheus/client_golang v1.14.0 - golang.org/x/crypto v0.8.0 - golang.org/x/net v0.9.0 - golang.org/x/text v0.9.0 + github.com/pkg/sftp v1.13.6 + github.com/prometheus/client_golang v1.16.0 + golang.org/x/crypto v0.12.0 + golang.org/x/net v0.14.0 + golang.org/x/text v0.13.0 +) + +require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/kr/fs v0.1.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect + golang.org/x/sys v0.11.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/masher/Dockerfile b/masher/Dockerfile index 663ac25..b7dd292 100644 --- a/masher/Dockerfile +++ b/masher/Dockerfile @@ -1,6 +1,6 @@ # This docker image builds upon the golang docker image to support a more automated process for building # golang files. -FROM golang:1.20 +FROM golang:1.21 MAINTAINER Cassondra Foesch # Setup various environment and argument settings which define the building environment. @@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # However, I don’t think it makes sense to use older version, better to be able to advance as it releases outselves. RUN mkdir -p /usr/bin && \ cd /usr && \ - curl -sS -L https://github.com/protocolbuffers/protobuf/releases/download/v22.0/protoc-22.0-linux-x86_64.zip | \ + curl -sS -L https://github.com/protocolbuffers/protobuf/releases/download/v24.2/protoc-24.2-linux-x86_64.zip | \ bsdtar -xvf- --exclude=readme.txt && \ chmod 755 /usr/bin/protoc @@ -39,7 +39,7 @@ RUN mkdir -p /usr/bin && \ # * goimports permits us to use goimports. # * godoc go stopped bundling godoc with the central binary, so we have to grab it ourselves. # * golint permits us to use golinter. (Now deprecated.) -RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 && \ +RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0 && \ go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 && \ go install golang.org/x/tools/cmd/goimports@latest && \ go install golang.org/x/tools/cmd/godoc@latest && \ diff --git a/masher/masher b/masher/masher index a5def04..4fff6f2 100755 --- a/masher/masher +++ b/masher/masher @@ -240,7 +240,7 @@ if type -p go > /dev/null 2>&1 ; then echo "Found local Go version: ${GO_VERSION}" case "${GO_VERSION}" in - 1.19|1.19.*|1.19[a-z]*) + 1.21|1.21.*|1.21[a-z]*) LOCALTEST="true" ;; esac