Skip to content

Commit 9cbdc24

Browse files
committed
changes reverted
1 parent f73a45a commit 9cbdc24

File tree

2 files changed

+74
-56
lines changed

2 files changed

+74
-56
lines changed

go.mod

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ require (
77
github.com/getkin/kin-openapi v0.111.0
88
github.com/google/go-cmp v0.6.0
99
github.com/hashicorp/go-hclog v1.6.3
10-
github.com/hashicorp/go-plugin v1.6.2
10+
github.com/hashicorp/go-plugin v1.6.0
1111
github.com/hashicorp/go-version v1.6.0
1212
github.com/hashicorp/hc-install v0.6.4
1313
github.com/hashicorp/hcl/v2 v2.20.1
1414
github.com/hashicorp/terraform-exec v0.21.0
1515
github.com/hashicorp/terraform-json v0.22.1
1616
github.com/hashicorp/terraform-plugin-codegen-kubernetes v0.1.0
1717
github.com/hashicorp/terraform-plugin-docs v0.16.0
18-
github.com/hashicorp/terraform-plugin-framework v1.13.0
18+
github.com/hashicorp/terraform-plugin-framework v1.10.0
1919
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1
20-
github.com/hashicorp/terraform-plugin-framework-validators v0.15.0
21-
github.com/hashicorp/terraform-plugin-go v0.25.0
20+
github.com/hashicorp/terraform-plugin-framework-validators v0.13.0
21+
github.com/hashicorp/terraform-plugin-go v0.23.0
2222
github.com/hashicorp/terraform-plugin-log v0.9.0
2323
github.com/hashicorp/terraform-plugin-mux v0.16.0
2424
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
@@ -27,7 +27,11 @@ require (
2727
github.com/mitchellh/go-homedir v1.1.0
2828
github.com/mitchellh/hashstructure v1.1.0
2929
github.com/robfig/cron v1.2.0
30+
<<<<<<< HEAD
3031
github.com/stretchr/testify v1.9.0
32+
=======
33+
github.com/stretchr/testify v1.8.4
34+
>>>>>>> parent of 4e1cc33e (updated go mod)
3135
golang.org/x/mod v0.17.0
3236
k8s.io/api v0.30.3
3337
k8s.io/apiextensions-apiserver v0.28.6
@@ -51,12 +55,12 @@ require (
5155
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5256
github.com/google/gnostic-models v0.6.8 // indirect
5357
github.com/gorilla/websocket v1.5.0 // indirect
58+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
5459
github.com/huandu/xstrings v1.3.3 // indirect
5560
github.com/invopop/yaml v0.2.0 // indirect
5661
github.com/mitchellh/cli v1.1.5 // indirect
5762
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
5863
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
59-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6064
github.com/posener/complete v1.2.3 // indirect
6165
github.com/russross/blackfriday/v2 v2.1.0 // indirect
6266
github.com/shopspring/decimal v1.3.1 // indirect
@@ -66,7 +70,7 @@ require (
6670
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
6771
golang.org/x/sync v0.8.0 // indirect
6872
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
69-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
73+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
7074
)
7175

7276
require (
@@ -81,9 +85,9 @@ require (
8185
github.com/fatih/color v1.16.0 // indirect
8286
github.com/go-errors/errors v1.4.2 // indirect
8387
github.com/go-logr/logr v1.4.2 // indirect
84-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
88+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
8589
github.com/go-openapi/jsonreference v0.20.2 // indirect
86-
github.com/go-openapi/swag v0.22.4 // indirect
90+
github.com/go-openapi/swag v0.23.0 // indirect
8791
github.com/gogo/protobuf v1.3.2 // indirect
8892
github.com/golang/protobuf v1.5.4 // indirect
8993
github.com/google/btree v1.1.2 // indirect
@@ -122,24 +126,24 @@ require (
122126
github.com/oklog/run v1.1.0 // indirect
123127
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
124128
github.com/pkg/errors v0.9.1 // indirect
125-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
129+
github.com/pmezard/go-difflib v1.0.0 // indirect
126130
github.com/russross/blackfriday v1.6.0 // indirect
127131
github.com/spf13/cobra v1.7.0 // indirect
128132
github.com/spf13/pflag v1.0.5 // indirect
129133
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
130134
github.com/xlab/treeprint v1.2.0 // indirect
131-
github.com/zclconf/go-cty v1.14.4
135+
github.com/zclconf/go-cty v1.15.0
132136
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
133137
golang.org/x/crypto v0.26.0 // indirect
134-
golang.org/x/net v0.28.0 // indirect
135-
golang.org/x/oauth2 v0.22.0 // indirect
136-
golang.org/x/sys v0.24.0 // indirect
138+
golang.org/x/net v0.26.0 // indirect
139+
golang.org/x/oauth2 v0.21.0 // indirect
140+
golang.org/x/sys v0.23.0 // indirect
137141
golang.org/x/term v0.23.0 // indirect
138142
golang.org/x/text v0.17.0 // indirect
139143
golang.org/x/time v0.3.0 // indirect
140144
google.golang.org/appengine v1.6.8 // indirect
141-
google.golang.org/grpc v1.67.1
142-
google.golang.org/protobuf v1.35.1 // indirect
145+
google.golang.org/grpc v1.63.2
146+
google.golang.org/protobuf v1.34.2 // indirect
143147
gopkg.in/inf.v0 v0.9.1 // indirect
144148
gopkg.in/yaml.v2 v2.4.0 // indirect
145149
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)