Skip to content

Commit d903111

Browse files
authored
revert SDK preview changes (#2719)
1 parent 21c8fb8 commit d903111

File tree

4 files changed

+0
-28
lines changed

4 files changed

+0
-28
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ require (
1919
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
2020
github.com/hashicorp/terraform-plugin-testing v1.9.0
2121
github.com/mongodb-forks/digest v1.1.0
22-
github.com/mongodb/atlas-sdk-go v1.0.1-0.20241018083659-a287665cc1d3
2322
github.com/spf13/cast v1.6.0
2423
github.com/stretchr/testify v1.9.0
2524
github.com/zclconf/go-cty v1.15.0

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,8 +635,6 @@ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
635635
github.com/mmcloughlin/avo v0.5.0/go.mod h1:ChHFdoV7ql95Wi7vuq2YT1bwCJqiWdZrQ1im3VujLYM=
636636
github.com/mongodb-forks/digest v1.1.0 h1:7eUdsR1BtqLv0mdNm4OXs6ddWvR4X2/OsLwdKksrOoc=
637637
github.com/mongodb-forks/digest v1.1.0/go.mod h1:rb+EX8zotClD5Dj4NdgxnJXG9nwrlx3NWKJ8xttz1Dg=
638-
github.com/mongodb/atlas-sdk-go v1.0.1-0.20241018083659-a287665cc1d3 h1:iK3OmXqUqkYsPCUwPlTXqylKTK7seP6U+I11OySwkcc=
639-
github.com/mongodb/atlas-sdk-go v1.0.1-0.20241018083659-a287665cc1d3/go.mod h1:CE0qO1AJFrP9ajK/KnRUwKzoPKVoqAmZVFnsofvTwRE=
640638
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
641639
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
642640
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

internal/config/client.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"strings"
1010
"time"
1111

12-
adminpreview "github.com/mongodb/atlas-sdk-go/admin"
1312
admin20240530 "go.mongodb.org/atlas-sdk/v20240530005/admin"
1413
"go.mongodb.org/atlas-sdk/v20240805005/admin"
1514
matlasClient "go.mongodb.org/atlas/mongodbatlas"
@@ -33,7 +32,6 @@ type MongoDBClient struct {
3332
Atlas *matlasClient.Client
3433
AtlasV2 *admin.APIClient
3534
AtlasV220240530 *admin20240530.APIClient // used in advanced_cluster and cloud_backup_schedule for avoiding breaking changes
36-
AtlasPreview *adminpreview.APIClient // used for preview features, don't use in resources exposed in the provider list
3735
Config *Config
3836
}
3937

@@ -112,16 +110,10 @@ func (c *Config) NewClient(ctx context.Context) (any, error) {
112110
return nil, err
113111
}
114112

115-
sdkPreviewClient, err := c.newSDKPreviewClient(client)
116-
if err != nil {
117-
return nil, err
118-
}
119-
120113
clients := &MongoDBClient{
121114
Atlas: atlasClient,
122115
AtlasV2: sdkV2Client,
123116
AtlasV220240530: sdkV220240530Client,
124-
AtlasPreview: sdkPreviewClient,
125117
Config: c,
126118
}
127119
return clients, nil
@@ -155,20 +147,6 @@ func (c *Config) newSDKV220240530Client(client *http.Client) (*admin20240530.API
155147
return sdk, nil
156148
}
157149

158-
func (c *Config) newSDKPreviewClient(client *http.Client) (*adminpreview.APIClient, error) {
159-
opts := []adminpreview.ClientModifier{
160-
adminpreview.UseHTTPClient(client),
161-
adminpreview.UseUserAgent(userAgent(c)),
162-
adminpreview.UseBaseURL(c.BaseURL),
163-
adminpreview.UseDebug(false)}
164-
165-
sdk, err := adminpreview.NewClient(opts...)
166-
if err != nil {
167-
return nil, err
168-
}
169-
return sdk, nil
170-
}
171-
172150
func (c *MongoDBClient) GetRealmClient(ctx context.Context) (*realm.Client, error) {
173151
// Realm
174152
if c.Config.PublicKey == "" && c.Config.PrivateKey == "" {

scripts/update-sdk.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,5 @@ echo "==> Updating SDK ${CURRENT_SDK_RELEASE} to latest major version ${LATEST_
3232

3333
gomajor get --rewrite "go.mongodb.org/atlas-sdk/${CURRENT_SDK_RELEASE}" "go.mongodb.org/atlas-sdk/${LATEST_SDK_RELEASE}@${LATEST_SDK_TAG}"
3434

35-
echo "==> Updating SDK Preview version"
36-
go get github.com/mongodb/atlas-sdk-go@preview-latest
37-
3835
go mod tidy
3936
echo "Done"

0 commit comments

Comments
 (0)