diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1bb19015e..4f9206cc1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.17.x - name: Set up Docker run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d11223fb9..a95d2cd7b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,7 +9,7 @@ jobs: test: strategy: matrix: - go-version: [1.16.x] + go-version: [1.17.x] platform: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.platform }} steps: @@ -53,7 +53,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.17.x - uses: actions/checkout@v2 with: @@ -97,7 +97,7 @@ jobs: integration: strategy: matrix: - go-version: [1.16.x] + go-version: [1.17.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: @@ -143,7 +143,7 @@ jobs: build: strategy: matrix: - go-version: [1.16.x] + go-version: [1.17.x] platform: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.platform }} steps: @@ -202,7 +202,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.17.x - uses: actions/setup-python@v2 - uses: pre-commit/action@release with: @@ -214,14 +214,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: [1.16.x] + go-version: [1.17.x] platform: [ubuntu-latest] needs: - build steps: - uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.17.x - uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index 1d9eda405..6e0428e20 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ GOOSARCHES = linux/amd64 darwin/amd64 windows/amd64 GOOS = $(shell $(GO) env GOOS) GOARCH= $(shell $(GO) env GOARCH) GETENVOY_VERSION = v0.2.0 -GORELEASER_VERSION = v0.157.0 +GORELEASER_VERSION = v0.174.2 .PHONY: all all: clean build-deps test lint spellcheck build ## Runs a clean, build, fmt, lint, test, and vet. @@ -55,7 +55,7 @@ deps-build: get-envoy ## Install build dependencies .PHONY: deps-release deps-release: get-envoy ## Install release dependencies @echo "==> $@" - @cd /tmp; GO111MODULE=on $(GO) get github.com/goreleaser/goreleaser@${GORELEASER_VERSION} + @cd /tmp; GO111MODULE=on $(GO) install github.com/goreleaser/goreleaser@${GORELEASER_VERSION} .PHONY: build-deps build-deps: deps-build deps-release diff --git a/go.mod b/go.mod index 42d7ee257..f1ba81cef 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/pomerium/pomerium -go 1.16 +go 1.17 require ( contrib.go.opencensus.io/exporter/jaeger v0.2.1 @@ -72,3 +72,176 @@ require ( gopkg.in/auth0.v5 v5.19.2 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) + +require ( + 4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a // indirect + cloud.google.com/go v0.90.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/DataDog/datadog-go v3.5.0+incompatible // indirect + github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Microsoft/go-winio v0.4.14 // indirect + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect + github.com/OneOfOne/xxhash v1.2.8 // indirect + github.com/OpenPeeDeeP/depguard v1.0.1 // indirect + github.com/PuerkitoBio/rehttp v1.0.0 // indirect + github.com/StackExchange/wmi v1.2.1 // indirect + github.com/alexkohler/prealloc v1.0.0 // indirect + github.com/ashanbrown/forbidigo v1.2.0 // indirect + github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bkielbasa/cyclop v1.2.0 // indirect + github.com/bombsimon/wsl/v3 v3.3.0 // indirect + github.com/bytecodealliance/wasmtime-go v0.28.0 // indirect + github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect + github.com/charithe/durationcheck v0.0.8 // indirect + github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af // indirect + github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed // indirect + github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 // indirect + github.com/daixiang0/gci v0.2.8 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/denis-tingajkin/go-header v0.4.2 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/docker/cli v20.10.7+incompatible // indirect + github.com/docker/docker v20.10.7+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/esimonov/ifshort v1.0.2 // indirect + github.com/ettle/strcase v0.1.1 // indirect + github.com/fatih/color v1.12.0 // indirect + github.com/fatih/structtag v1.2.0 // indirect + github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/fzipp/gocyclo v0.3.1 // indirect + github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-critic/go-critic v0.5.6 // indirect + github.com/go-kit/log v0.1.0 // indirect + github.com/go-logfmt/logfmt v0.5.0 // indirect + github.com/go-ole/go-ole v1.2.5 // indirect + github.com/go-toolsmith/astcast v1.0.0 // indirect + github.com/go-toolsmith/astcopy v1.0.0 // indirect + github.com/go-toolsmith/astequal v1.0.0 // indirect + github.com/go-toolsmith/astfmt v1.0.0 // indirect + github.com/go-toolsmith/astp v1.0.0 // indirect + github.com/go-toolsmith/strparse v1.0.0 // indirect + github.com/go-toolsmith/typep v1.0.2 // indirect + github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/gofrs/flock v0.8.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect + github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect + github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 // indirect + github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect + github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect + github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect + github.com/golangci/misspell v0.3.5 // indirect + github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5 // indirect + github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect + github.com/gorilla/securecookie v1.1.1 // indirect + github.com/gostaticanalysis/analysisutil v0.4.1 // indirect + github.com/gostaticanalysis/comment v1.4.1 // indirect + github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5 // indirect + github.com/gostaticanalysis/nilerr v0.1.1 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jgautheron/goconst v1.5.1 // indirect + github.com/jingyugao/rowserrcheck v1.1.0 // indirect + github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect + github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d // indirect + github.com/kisielk/errcheck v1.6.0 // indirect + github.com/kisielk/gotool v1.0.0 // indirect + github.com/klauspost/cpuid/v2 v2.0.6 // indirect + github.com/kulti/thelper v0.4.0 // indirect + github.com/kunwardeep/paralleltest v1.0.2 // indirect + github.com/kyoh86/exportloopref v0.1.8 // indirect + github.com/ldez/gomoddirectives v0.2.1 // indirect + github.com/ldez/tagliatelle v0.2.0 // indirect + github.com/libdns/libdns v0.2.1 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/maratori/testpackage v1.0.1 // indirect + github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mbilski/exhaustivestruct v1.2.0 // indirect + github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 // indirect + github.com/mgechev/revive v1.0.7 // indirect + github.com/mholt/acmez v0.1.3 // indirect + github.com/miekg/dns v1.1.42 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect + github.com/moricho/tparallel v0.2.1 // indirect + github.com/nakabonne/nestif v0.3.0 // indirect + github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect + github.com/nishanths/exhaustive v0.1.0 // indirect + github.com/nishanths/predeclared v0.2.1 // indirect + github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/opencontainers/go-digest v1.0.0-rc1 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/opencontainers/runc v1.0.0-rc9 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect + github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect + github.com/philhofer/fwd v1.0.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/polyfloyd/go-errorlint v0.0.0-20210510181950-ab96adb96fea // indirect + github.com/quasilyte/go-ruleguard v0.3.4 // indirect + github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect + github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect + github.com/ryancurrah/gomodguard v1.2.2 // indirect + github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect + github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect + github.com/securego/gosec/v2 v2.8.0 // indirect + github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/sonatard/noctx v0.0.1 // indirect + github.com/sourcegraph/go-diff v0.6.1 // indirect + github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/ssgreg/nlreturn/v2 v2.1.0 // indirect + github.com/stretchr/objx v0.1.1 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect + github.com/tetafro/godot v1.4.7 // indirect + github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect + github.com/tinylib/msgp v1.1.2 // indirect + github.com/tklauser/go-sysconf v0.3.7 // indirect + github.com/tklauser/numcpus v0.2.3 // indirect + github.com/tomarrell/wrapcheck/v2 v2.1.0 // indirect + github.com/tommy-muehle/go-mnd/v2 v2.4.0 // indirect + github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect + github.com/ultraware/funlen v0.0.3 // indirect + github.com/ultraware/whitespace v0.0.4 // indirect + github.com/uudashr/gocognit v1.0.1 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/yashtewari/glob-intersection v0.0.0-20180916065949-5c77d914dd0b // indirect + github.com/yeya24/promlinter v0.1.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/tools v0.1.5 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/appengine v1.6.7 // indirect + gopkg.in/DataDog/dd-trace-go.v1 v1.22.0 // indirect + gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/square/go-jose.v2 v2.5.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + honnef.co/go/tools v0.2.0 // indirect + mvdan.cc/gofumpt v0.1.1 // indirect + mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect + mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect + mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect +) diff --git a/integration/internal/cluster/cmd_linux.go b/integration/internal/cluster/cmd_linux.go index b18d0e9e7..60a0e2c1b 100644 --- a/integration/internal/cluster/cmd_linux.go +++ b/integration/internal/cluster/cmd_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package cluster diff --git a/integration/internal/cluster/cmd_notlinux.go b/integration/internal/cluster/cmd_notlinux.go index aa8200be2..af8633a6d 100644 --- a/integration/internal/cluster/cmd_notlinux.go +++ b/integration/internal/cluster/cmd_notlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package cluster diff --git a/internal/envoy/envoy_darwin.go b/internal/envoy/envoy_darwin.go index d147bfd0e..c2ffd300e 100644 --- a/internal/envoy/envoy_darwin.go +++ b/internal/envoy/envoy_darwin.go @@ -1,3 +1,4 @@ +//go:build darwin // +build darwin package envoy diff --git a/internal/envoy/envoy_linux.go b/internal/envoy/envoy_linux.go index a4480c63c..b46fdc656 100644 --- a/internal/envoy/envoy_linux.go +++ b/internal/envoy/envoy_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package envoy diff --git a/internal/envoy/envoy_other.go b/internal/envoy/envoy_other.go index 57ab2c81e..dc901fa7b 100644 --- a/internal/envoy/envoy_other.go +++ b/internal/envoy/envoy_other.go @@ -1,3 +1,4 @@ +//go:build !linux && !darwin // +build !linux,!darwin package envoy diff --git a/internal/envoy/files/files_darwin.go b/internal/envoy/files/files_darwin.go index e229092d0..82c8f7ebd 100644 --- a/internal/envoy/files/files_darwin.go +++ b/internal/envoy/files/files_darwin.go @@ -1,4 +1,5 @@ -//+build darwin +//go:build darwin +// +build darwin package files diff --git a/internal/envoy/files/files_linux_amd64.go b/internal/envoy/files/files_linux_amd64.go index 71eede83e..f7f90a2e6 100644 --- a/internal/envoy/files/files_linux_amd64.go +++ b/internal/envoy/files/files_linux_amd64.go @@ -1,4 +1,5 @@ -//+build linux,amd64 +//go:build linux && amd64 +// +build linux,amd64 package files diff --git a/internal/envoy/files/files_linux_arm64.go b/internal/envoy/files/files_linux_arm64.go index 239d99b16..9932070f0 100644 --- a/internal/envoy/files/files_linux_arm64.go +++ b/internal/envoy/files/files_linux_arm64.go @@ -1,4 +1,5 @@ -//+build linux,arm64 +//go:build linux && arm64 +// +build linux,arm64 package files diff --git a/tools.go b/tools.go index c18b7e86b..c5a0ac5e2 100644 --- a/tools.go +++ b/tools.go @@ -1,4 +1,5 @@ -//+build tools +//go:build tools +// +build tools package pomerium