Skip to content

Commit 6b6687d

Browse files
ksamorayksamoray
authored
Bump dependencies to fix CVEs, pin NSX API SDK version (#2234)
Take master's go.mod/go.sum wholesale to pick up the CVE fixes already applied there (Go toolchain, grpc, golang.org/x/crypto, golang.org/x/net, cloudflare/circl, terraform-plugin-sdk/testing, go-vmware-nsxt, etc.), except keep branch_3122's current pin for github.com/vmware/vsphere-automation-sdk-go/services/nsxt: master's version is newer because it carries the NSX 9.2-only TGW BGP-routing SDK reorg, which this NSX 9.1.x-and-below release branch must not pull in. Ran `go mod tidy` afterward to reconcile against this branch's actual code: golang.org/x/exp stays as a direct dependency (still imported directly by 4 files here), go.uber.org/mock is not added (this branch has no mock-based unit tests to require it). Also retag build.md's ~/.terraformrc example from an hcl to a text fence: it uses a quoted provider source address (valid CLI config syntax, not standard resource HCL), which the docs-lint terrafmt step hard-fails on. Same one-line fix already applied on master in #2206.
1 parent c9f413e commit 6b6687d

3 files changed

Lines changed: 148 additions & 133 deletions

File tree

‎docs/build.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ machine. Check the [requirements][requirements] before proceeding.
3333

3434
3. Add the following to your `~/.terraformrc`:
3535

36-
```hcl
36+
```text
3737
provider_installation {
3838
dev_overrides {
3939
"vmware/vcf" = "/Users/rainpole/go/bin"

‎go.mod‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,87 @@
11
module github.com/vmware/terraform-provider-nsxt
22

3-
go 1.24.0
4-
5-
toolchain go1.24.1
3+
go 1.26.6
64

75
require (
86
github.com/google/uuid v1.6.0
97
github.com/hashicorp/go-cty v1.5.0
10-
github.com/hashicorp/go-version v1.8.0
11-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1
12-
github.com/hashicorp/terraform-plugin-testing v1.14.0
8+
github.com/hashicorp/go-version v1.9.0
9+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1
10+
github.com/hashicorp/terraform-plugin-testing v1.16.0
1311
github.com/stretchr/testify v1.11.1
14-
github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f
12+
github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e
1513
github.com/vmware/vsphere-automation-sdk-go/lib v0.8.0
1614
github.com/vmware/vsphere-automation-sdk-go/runtime v0.8.0
1715
github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.1-0.20260614145640-9b3a306dd40d
1816
github.com/vmware/vsphere-automation-sdk-go/services/nsxt-gm v0.9.1-0.20241118070726-666c7cd6e466
1917
github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.1-0.20241118070726-666c7cd6e466
20-
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
18+
golang.org/x/exp v0.0.0-20260813180055-c1d0aacb2297
2119
)
2220

2321
require (
24-
github.com/ProtonMail/go-crypto v1.1.6 // indirect
22+
dario.cat/mergo v1.0.2 // indirect
23+
github.com/ProtonMail/go-crypto v1.4.1 // indirect
2524
github.com/agext/levenshtein v1.2.3 // indirect
2625
github.com/antihax/optional v1.0.0 // indirect
2726
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
28-
github.com/beevik/etree v1.1.0 // indirect
29-
github.com/cloudflare/circl v1.6.1 // indirect
27+
github.com/beevik/etree v1.6.0 // indirect
28+
github.com/cloudflare/circl v1.6.3 // indirect
29+
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
3030
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
31-
github.com/fatih/color v1.16.0 // indirect
31+
github.com/fatih/color v1.19.0 // indirect
3232
github.com/gibson042/canonicaljson-go v1.0.3 // indirect
33+
github.com/go-test/deep v1.1.1 // indirect
3334
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
3435
github.com/golang/protobuf v1.5.4 // indirect
3536
github.com/google/go-cmp v0.7.0 // indirect
36-
github.com/hashicorp/errwrap v1.0.0 // indirect
37+
github.com/hashicorp/errwrap v1.1.0 // indirect
3738
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
3839
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
3940
github.com/hashicorp/go-hclog v1.6.3 // indirect
4041
github.com/hashicorp/go-multierror v1.1.1 // indirect
41-
github.com/hashicorp/go-plugin v1.7.0 // indirect
42-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
42+
github.com/hashicorp/go-plugin v1.8.0 // indirect
43+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
4344
github.com/hashicorp/go-uuid v1.0.3 // indirect
44-
github.com/hashicorp/hc-install v0.9.2 // indirect
45+
github.com/hashicorp/hc-install v0.9.5 // indirect
4546
github.com/hashicorp/hcl/v2 v2.24.0 // indirect
4647
github.com/hashicorp/logutils v1.0.0 // indirect
47-
github.com/hashicorp/terraform-exec v0.24.0 // indirect
48+
github.com/hashicorp/terraform-exec v0.25.2 // indirect
4849
github.com/hashicorp/terraform-json v0.27.2 // indirect
49-
github.com/hashicorp/terraform-plugin-go v0.29.0 // indirect
50+
github.com/hashicorp/terraform-plugin-go v0.31.0 // indirect
5051
github.com/hashicorp/terraform-plugin-log v0.10.0 // indirect
5152
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
52-
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
53+
github.com/hashicorp/terraform-svchost v0.2.1 // indirect
5354
github.com/hashicorp/yamux v0.1.2 // indirect
54-
github.com/mattn/go-colorable v0.1.13 // indirect
55-
github.com/mattn/go-isatty v0.0.20 // indirect
55+
github.com/jhump/protoreflect v1.18.0 // indirect
56+
github.com/kevinburke/ssh_config v1.6.0 // indirect
57+
github.com/kr/text v0.2.0 // indirect
58+
github.com/mattn/go-colorable v0.1.14 // indirect
59+
github.com/mattn/go-isatty v0.0.22 // indirect
5660
github.com/mitchellh/copystructure v1.2.0 // indirect
5761
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
5862
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
5963
github.com/mitchellh/mapstructure v1.5.0 // indirect
6064
github.com/mitchellh/reflectwalk v1.0.2 // indirect
61-
github.com/oklog/run v1.1.0 // indirect
65+
github.com/oklog/run v1.2.0 // indirect
66+
github.com/pjbgf/sha1cd v0.6.0 // indirect
6267
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
68+
github.com/sergi/go-diff v1.4.0 // indirect
69+
github.com/skeema/knownhosts v1.3.2 // indirect
6370
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
6471
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
6572
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
66-
github.com/zclconf/go-cty v1.17.0 // indirect
67-
golang.org/x/crypto v0.46.0 // indirect
68-
golang.org/x/mod v0.30.0 // indirect
69-
golang.org/x/net v0.48.0 // indirect
70-
golang.org/x/oauth2 v0.34.0 // indirect
71-
golang.org/x/sync v0.19.0 // indirect
72-
golang.org/x/sys v0.39.0 // indirect
73-
golang.org/x/text v0.32.0 // indirect
74-
golang.org/x/tools v0.39.0 // indirect
73+
github.com/zclconf/go-cty v1.18.1 // indirect
74+
golang.org/x/crypto v0.55.0 // indirect
75+
golang.org/x/mod v0.39.0 // indirect
76+
golang.org/x/net v0.58.0 // indirect
77+
golang.org/x/oauth2 v0.36.0 // indirect
78+
golang.org/x/sync v0.22.0 // indirect
79+
golang.org/x/sys v0.47.0 // indirect
80+
golang.org/x/text v0.41.0 // indirect
81+
golang.org/x/tools v0.49.0 // indirect
7582
google.golang.org/appengine v1.6.8 // indirect
76-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
77-
google.golang.org/grpc v1.79.3 // indirect
83+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
84+
google.golang.org/grpc v1.82.1 // indirect
7885
google.golang.org/protobuf v1.36.11 // indirect
7986
gopkg.in/yaml.v3 v3.0.1 // indirect
8087
)

0 commit comments

Comments
 (0)