Skip to content

Commit 67d120c

Browse files
fix: end2end tests failing due to locked state
1 parent 13c7438 commit 67d120c

File tree

2 files changed

+18
-23
lines changed

2 files changed

+18
-23
lines changed

go.mod

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/hashicorp/go-cleanhttp v0.5.2
2929
github.com/hashicorp/go-retryablehttp v0.7.8
3030
github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80
31-
github.com/hashicorp/terraform-exec v0.23.0
31+
github.com/hashicorp/terraform-exec v0.16.1
3232
github.com/hashicorp/terraform-json v0.25.0
3333
github.com/jenkins-x/go-scm v1.15.1
3434
github.com/kubescape/go-git-url v0.0.30
@@ -124,7 +124,7 @@ require (
124124
github.com/fluxcd/pkg/apis/acl v0.7.0 // indirect
125125
github.com/fluxcd/pkg/ssa v0.51.0 // indirect
126126
github.com/fsnotify/fsnotify v1.9.0 // indirect
127-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
127+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
128128
github.com/go-errors/errors v1.5.1 // indirect
129129
github.com/go-fed/httpsig v1.1.0 // indirect
130130
github.com/go-logr/stdr v1.2.2 // indirect
@@ -160,7 +160,7 @@ require (
160160
github.com/moby/sys/sequential v0.6.0 // indirect
161161
github.com/moby/term v0.5.2 // indirect
162162
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
163-
github.com/modern-go/reflect2 v1.0.2 // indirect
163+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
164164
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
165165
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
166166
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -216,32 +216,26 @@ require (
216216
gopkg.in/yaml.v3 v3.0.1 // indirect
217217
k8s.io/component-base v0.33.3 // indirect
218218
k8s.io/klog/v2 v2.130.1 // indirect
219-
k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
219+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
220220
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
221221
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
222-
sigs.k8s.io/kustomize/api v0.20.0 // indirect
222+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
223223
sigs.k8s.io/randfill v1.0.0 // indirect
224224
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
225-
sigs.k8s.io/yaml v1.5.0 // indirect
225+
sigs.k8s.io/yaml v1.6.0 // indirect
226226
)
227227

228-
replace (
229-
// v0.15.1-0.20220809152546-4850a69faedb is actually the v0.16.1a tag of the fork
230-
github.com/hashicorp/terraform-exec v0.16.1 => github.com/tf-controller/terraform-exec v0.15.1-0.20220809152546-4850a69faedb
228+
// v0.15.1-0.20220809152546-4850a69faedb is actually the v0.16.1a tag of the fork
229+
replace github.com/hashicorp/terraform-exec v0.16.1 => github.com/tf-controller/terraform-exec v0.15.1-0.20220809152546-4850a69faedb
231230

232-
// Lock down k8s.io/kube-openapi to a specific commit
233-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e
234-
)
231+
// Lock down k8s.io/kube-openapi to a specific commit
232+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e
235233

236234
// Pin kustomize to v5.3.0
237235
replace (
238236
sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.16.0
239237
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.16.0
240238
)
241239

242-
// Pin terraform-exec to v0.17.3
243-
// breaking changes in terraform-exec v0.18.0 - https://github.com/hashicorp/terraform-exec/blob/main/CHANGELOG.md#0180-february-20-2023
244-
replace github.com/hashicorp/terraform-exec => github.com/hashicorp/terraform-exec v0.17.3
245-
246240
// indirect - breaking changes in v1.0.x
247241
replace github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.5

go.sum

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z
192192
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
193193
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
194194
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
195-
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
196-
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
195+
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
196+
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
197197
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
198198
github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
199199
github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=
@@ -277,8 +277,6 @@ github.com/hashicorp/hc-install v0.9.2 h1:v80EtNX4fCVHqzL9Lg/2xkp62bbvQMnvPQ0G+O
277277
github.com/hashicorp/hc-install v0.9.2/go.mod h1:XUqBQNnuT4RsxoxiM9ZaUk0NX8hi2h+Lb6/c0OZnC/I=
278278
github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80 h1:PFfGModn55JA0oBsvFghhj0v93me+Ctr3uHC/UmFAls=
279279
github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80/go.mod h1:Cxv+IJLuBiEhQ7pBYGEuORa0nr4U994pE8mYLuFd7v0=
280-
github.com/hashicorp/terraform-exec v0.17.3 h1:MX14Kvnka/oWGmIkyuyvL6POx25ZmKrjlaclkx3eErU=
281-
github.com/hashicorp/terraform-exec v0.17.3/go.mod h1:+NELG0EqQekJzhvikkeQsOAZpsw0cv/03rbeQJqscAI=
282280
github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=
283281
github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=
284282
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -348,8 +346,9 @@ github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFL
348346
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
349347
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
350348
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
351-
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
352349
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
350+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
351+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
353352
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
354353
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
355354
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
@@ -440,6 +439,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
440439
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
441440
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
442441
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
442+
github.com/tf-controller/terraform-exec v0.15.1-0.20220809152546-4850a69faedb h1:erdYHB6ginMrQNREnRDkPjjkU7Bb6tm67exkX+0SJsw=
443+
github.com/tf-controller/terraform-exec v0.15.1-0.20220809152546-4850a69faedb/go.mod h1:aj0lVshy8l+MHhFNoijNHtqTJQI3Xlowv5EOsEaGO7M=
443444
github.com/theckman/yacspin v0.13.12 h1:CdZ57+n0U6JMuh2xqjnjRq5Haj6v1ner2djtLQRzJr4=
444445
github.com/theckman/yacspin v0.13.12/go.mod h1:Rd2+oG2LmQi5f3zC3yeZAOl245z8QOvrH4OPOJNZxLg=
445446
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
@@ -622,5 +623,5 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO
622623
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
623624
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
624625
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
625-
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
626-
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
626+
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
627+
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

0 commit comments

Comments
 (0)