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.

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: build and test against go 1.17 #137

Merged
merged 1 commit into from
Sep 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16'
go-version: '1.17'
- name: Get dependencies
run: go get -t ./...
- name: Lint
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16 as build-env
FROM golang:1.17 as build-env

ARG VERSION=dev

Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ VETTERS = "asmdecl,assign,atomic,bools,buildtag,cgocall,composites,copylocks,err
GOFMT_FILES = $(shell go list -f '{{.Dir}}' ./...)

fmtcheck:
@command -v goimports > /dev/null 2>&1 || (cd tools && go get golang.org/x/tools/cmd/goimports && cd ..)
@command -v goimports > /dev/null 2>&1 || (cd tools && go install golang.org/x/tools/cmd/goimports && cd ..)
@CHANGES="$$(goimports -d $(GOFMT_FILES))"; \
if [ -n "$${CHANGES}" ]; then \
echo "Unformatted (run goimports -w .):\n\n$${CHANGES}\n\n"; \
Expand All @@ -31,32 +31,32 @@ fmtcheck:
.PHONY: fmtcheck

spellcheck:
@command -v misspell > /dev/null 2>&1 || (cd tools && go get github.com/client9/misspell/cmd/misspell && cd ..)
@command -v misspell > /dev/null 2>&1 || (cd tools && go install github.com/client9/misspell/cmd/misspell && cd ..)
@misspell -error -source="text" **/*
.PHONY: spellcheck

staticcheck:
@command -v staticcheck > /dev/null 2>&1 || (cd tools && go get honnef.co/go/tools/cmd/staticcheck && cd ..)
@command -v staticcheck > /dev/null 2>&1 || (cd tools && go install honnef.co/go/tools/cmd/staticcheck && cd ..)
@staticcheck -checks="all" -tests $(GOFMT_FILES)
.PHONY: staticcheck

licensescsv:
@command -v go-licenses > /dev/null 2>&1 || (cd tools && go get github.com/google/go-licenses && cd ..)
@command -v go-licenses > /dev/null 2>&1 || (cd tools && go install github.com/google/go-licenses && cd ..)
@go-licenses csv . | sort > licenses.csv
.PHONY: licensescsv

licensescheck:
@command -v go-licenses > /dev/null 2>&1 || (cd tools && go get github.com/google/go-licenses && cd ..)
@command -v go-licenses > /dev/null 2>&1 || (cd tools && go install github.com/google/go-licenses && cd ..)
@go-licenses check .
.PHONY: licensescheck

licensessave:
@command -v go-licenses > /dev/null 2>&1 || (cd tools && go get github.com/google/go-licenses && cd ..)
@command -v go-licenses > /dev/null 2>&1 || (cd tools && go install github.com/google/go-licenses && cd ..)
@go-licenses save . --save_path=licenses
.PHONY: licensessave

gosec:
@command -v gosec > /dev/null 2>&1 || (cd tools && go get github.com/securego/gosec/cmd/gosec && cd ..)
@command -v gosec > /dev/null 2>&1 || (cd tools && go install github.com/securego/gosec/cmd/gosec && cd ..)
@gosec ./...
.PHONY: gosec

Expand Down
77 changes: 61 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,70 @@

module github.com/GoogleCloudPlatform/secrets-store-csi-driver-provider-gcp

go 1.16
go 1.17

require (
cloud.google.com/go v0.93.3
cloud.google.com/go v0.94.1
cloud.google.com/go/secretmanager v0.1.0
github.com/google/go-cmp v0.5.6
github.com/googleapis/gax-go/v2 v2.0.5
go.opentelemetry.io/contrib/instrumentation/runtime v0.16.0
go.opentelemetry.io/otel/exporters/metric/prometheus v0.16.0
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a
google.golang.org/api v0.54.0
google.golang.org/genproto v0.0.0-20210813162853-db860fec028c
google.golang.org/grpc v1.39.1
github.com/googleapis/gax-go/v2 v2.1.0
go.opentelemetry.io/contrib/instrumentation/runtime v0.20.0
go.opentelemetry.io/otel/exporters/metric/prometheus v0.20.0
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
google.golang.org/api v0.56.0
google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af
google.golang.org/grpc v1.40.0
google.golang.org/protobuf v1.27.1
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/component-base v0.20.2
k8s.io/klog/v2 v2.5.0
sigs.k8s.io/secrets-store-csi-driver v0.0.21
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/client-go v0.22.0
k8s.io/component-base v0.22.0
k8s.io/klog/v2 v2.9.0
sigs.k8s.io/secrets-store-csi-driver v0.3.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
Loading