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

update go library dependencies to their latest releases #1918

Merged
merged 2 commits into from
Jul 14, 2022
Merged

update go library dependencies to their latest releases #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8af9370
update go library dependencies to their latest releases
Jul 14, 2022
e2247b8
update go required version to 1.18.4
Jul 14, 2022
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 docker/util/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LABEL org.label-schema.vcs-ref=$VCS_REF
RUN apk add --no-cache --virtual .build-deps bash gcc musl-dev openssl make git

# get latest go from its own image, since its not available in apk
COPY --from=golang:1.17.5-alpine /usr/local/go/ /usr/local/go/
COPY --from=golang:1.18.4-alpine /usr/local/go/ /usr/local/go/

ENV GOPATH="/root/go"
WORKDIR ${GOPATH}/src/github.com/AthenZ/athenz
Expand Down
2 changes: 1 addition & 1 deletion docs/dev_environment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ the git client is required.

#### Go

Install go 1.17.5 by following the directions at
Install go 1.18.4 or newer version by following the directions at
[Getting Started - The Go Programming Language](https://golang.org/doc/install).

Make sure you have set the [$GOPATH environment variable](https://pkg.go.dev/cmd/go#hdr-GOPATH_environment_variable)
Expand Down
50 changes: 37 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,52 @@ module github.com/AthenZ/athenz

require (
github.com/ardielle/ardielle-go v1.5.2
github.com/aws/aws-sdk-go v1.42.37
github.com/aws/aws-sdk-go v1.44.54
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
github.com/dimfeld/httptreemux v5.0.1+incompatible
github.com/envoyproxy/go-control-plane v0.10.1
github.com/envoyproxy/go-control-plane v0.10.3
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.7
github.com/google/go-cmp v0.5.8
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
github.com/jawher/mow.cli v1.1.0
github.com/stretchr/testify v1.7.0
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.27.1
github.com/jawher/mow.cli v1.2.0
github.com/stretchr/testify v1.8.0
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
golang.org/x/net v0.0.0-20220708220712-1185a9018129
google.golang.org/grpc v1.48.0
google.golang.org/protobuf v1.28.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v2 v2.4.0
inet.af/peercred v0.0.0-20210906144145-0893ea02156a
k8s.io/apimachinery v0.23.3
k8s.io/client-go v0.23.3
k8s.io/apimachinery v0.24.2
k8s.io/client-go v0.24.2
)

go 1.13
require (
github.com/cncf/xds/go v0.0.0-20220520190051-1e77728a1eaa // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20220713161829-9c7dac0a6568 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
)

go 1.18
145 changes: 99 additions & 46 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions libs/go/athenzconf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt build test
Expand Down
8 changes: 4 additions & 4 deletions libs/go/athenzutils/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt build test
Expand Down
8 changes: 4 additions & 4 deletions libs/go/sia/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt build test
Expand Down
8 changes: 4 additions & 4 deletions libs/go/zmscli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt build test
Expand Down
8 changes: 4 additions & 4 deletions libs/go/zmssvctoken/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt build test
Expand Down
8 changes: 4 additions & 4 deletions libs/go/ztsroletoken/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt build test
Expand Down
4 changes: 2 additions & 2 deletions screwdriver/scripts/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ apt-get install -y gcc
apt-get install -y g++

echo "-----------------Install golang: -----------------"
wget https://golang.org/dl/go1.17.5.linux-amd64.tar.gz
tar -C /usr/local -xzf go1.17.5.linux-amd64.tar.gz
wget https://golang.org/dl/go1.18.4.linux-amd64.tar.gz
tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin

# check all installed dependencies
Expand Down
8 changes: 4 additions & 4 deletions utils/athenz-conf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin
Expand Down
8 changes: 4 additions & 4 deletions utils/hostdoc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin
Expand Down
8 changes: 4 additions & 4 deletions utils/msd-agent/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin
Expand Down
8 changes: 4 additions & 4 deletions utils/zms-cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin windows
Expand Down
8 changes: 4 additions & 4 deletions utils/zms-svctoken/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin
Expand Down
8 changes: 4 additions & 4 deletions utils/zpe-updater/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin
Expand Down
8 changes: 4 additions & 4 deletions utils/zts-accesstoken/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin
Expand Down
8 changes: 4 additions & 4 deletions utils/zts-idtoken/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin
Expand Down
8 changes: 4 additions & 4 deletions utils/zts-rolecert/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt test linux darwin
Expand Down
8 changes: 4 additions & 4 deletions utils/zts-roletoken/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ export $(GOPATH)

ifdef GO

# we need to make sure we have go 1.17+
# we need to make sure we have go 1.18+
# the output for the go version command is:
# go version go1.17.1 darwin/amd64
# go version go1.18.4 darwin/amd64

GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 17)
GO_VER_GTEQ := $(shell expr `go version | cut -f 3 -d' ' | cut -f2 -d.` \>= 18)
ifneq "$(GO_VER_GTEQ)" "1"
all:
@echo "Please install 1.17.x or newer version of golang"
@echo "Please install 1.18.x or newer version of golang"
else

.PHONY: vet fmt linux darwin
Expand Down
Loading