From 22db25ef949475e819df23e2fa021b67f0f7f398 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Tue, 17 Aug 2021 15:55:45 +0200 Subject: [PATCH 1/4] chore: update golangci-lint Signed-off-by: Mark Sagi-Kazar --- Makefile | 2 +- storage/kubernetes/client_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b0ced741..0de702e6 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ export GOBIN=$(PWD)/bin LD_FLAGS="-w -X main.version=$(VERSION)" # Dependency versions -GOLANGCI_VERSION = 1.40.1 +GOLANGCI_VERSION = 1.42.0 PROTOC_VERSION = 3.15.6 PROTOC_GEN_GO_VERSION = 1.26.0 diff --git a/storage/kubernetes/client_test.go b/storage/kubernetes/client_test.go index 5fee5774..bfe2d038 100644 --- a/storage/kubernetes/client_test.go +++ b/storage/kubernetes/client_test.go @@ -72,7 +72,7 @@ func TestInClusterTransport(t *testing.T) { fpath := filepath.Join(os.TempDir(), "test.in_cluster") defer os.RemoveAll(fpath) - err = ioutil.WriteFile(fpath, []byte("def"), 0644) + err = ioutil.WriteFile(fpath, []byte("def"), 0o644) require.NoError(t, err) tests := []struct { From e1c88b2598edd738cae7e63cf8be1a4c9db6db8d Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Tue, 17 Aug 2021 15:57:29 +0200 Subject: [PATCH 2/4] chore: update Go in Docker Signed-off-by: Mark Sagi-Kazar --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fb252616..3683077f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.7-alpine3.13 AS builder +FROM golang:1.17.0-alpine3.14 AS builder WORKDIR /usr/local/src/dex From 691ecbbd9edd8abb407e27ae65de41030166a9b0 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Tue, 17 Aug 2021 15:57:57 +0200 Subject: [PATCH 3/4] chore: update Go in GitHub Actions Signed-off-by: Mark Sagi-Kazar --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fe3a0359..0d5a6e31 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -55,7 +55,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Checkout code uses: actions/checkout@v2 From a950a248110e4e4b2a496258fbefd1621580ac80 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Tue, 17 Aug 2021 15:59:03 +0200 Subject: [PATCH 4/4] chore: update Go version in go.mod Signed-off-by: Mark Sagi-Kazar --- api/v2/go.mod | 10 +++++++++- go.mod | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/api/v2/go.mod b/api/v2/go.mod index 4d44783f..3585bc14 100644 --- a/api/v2/go.mod +++ b/api/v2/go.mod @@ -1,8 +1,16 @@ module github.com/dexidp/dex/api/v2 -go 1.14 +go 1.17 require ( google.golang.org/grpc v1.40.0 google.golang.org/protobuf v1.27.1 ) + +require ( + github.com/golang/protobuf v1.5.0 // indirect + golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect + golang.org/x/text v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect +) diff --git a/go.mod b/go.mod index 119cdfea..8e3beaaf 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/dexidp/dex -go 1.16 +go 1.17 require ( entgo.io/ent v0.9.0 @@ -39,4 +39,47 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 ) +require ( + cloud.google.com/go v0.90.0 // indirect + github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver/v3 v3.1.1 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/huandu/xstrings v1.3.1 // indirect + github.com/imdario/mergo v0.3.11 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jonboulle/clockwork v0.2.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mitchellh/copystructure v1.0.0 // indirect + github.com/mitchellh/reflectwalk v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.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/shopspring/decimal v1.2.0 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.etcd.io/etcd/api/v3 v3.5.0 // indirect + go.opencensus.io v0.23.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/sys v0.0.0-20210806184541-e5e7981a1069 // indirect + golang.org/x/text v0.3.6 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect +) + replace github.com/dexidp/dex/api/v2 => ./api/v2