-
Notifications
You must be signed in to change notification settings - Fork 324
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
Bump to go 1.17 #878
Bump to go 1.17 #878
Changes from all commits
5419e55
71dc886
d8ed8ba
18a3d17
2ca1261
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
module github.com/hashicorp/consul-k8s/charts | ||
|
||
go 1.16 | ||
go 1.17 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,164 @@ | ||
module github.com/hashicorp/consul-k8s/cli | ||
|
||
go 1.16 | ||
go 1.17 | ||
|
||
require ( | ||
github.com/bgentry/speakeasy v0.1.0 | ||
github.com/cenkalti/backoff v2.2.1+incompatible | ||
github.com/fatih/color v1.9.0 | ||
github.com/golang/protobuf v1.5.2 // indirect | ||
github.com/hashicorp/consul-k8s/charts v0.0.0-00010101000000-000000000000 | ||
github.com/hashicorp/go-hclog v0.16.2 | ||
github.com/hashicorp/go-multierror v1.1.0 // indirect | ||
github.com/kr/text v0.2.0 | ||
github.com/mattn/go-colorable v0.1.8 // indirect | ||
github.com/mattn/go-isatty v0.0.12 | ||
github.com/mitchellh/cli v1.1.2 | ||
github.com/mitchellh/go-wordwrap v1.0.1 // indirect | ||
github.com/olekukonko/tablewriter v0.0.4 | ||
github.com/posener/complete v1.1.1 | ||
github.com/stretchr/testify v1.7.0 | ||
go.starlark.net v0.0.0-20200707032745-474f21a9602d // indirect | ||
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect | ||
google.golang.org/grpc v1.33.1 // indirect | ||
helm.sh/helm/v3 v3.6.1 | ||
k8s.io/api v0.21.2 | ||
k8s.io/apimachinery v0.21.2 | ||
k8s.io/cli-runtime v0.21.0 | ||
k8s.io/client-go v0.21.2 | ||
rsc.io/letsencrypt v0.0.3 // indirect | ||
sigs.k8s.io/yaml v1.2.0 | ||
) | ||
|
||
require ( | ||
Comment on lines
23
to
+25
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could we merge these require blocks? |
||
cloud.google.com/go v0.54.0 // indirect | ||
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect | ||
github.com/Azure/go-autorest v14.2.0+incompatible // indirect | ||
github.com/Azure/go-autorest/autorest v0.11.12 // indirect | ||
github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect | ||
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect | ||
github.com/Azure/go-autorest/logger v0.2.0 // indirect | ||
github.com/Azure/go-autorest/tracing v0.6.0 // indirect | ||
github.com/BurntSushi/toml v0.3.1 // indirect | ||
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect | ||
github.com/Masterminds/goutils v1.1.1 // indirect | ||
github.com/Masterminds/semver v1.5.0 // indirect | ||
github.com/Masterminds/semver/v3 v3.1.1 // indirect | ||
github.com/Masterminds/sprig v2.22.0+incompatible // indirect | ||
github.com/Masterminds/sprig/v3 v3.2.2 // indirect | ||
github.com/Masterminds/squirrel v1.5.0 // indirect | ||
github.com/Microsoft/go-winio v0.4.16 // indirect | ||
github.com/Microsoft/hcsshim v0.8.14 // indirect | ||
github.com/PuerkitoBio/purell v1.1.1 // indirect | ||
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect | ||
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 // indirect | ||
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect | ||
github.com/beorn7/perks v1.0.1 // indirect | ||
github.com/cespare/xxhash/v2 v2.1.1 // indirect | ||
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect | ||
github.com/containerd/containerd v1.4.4 // indirect | ||
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect | ||
github.com/cyphar/filepath-securejoin v0.2.2 // indirect | ||
github.com/davecgh/go-spew v1.1.1 // indirect | ||
github.com/deislabs/oras v0.11.1 // indirect | ||
github.com/docker/cli v20.10.5+incompatible // indirect | ||
github.com/docker/distribution v2.7.1+incompatible // indirect | ||
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect | ||
github.com/docker/docker-credential-helpers v0.6.3 // indirect | ||
github.com/docker/go-connections v0.4.0 // indirect | ||
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 // indirect | ||
github.com/docker/go-units v0.4.0 // indirect | ||
github.com/evanphx/json-patch v4.9.0+incompatible // indirect | ||
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect | ||
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect | ||
github.com/go-errors/errors v1.0.1 // indirect | ||
github.com/go-logr/logr v0.4.0 // indirect | ||
github.com/go-openapi/jsonpointer v0.19.3 // indirect | ||
github.com/go-openapi/jsonreference v0.19.3 // indirect | ||
github.com/go-openapi/spec v0.19.5 // indirect | ||
github.com/go-openapi/swag v0.19.5 // indirect | ||
github.com/gobwas/glob v0.2.3 // 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/btree v1.0.0 // indirect | ||
github.com/google/go-cmp v0.5.5 // indirect | ||
github.com/google/gofuzz v1.1.0 // indirect | ||
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect | ||
github.com/google/uuid v1.1.2 // indirect | ||
github.com/googleapis/gnostic v0.4.1 // indirect | ||
github.com/gorilla/mux v1.7.3 // indirect | ||
github.com/gosuri/uitable v0.0.4 // indirect | ||
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect | ||
github.com/hashicorp/errwrap v1.0.0 // indirect | ||
github.com/hashicorp/go-multierror v1.1.0 // indirect | ||
github.com/hashicorp/golang-lru v0.5.1 // indirect | ||
github.com/huandu/xstrings v1.3.2 // indirect | ||
github.com/imdario/mergo v0.3.11 // indirect | ||
github.com/inconshreveable/mousetrap v1.0.0 // indirect | ||
github.com/jmoiron/sqlx v1.3.1 // indirect | ||
github.com/json-iterator/go v1.1.10 // indirect | ||
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect | ||
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect | ||
github.com/lib/pq v1.10.0 // indirect | ||
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect | ||
github.com/mailru/easyjson v0.7.0 // indirect | ||
github.com/mattn/go-colorable v0.1.8 // indirect | ||
github.com/mattn/go-runewidth v0.0.7 // indirect | ||
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect | ||
github.com/mitchellh/copystructure v1.1.1 // indirect | ||
github.com/mitchellh/go-wordwrap v1.0.1 // indirect | ||
github.com/mitchellh/reflectwalk v1.0.1 // indirect | ||
github.com/moby/spdystream v0.2.0 // indirect | ||
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect | ||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
github.com/modern-go/reflect2 v1.0.1 // indirect | ||
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect | ||
github.com/morikuni/aec v1.0.0 // indirect | ||
github.com/opencontainers/go-digest v1.0.0 // indirect | ||
github.com/opencontainers/image-spec v1.0.1 // indirect | ||
github.com/opencontainers/runc v0.1.1 // indirect | ||
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect | ||
github.com/pkg/errors v0.9.1 // indirect | ||
github.com/pmezard/go-difflib v1.0.0 // indirect | ||
github.com/prometheus/client_golang v1.7.1 // indirect | ||
github.com/prometheus/client_model v0.2.0 // indirect | ||
github.com/prometheus/common v0.10.0 // indirect | ||
github.com/prometheus/procfs v0.2.0 // indirect | ||
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect | ||
github.com/russross/blackfriday v1.5.2 // indirect | ||
github.com/shopspring/decimal v1.2.0 // indirect | ||
github.com/sirupsen/logrus v1.8.1 // indirect | ||
github.com/spf13/cast v1.3.1 // indirect | ||
github.com/spf13/cobra v1.1.3 // indirect | ||
github.com/spf13/pflag v1.0.5 // indirect | ||
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect | ||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect | ||
github.com/xeipuuv/gojsonschema v1.2.0 // indirect | ||
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect | ||
go.opencensus.io v0.22.3 // indirect | ||
go.starlark.net v0.0.0-20200707032745-474f21a9602d // indirect | ||
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect | ||
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 // indirect | ||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect | ||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect | ||
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect | ||
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect | ||
golang.org/x/text v0.3.4 // indirect | ||
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect | ||
google.golang.org/appengine v1.6.5 // indirect | ||
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect | ||
google.golang.org/grpc v1.33.1 // indirect | ||
google.golang.org/protobuf v1.26.0 // indirect | ||
gopkg.in/gorp.v1 v1.7.2 // indirect | ||
gopkg.in/inf.v0 v0.9.1 // indirect | ||
gopkg.in/yaml.v2 v2.4.0 // indirect | ||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect | ||
k8s.io/apiextensions-apiserver v0.21.0 // indirect | ||
k8s.io/apiserver v0.21.0 // indirect | ||
k8s.io/component-base v0.21.0 // indirect | ||
k8s.io/klog/v2 v2.8.0 // indirect | ||
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect | ||
k8s.io/kubectl v0.21.0 // indirect | ||
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect | ||
rsc.io/letsencrypt v0.0.3 // indirect | ||
sigs.k8s.io/kustomize/api v0.8.5 // indirect | ||
sigs.k8s.io/kustomize/kyaml v0.10.15 // indirect | ||
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect | ||
) | ||
|
||
// This replace directive is to avoid having to manually bump the version of the charts module upon changes to the Helm | ||
// chart. When the CLI compiles, all changes to the local charts directory are picked up automatically. This directive | ||
// works because of the monorepo setup, where the charts module and CLI module are in the same repository. Otherwise, | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// +build enterprise | ||
//go:build enterprise | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm sure there is a reason but why do we need the duplicate enterprise build declaration? Is the old one left for backward compatibility? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This stack overflow was good context on how they interplay-- https://stackoverflow.com/questions/68360688/whats-the-difference-between-gobuild-and-build-directives?noredirect=1&lq=1 We can leave both which in theory would be backwards compatible but we have bumped the min go version to 1.17 anyways so we could probably just remove the old There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks for the info and link!! I was thinking that if we're bumping the min go version there would be no need for back compatibility lines? If its too much work there's very little to be gained from it, but might be cleaner. Will defer to to your judgement! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yup I agree! |
||
|
||
package catalog | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// +build enterprise | ||
//go:build enterprise | ||
|
||
package catalog | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// +build enterprise | ||
//go:build enterprise | ||
|
||
package connectinject | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// +build enterprise | ||
//go:build enterprise | ||
|
||
package connectinject | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// +build enterprise | ||
//go:build enterprise | ||
|
||
package controller_test | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// +build enterprise | ||
//go:build enterprise | ||
|
||
package controller_test | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we merge these require blocks?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
go 1.17 groups the require blocks as indirect and direct, and since this is generated I think we should leave it as it was generated via
go mod tidy
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for explaining!