Skip to content

Commit e833fc1

Browse files
committed
Rebase on master and fix go.mod
1 parent ccca60c commit e833fc1

File tree

6 files changed

+101
-92
lines changed

6 files changed

+101
-92
lines changed

.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install Go
2121
uses: actions/setup-go@v5
2222
with:
23-
go-version: 1.21
23+
go-version: 1.22
2424
- name: Checkout code
2525
uses: actions/checkout@v4
2626
- uses: actions/cache@v4

.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.21
1+
golang 1.22

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ test: build
99
go test -v ./...
1010

1111
dockerbuild:
12-
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.21 go build -v
12+
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.22 go build -v
1313

1414
dockertest:
15-
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.21 go test -v ./...
15+
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.22 go test -v ./...
1616

1717
release:
18-
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.21 /workspace/scripts/release.sh
18+
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.22 /workspace/scripts/release.sh
1919

2020
snapshot:
21-
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.21 /workspace/scripts/release.sh --snapshot
21+
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.22 /workspace/scripts/release.sh --snapshot
2222

2323
.PHONY: build test changelog targets $(TARGETS)

go.mod

+22-24
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.22
55
require (
66
github.com/hashicorp/go-multierror v1.1.1
77
github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f
8-
github.com/hashicorp/hcl/v2 v2.17.0
9-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
8+
github.com/hashicorp/hcl/v2 v2.20.1
9+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
1010
github.com/hashicorp/terraform-provider-kubernetes v1.13.4-0.20230417041302-5de2ce8af29e
1111
github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334
1212
github.com/jinzhu/inflection v1.0.0
@@ -15,15 +15,15 @@ require (
1515
github.com/sirupsen/logrus v1.8.1
1616
github.com/spf13/pflag v1.0.5
1717
github.com/stretchr/testify v1.8.2
18-
github.com/zclconf/go-cty v1.14.2
18+
github.com/zclconf/go-cty v1.14.4
1919
k8s.io/api v0.25.5
2020
k8s.io/apimachinery v0.25.5
2121
k8s.io/client-go v11.0.0+incompatible
2222
k8s.io/kube-aggregator v0.25.5
2323
)
2424

2525
require (
26-
cloud.google.com/go/compute v1.23.3 // indirect
26+
cloud.google.com/go/compute v1.24.0 // indirect
2727
cloud.google.com/go/compute/metadata v0.2.3 // indirect
2828
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2929
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -33,9 +33,8 @@ require (
3333
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3434
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3535
github.com/MakeNowJust/heredoc v1.0.0 // indirect
36-
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
36+
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
3737
github.com/agext/levenshtein v1.2.3 // indirect
38-
github.com/apparentlymart/go-textseg v1.0.0 // indirect
3938
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
4039
github.com/chai2010/gettext-go v1.0.2 // indirect
4140
github.com/cloudflare/circl v1.3.7 // indirect
@@ -46,19 +45,19 @@ require (
4645
github.com/fatih/camelcase v1.0.0 // indirect
4746
github.com/fatih/color v1.16.0 // indirect
4847
github.com/go-errors/errors v1.4.2 // indirect
49-
github.com/go-logr/logr v1.2.3 // indirect
48+
github.com/go-logr/logr v1.4.1 // indirect
5049
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5150
github.com/go-openapi/jsonreference v0.20.1 // indirect
5251
github.com/go-openapi/swag v0.22.3 // indirect
5352
github.com/gogo/protobuf v1.3.2 // indirect
5453
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
55-
github.com/golang/protobuf v1.5.3 // indirect
54+
github.com/golang/protobuf v1.5.4 // indirect
5655
github.com/google/btree v1.1.2 // indirect
5756
github.com/google/gnostic v0.6.9 // indirect
5857
github.com/google/go-cmp v0.6.0 // indirect
5958
github.com/google/gofuzz v1.2.0 // indirect
6059
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
61-
github.com/google/uuid v1.4.0 // indirect
60+
github.com/google/uuid v1.6.0 // indirect
6261
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
6362
github.com/hashicorp/errwrap v1.1.0 // indirect
6463
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
@@ -68,12 +67,11 @@ require (
6867
github.com/hashicorp/go-plugin v1.6.0 // indirect
6968
github.com/hashicorp/go-uuid v1.0.3 // indirect
7069
github.com/hashicorp/go-version v1.6.0 // indirect
71-
github.com/hashicorp/hc-install v0.6.3 // indirect
72-
github.com/hashicorp/hcl/v2 v2.19.1 // indirect
70+
github.com/hashicorp/hc-install v0.6.4 // indirect
7371
github.com/hashicorp/logutils v1.0.0 // indirect
74-
github.com/hashicorp/terraform-exec v0.20.0 // indirect
75-
github.com/hashicorp/terraform-json v0.21.0 // indirect
76-
github.com/hashicorp/terraform-plugin-go v0.22.0 // indirect
72+
github.com/hashicorp/terraform-exec v0.21.0 // indirect
73+
github.com/hashicorp/terraform-json v0.22.1 // indirect
74+
github.com/hashicorp/terraform-plugin-go v0.23.0 // indirect
7775
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
7876
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
7977
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
@@ -110,18 +108,18 @@ require (
110108
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
111109
github.com/xlab/treeprint v1.1.0 // indirect
112110
go.starlark.net v0.0.0-20221205180719-3fd0dac74452 // indirect
113-
golang.org/x/crypto v0.19.0 // indirect
114-
golang.org/x/mod v0.15.0 // indirect
115-
golang.org/x/net v0.19.0 // indirect
116-
golang.org/x/oauth2 v0.14.0 // indirect
117-
golang.org/x/sys v0.17.0 // indirect
118-
golang.org/x/term v0.17.0 // indirect
119-
golang.org/x/text v0.14.0 // indirect
111+
golang.org/x/crypto v0.23.0 // indirect
112+
golang.org/x/mod v0.16.0 // indirect
113+
golang.org/x/net v0.23.0 // indirect
114+
golang.org/x/oauth2 v0.17.0 // indirect
115+
golang.org/x/sys v0.20.0 // indirect
116+
golang.org/x/term v0.20.0 // indirect
117+
golang.org/x/text v0.15.0 // indirect
120118
golang.org/x/time v0.3.0 // indirect
121119
google.golang.org/appengine v1.6.8 // indirect
122-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
123-
google.golang.org/grpc v1.61.1 // indirect
124-
google.golang.org/protobuf v1.32.0 // indirect
120+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
121+
google.golang.org/grpc v1.63.2 // indirect
122+
google.golang.org/protobuf v1.34.0 // indirect
125123
gopkg.in/inf.v0 v0.9.1 // indirect
126124
gopkg.in/yaml.v2 v2.4.0 // indirect
127125
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)