Skip to content

Commit a270663

Browse files
Bump golang, dependencies, replace golint with staticcheck (#510)
1 parent e20ad2f commit a270663

File tree

7 files changed

+178
-809
lines changed

7 files changed

+178
-809
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name: CI
33

44
env:
5-
VERSION_GO: '1.19.8'
6-
VERSION_HELM: 'v3.11.3'
5+
VERSION_GO: '1.20.12'
6+
VERSION_HELM: 'v3.13.3'
77

88
on:
99
pull_request:

Dockerfile.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19.8
1+
FROM golang:1.20.12
22

33
# See https://github.com/cli/cli/blob/trunk/docs/install_linux.md#debian-ubuntu-linux-raspberry-pi-os-apt
44
# for the latest gh install instructions when the below didn't work

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ install/helm3: build
2929
lint:
3030
scripts/update-gofmt.sh
3131
scripts/verify-gofmt.sh
32-
scripts/verify-golint.sh
3332
scripts/verify-govet.sh
33+
scripts/verify-staticcheck.sh
3434

3535
.PHONY: build
3636
build: lint
@@ -45,7 +45,7 @@ test:
4545
.PHONY: bootstrap
4646
bootstrap:
4747
go mod download
48-
command -v golint || GO111MODULE=off go get -u golang.org/x/lint/golint
48+
command -v staticcheck || go install honnef.co/go/tools/cmd/staticcheck@latest
4949

5050
.PHONY: docker-run-release
5151
docker-run-release: export pkg=/go/src/github.com/databus23/helm-diff

go.mod

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/databus23/helm-diff/v3
22

3-
go 1.21
3+
go 1.20
44

55
require (
66
github.com/Masterminds/semver v1.5.0
@@ -11,16 +11,16 @@ require (
1111
github.com/pkg/errors v0.9.1
1212
github.com/spf13/cobra v1.7.0
1313
github.com/spf13/pflag v1.0.5
14-
github.com/stretchr/testify v1.8.2
14+
github.com/stretchr/testify v1.8.4
1515
golang.org/x/crypto v0.14.0 // indirect
16-
google.golang.org/grpc v1.53.0 // indirect
16+
google.golang.org/grpc v1.56.3 // indirect
1717
gopkg.in/yaml.v2 v2.4.0
18-
helm.sh/helm/v3 v3.11.3
19-
k8s.io/api v0.26.2
20-
k8s.io/apiextensions-apiserver v0.26.0
21-
k8s.io/apimachinery v0.26.2
22-
k8s.io/cli-runtime v0.26.0
23-
k8s.io/client-go v0.26.2
18+
helm.sh/helm/v3 v3.13.3
19+
k8s.io/api v0.28.4
20+
k8s.io/apiextensions-apiserver v0.28.4
21+
k8s.io/apimachinery v0.28.4
22+
k8s.io/cli-runtime v0.28.4
23+
k8s.io/client-go v0.28.4
2424
sigs.k8s.io/yaml v1.3.0
2525
)
2626

@@ -32,48 +32,49 @@ require (
3232
)
3333

3434
require (
35-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
35+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
3636
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
37-
github.com/BurntSushi/toml v1.2.1 // indirect
37+
github.com/BurntSushi/toml v1.3.2 // indirect
3838
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3939
github.com/Masterminds/goutils v1.1.1 // indirect
40-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
40+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
4141
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
42-
github.com/Masterminds/squirrel v1.5.3 // indirect
42+
github.com/Masterminds/squirrel v1.5.4 // indirect
43+
github.com/Microsoft/hcsshim v0.11.0 // indirect
4344
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
4445
github.com/beorn7/perks v1.0.1 // indirect
4546
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4647
github.com/chai2010/gettext-go v1.0.2 // indirect
47-
github.com/containerd/containerd v1.7.0 // indirect
48-
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
48+
github.com/containerd/containerd v1.7.6 // indirect
49+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
4950
github.com/davecgh/go-spew v1.1.1 // indirect
50-
github.com/docker/cli v20.10.21+incompatible // indirect
51+
github.com/docker/cli v24.0.6+incompatible // indirect
5152
github.com/docker/distribution v2.8.2+incompatible // indirect
52-
github.com/docker/docker v20.10.24+incompatible // indirect
53+
github.com/docker/docker v24.0.7+incompatible // indirect
5354
github.com/docker/docker-credential-helpers v0.7.0 // indirect
5455
github.com/docker/go-connections v0.4.0 // indirect
5556
github.com/docker/go-metrics v0.0.1 // indirect
5657
github.com/docker/go-units v0.5.0 // indirect
5758
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
5859
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
5960
github.com/fatih/color v1.13.0 // indirect
60-
github.com/go-errors/errors v1.0.1 // indirect
61-
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
61+
github.com/go-errors/errors v1.4.2 // indirect
62+
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
6263
github.com/go-logr/logr v1.2.4 // indirect
6364
github.com/go-logr/stdr v1.2.2 // indirect
64-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
65-
github.com/go-openapi/jsonreference v0.20.0 // indirect
66-
github.com/go-openapi/swag v0.19.14 // indirect
65+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
66+
github.com/go-openapi/jsonreference v0.20.2 // indirect
67+
github.com/go-openapi/swag v0.22.3 // indirect
6768
github.com/gobwas/glob v0.2.3 // indirect
6869
github.com/gogo/protobuf v1.3.2 // indirect
69-
github.com/golang/protobuf v1.5.2 // indirect
70+
github.com/golang/protobuf v1.5.3 // indirect
7071
github.com/gonvenience/bunt v1.3.5 // indirect
7172
github.com/gonvenience/neat v1.3.11 // indirect
7273
github.com/gonvenience/term v1.0.2 // indirect
7374
github.com/gonvenience/text v1.0.7 // indirect
7475
github.com/gonvenience/wrap v1.1.2 // indirect
7576
github.com/google/btree v1.0.1 // indirect
76-
github.com/google/gnostic v0.5.7-v3refs // indirect
77+
github.com/google/gnostic-models v0.6.8 // indirect
7778
github.com/google/gofuzz v1.2.0 // indirect
7879
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7980
github.com/google/uuid v1.3.0 // indirect
@@ -90,71 +91,71 @@ require (
9091
github.com/klauspost/compress v1.16.0 // indirect
9192
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
9293
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
93-
github.com/lib/pq v1.10.7 // indirect
94+
github.com/lib/pq v1.10.9 // indirect
9495
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
9596
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
96-
github.com/mailru/easyjson v0.7.6 // indirect
97+
github.com/mailru/easyjson v0.7.7 // indirect
9798
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
9899
github.com/mattn/go-colorable v0.1.13 // indirect
99100
github.com/mattn/go-isatty v0.0.18 // indirect
100101
github.com/mattn/go-runewidth v0.0.9 // indirect
101102
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
102103
github.com/mitchellh/copystructure v1.2.0 // indirect
103104
github.com/mitchellh/go-ps v1.0.0 // indirect
104-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
105+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
105106
github.com/mitchellh/hashstructure v1.1.0 // indirect
106107
github.com/mitchellh/reflectwalk v1.0.2 // indirect
107108
github.com/moby/locker v1.0.1 // indirect
108109
github.com/moby/spdystream v0.2.0 // indirect
109-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
110+
github.com/moby/term v0.5.0 // indirect
110111
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
111112
github.com/modern-go/reflect2 v1.0.2 // indirect
112113
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
113114
github.com/morikuni/aec v1.0.0 // indirect
114115
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
115116
github.com/opencontainers/go-digest v1.0.0 // indirect
116-
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
117+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
117118
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
118119
github.com/pmezard/go-difflib v1.0.0 // indirect
119-
github.com/prometheus/client_golang v1.14.0 // indirect
120-
github.com/prometheus/client_model v0.3.0 // indirect
121-
github.com/prometheus/common v0.37.0 // indirect
122-
github.com/prometheus/procfs v0.8.0 // indirect
123-
github.com/rubenv/sql-migrate v1.3.1 // indirect
120+
github.com/prometheus/client_golang v1.16.0 // indirect
121+
github.com/prometheus/client_model v0.4.0 // indirect
122+
github.com/prometheus/common v0.44.0 // indirect
123+
github.com/prometheus/procfs v0.10.1 // indirect
124+
github.com/rubenv/sql-migrate v1.5.2 // indirect
124125
github.com/russross/blackfriday/v2 v2.1.0 // indirect
125126
github.com/sergi/go-diff v1.3.1 // indirect
126127
github.com/shopspring/decimal v1.3.1 // indirect
127-
github.com/sirupsen/logrus v1.9.0 // indirect
128+
github.com/sirupsen/logrus v1.9.3 // indirect
128129
github.com/spf13/cast v1.5.0 // indirect
129130
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
130131
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
131132
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
132133
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
133134
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
134-
github.com/xlab/treeprint v1.1.0 // indirect
135+
github.com/xlab/treeprint v1.2.0 // indirect
135136
go.opentelemetry.io/otel v1.14.0 // indirect
136137
go.opentelemetry.io/otel/trace v1.14.0 // indirect
137-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
138+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
138139
golang.org/x/net v0.17.0 // indirect
139-
golang.org/x/oauth2 v0.4.0 // indirect
140-
golang.org/x/sync v0.1.0 // indirect
140+
golang.org/x/oauth2 v0.8.0 // indirect
141+
golang.org/x/sync v0.3.0 // indirect
141142
golang.org/x/sys v0.13.0 // indirect
142143
golang.org/x/text v0.13.0 // indirect
143-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
144+
golang.org/x/time v0.3.0 // indirect
144145
google.golang.org/appengine v1.6.7 // indirect
145-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
146-
google.golang.org/protobuf v1.28.1 // indirect
146+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
147+
google.golang.org/protobuf v1.31.0 // indirect
147148
gopkg.in/inf.v0 v0.9.1 // indirect
148149
gopkg.in/yaml.v3 v3.0.1 // indirect
149-
k8s.io/apiserver v0.26.2 // indirect
150-
k8s.io/component-base v0.26.2 // indirect
151-
k8s.io/klog/v2 v2.90.1 // indirect
152-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
153-
k8s.io/kubectl v0.26.0 // indirect
154-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
155-
oras.land/oras-go v1.2.2 // indirect
156-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
157-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
158-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
150+
k8s.io/apiserver v0.28.4 // indirect
151+
k8s.io/component-base v0.28.4 // indirect
152+
k8s.io/klog/v2 v2.100.1 // indirect
153+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
154+
k8s.io/kubectl v0.28.4 // indirect
155+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
156+
oras.land/oras-go v1.2.4 // indirect
157+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
158+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
159+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
159160
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
160161
)

0 commit comments

Comments
 (0)