Skip to content

Commit e3a0b97

Browse files
committed
Merge remote-tracking branch 'origin/master' into CLOUDP-320243-dev-2.0.0
2 parents c4602ac + ae99fdc commit e3a0b97

File tree

5 files changed

+839
-123
lines changed

5 files changed

+839
-123
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
terraform 1.13.0
1+
terraform 1.13.1

go.mod

Lines changed: 54 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ require (
2424
github.com/huandu/xstrings v1.5.0
2525
github.com/jarcoal/httpmock v1.4.1
2626
github.com/mongodb-forks/digest v1.1.0
27-
github.com/mongodb/atlas-sdk-go v1.0.1-0.20250806084240-f8831d13e1be
27+
github.com/mongodb/atlas-sdk-go v1.0.1-0.20250825084037-c95a65f18752
2828
github.com/pb33f/libopenapi v0.25.3
2929
github.com/sebdah/goldie/v2 v2.7.1
3030
github.com/spf13/cast v1.9.2
31-
github.com/stretchr/testify v1.10.0
31+
github.com/stretchr/testify v1.11.0
3232
github.com/wI2L/jsondiff v0.7.0
33-
github.com/zclconf/go-cty v1.16.3
33+
github.com/zclconf/go-cty v1.16.4
3434
go.mongodb.org/atlas v0.38.0
3535
go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0
3636
go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.1-0.20250402112219-2468c5354718 // uses api-bot-update-v20240805-backport-cluster to support AdvancedConfiguration in create/updateCluster APIs
@@ -42,15 +42,22 @@ require (
4242
require (
4343
github.com/hashicorp/terraform-json v0.26.0
4444
github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0
45-
go.mongodb.org/atlas-sdk/v20250312006 v20250312006.0.0
45+
go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0
4646
)
4747

4848
require (
49-
cloud.google.com/go v0.112.0 // indirect
50-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
51-
cloud.google.com/go/iam v1.1.6 // indirect
52-
cloud.google.com/go/storage v1.36.0 // indirect
49+
cel.dev/expr v0.24.0 // indirect
50+
cloud.google.com/go v0.121.6 // indirect
51+
cloud.google.com/go/auth v0.16.5 // indirect
52+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
53+
cloud.google.com/go/compute/metadata v0.8.0 // indirect
54+
cloud.google.com/go/iam v1.5.2 // indirect
55+
cloud.google.com/go/monitoring v1.24.2 // indirect
56+
cloud.google.com/go/storage v1.56.1 // indirect
5357
dario.cat/mergo v1.0.0 // indirect
58+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
59+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
60+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
5461
github.com/Masterminds/goutils v1.1.1 // indirect
5562
github.com/Masterminds/semver/v3 v3.2.0 // indirect
5663
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
@@ -64,31 +71,36 @@ require (
6471
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
6572
github.com/bgentry/speakeasy v0.1.0 // indirect
6673
github.com/buger/jsonparser v1.1.1 // indirect
74+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6775
github.com/cloudflare/circl v1.6.1 // indirect
76+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
6877
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
69-
github.com/davecgh/go-spew v1.1.1 // indirect
78+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7079
github.com/emirpasic/gods v1.18.1 // indirect
80+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
81+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
7182
github.com/fatih/color v1.16.0 // indirect
7283
github.com/fatih/structs v1.1.0 // indirect
7384
github.com/felixge/httpsnoop v1.0.4 // indirect
7485
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
7586
github.com/go-git/go-billy/v5 v5.6.2 // indirect
7687
github.com/go-git/go-git/v5 v5.14.0 // indirect
77-
github.com/go-logr/logr v1.4.2 // indirect
88+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
89+
github.com/go-logr/logr v1.4.3 // indirect
7890
github.com/go-logr/stdr v1.2.2 // indirect
7991
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
8092
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
8193
github.com/golang/protobuf v1.5.4 // indirect
8294
github.com/google/go-cmp v0.7.0 // indirect
8395
github.com/google/go-querystring v1.1.0 // indirect
84-
github.com/google/s2a-go v0.1.7 // indirect
96+
github.com/google/s2a-go v0.1.9 // indirect
8597
github.com/google/uuid v1.6.0 // indirect
86-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
87-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
98+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
99+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
88100
github.com/hashicorp/errwrap v1.0.0 // indirect
89101
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
90102
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
91-
github.com/hashicorp/go-getter v1.7.5 // indirect
103+
github.com/hashicorp/go-getter v1.7.9 // indirect
92104
github.com/hashicorp/go-hclog v1.6.3 // indirect
93105
github.com/hashicorp/go-multierror v1.1.1 // indirect
94106
github.com/hashicorp/go-plugin v1.6.3 // indirect
@@ -104,7 +116,7 @@ require (
104116
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
105117
github.com/jmespath/go-jmespath v0.4.0 // indirect
106118
github.com/kevinburke/ssh_config v1.2.0 // indirect
107-
github.com/klauspost/compress v1.15.11 // indirect
119+
github.com/klauspost/compress v1.18.0 // indirect
108120
github.com/mattn/go-colorable v0.1.13 // indirect
109121
github.com/mattn/go-isatty v0.0.20 // indirect
110122
github.com/mitchellh/cli v1.1.5 // indirect
@@ -117,48 +129,52 @@ require (
117129
github.com/oklog/run v1.0.0 // indirect
118130
github.com/pb33f/ordered-map/v2 v2.2.0 // indirect
119131
github.com/pjbgf/sha1cd v0.3.2 // indirect
120-
github.com/pmezard/go-difflib v1.0.0 // indirect
132+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
133+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
121134
github.com/posener/complete v1.2.3 // indirect
122135
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
123136
github.com/shopspring/decimal v1.2.0 // indirect
124137
github.com/skeema/knownhosts v1.3.1 // indirect
125138
github.com/speakeasy-api/jsonpath v0.6.2 // indirect
126-
github.com/spf13/afero v1.9.2 // indirect
139+
github.com/spf13/afero v1.10.0 // indirect
140+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
127141
github.com/stretchr/objx v0.5.2 // indirect
128142
github.com/tidwall/gjson v1.18.0 // indirect
129143
github.com/tidwall/match v1.1.1 // indirect
130144
github.com/tidwall/pretty v1.2.1 // indirect
131145
github.com/tidwall/sjson v1.2.5 // indirect
132146
github.com/trivago/tgo v1.0.7 // indirect
133-
github.com/ulikunitz/xz v0.5.10 // indirect
147+
github.com/ulikunitz/xz v0.5.15 // indirect
134148
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
135149
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
136150
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
137151
github.com/xanzy/ssh-agent v0.3.3 // indirect
138152
github.com/zclconf/go-cty-yaml v1.0.2 // indirect
139-
go.opencensus.io v0.24.0 // indirect
140153
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
141-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
142-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
143-
go.opentelemetry.io/otel v1.34.0 // indirect
144-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
145-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
146-
golang.org/x/crypto v0.39.0 // indirect
147-
golang.org/x/mod v0.25.0 // indirect
148-
golang.org/x/net v0.40.0 // indirect
154+
go.opentelemetry.io/contrib/detectors/gcp v1.37.0 // indirect
155+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
156+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
157+
go.opentelemetry.io/otel v1.37.0 // indirect
158+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
159+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
160+
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
161+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
162+
golang.org/x/crypto v0.41.0 // indirect
163+
golang.org/x/mod v0.26.0 // indirect
164+
golang.org/x/net v0.43.0 // indirect
149165
golang.org/x/oauth2 v0.30.0 // indirect
150-
golang.org/x/sync v0.15.0 // indirect
151-
golang.org/x/sys v0.33.0 // indirect
152-
golang.org/x/text v0.26.0 // indirect
153-
golang.org/x/time v0.5.0 // indirect
154-
golang.org/x/tools v0.33.0 // indirect
155-
google.golang.org/api v0.162.0 // indirect
166+
golang.org/x/sync v0.16.0 // indirect
167+
golang.org/x/sys v0.35.0 // indirect
168+
golang.org/x/text v0.28.0 // indirect
169+
golang.org/x/time v0.12.0 // indirect
170+
golang.org/x/tools v0.35.0 // indirect
171+
google.golang.org/api v0.248.0 // indirect
156172
google.golang.org/appengine v1.6.8 // indirect
157-
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
158-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
159-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
160-
google.golang.org/grpc v1.72.1 // indirect
161-
google.golang.org/protobuf v1.36.6 // indirect
173+
google.golang.org/genproto v0.0.0-20250826171959-ef028d996bc1 // indirect
174+
google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect
175+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
176+
google.golang.org/grpc v1.75.0 // indirect
177+
google.golang.org/protobuf v1.36.8 // indirect
162178
gopkg.in/warnings.v0 v0.1.2 // indirect
163179
)
164180

0 commit comments

Comments
 (0)