Skip to content

Commit e48aad9

Browse files
svc-apix-Botgithub-merge-queue[bot]manupedrozo
authored
chore: Updates Atlas Go SDK (#1470)
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com> Co-authored-by: Manuel Pedrozo <manuel.pedrozo@mongodb.com>
1 parent 684c720 commit e48aad9

14 files changed

Lines changed: 25 additions & 25 deletions

File tree

cfn-resources/database-user/cmd/resource/resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/logger"
2727
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/progressevent"
2828
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/validator"
29-
"go.mongodb.org/atlas-sdk/v20250312006/admin"
29+
"go.mongodb.org/atlas-sdk/v20250312010/admin"
3030
)
3131

3232
var CreateRequiredFields = []string{constants.DatabaseName, constants.ProjectID, constants.Roles, constants.Username}

cfn-resources/flex-cluster/cmd/resource/resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/validator"
2424

2525
"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
26-
"go.mongodb.org/atlas-sdk/v20250312006/admin"
26+
"go.mongodb.org/atlas-sdk/v20250312010/admin"
2727
)
2828

2929
const callBackSeconds = 10

cfn-resources/flex-cluster/cmd/resource/share.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
2121
"github.com/mongodb/mongodbatlas-cloudformation-resources/util"
2222
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/constants"
23-
"go.mongodb.org/atlas-sdk/v20250312006/admin"
23+
"go.mongodb.org/atlas-sdk/v20250312010/admin"
2424
)
2525

2626
var callbackContext = map[string]any{"callbackFlex": true}

cfn-resources/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/tidwall/pretty v1.2.1
2525
go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0
2626
go.mongodb.org/atlas-sdk/v20231115014 v20231115014.0.0
27-
go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0
27+
go.mongodb.org/atlas-sdk/v20250312010 v20250312010.0.0
2828
)
2929

3030
require (
@@ -57,7 +57,7 @@ require (
5757
github.com/stretchr/objx v0.5.2 // indirect
5858
github.com/woodsbury/decimal128 v1.3.0 // indirect
5959
go.mongodb.org/atlas v0.37.0 // indirect
60-
golang.org/x/oauth2 v0.30.0 // indirect
60+
golang.org/x/oauth2 v0.32.0 // indirect
6161
gopkg.in/validator.v2 v2.0.1 // indirect
6262
gopkg.in/yaml.v2 v2.4.0 // indirect
6363
gopkg.in/yaml.v3 v3.0.1 // indirect

cfn-resources/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ go.mongodb.org/atlas v0.37.0 h1:zQnO1o5+bVP9IotpAYpres4UjMD2F4nwNEFTZhNL4ck=
111111
go.mongodb.org/atlas v0.37.0/go.mod h1:DJYtM+vsEpPEMSkQzJnFHrT0sP7ev6cseZc/GGjJYG8=
112112
go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0 h1:x6nnq2pUIP9mN4WLD4/EseBzV88OmSgexxYchPilgno=
113113
go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0/go.mod h1:el7cm23kEiiw72HAYimhNweKqp/ubHsNJk+Mk30yJhM=
114-
go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0 h1:PcVxslw4G7/I9SbUi5y81i4YZnL1dKRnGpeHVyNSTh4=
115-
go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0/go.mod h1:UZYSaCimjGs3j+wMwgHSKUSIvoJXzmy/xrer0t5TLgo=
116-
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
117-
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
114+
go.mongodb.org/atlas-sdk/v20250312010 v20250312010.0.0 h1:HEwlbiUWphcPZIzsNn+OLKvfGnYMXePrzmO1aMYQj00=
115+
go.mongodb.org/atlas-sdk/v20250312010 v20250312010.0.0/go.mod h1:fCic2XAoTsxll8WGkUB9uEoMewxekfJ3kqR7pGA7frU=
116+
golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
117+
golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
118118
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
119119
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
120120
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

cfn-resources/organization/cmd/resource/resource.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"net/http"
2222
"time"
2323

24-
"go.mongodb.org/atlas-sdk/v20250312006/admin"
24+
"go.mongodb.org/atlas-sdk/v20250312010/admin"
2525

2626
"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
2727
"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
@@ -100,7 +100,7 @@ func Create(req handler.Request, prevModel *Model, currentModel *Model) (handler
100100
if currentModel.FederatedSettingsId != nil {
101101
orgInput.FederationSettingsId = currentModel.FederatedSettingsId
102102
}
103-
org, response, err := conn.OrganizationsApi.CreateOrganization(ctx, orgInput).Execute()
103+
org, response, err := conn.OrganizationsApi.CreateOrg(ctx, orgInput).Execute()
104104
if err != nil {
105105
return handleError(response, constants.CREATE, err)
106106
}
@@ -124,7 +124,7 @@ func Create(req handler.Request, prevModel *Model, currentModel *Model) (handler
124124
return *peErr, nil
125125
}
126126
conn = newOrgClient.AtlasSDK
127-
if _, _, errUpdate := conn.OrganizationsApi.UpdateOrganizationSettings(ctx, orgID, newOrganizationSettings(currentModel)).Execute(); errUpdate != nil {
127+
if _, _, errUpdate := conn.OrganizationsApi.UpdateOrgSettings(ctx, orgID, newOrganizationSettings(currentModel)).Execute(); errUpdate != nil {
128128
return handleError(response, constants.CREATE, err)
129129
}
130130

@@ -175,11 +175,11 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler
175175
setDefaultsIfNotDefined(currentModel)
176176
atlasOrg := admin.AtlasOrganization{Id: currentModel.OrgId, Name: *currentModel.Name, SkipDefaultAlertsSettings: currentModel.SkipDefaultAlertsSettings}
177177

178-
if _, response, err := conn.OrganizationsApi.UpdateOrganization(ctx, *currentModel.OrgId, &atlasOrg).Execute(); err != nil {
178+
if _, response, err := conn.OrganizationsApi.UpdateOrg(ctx, *currentModel.OrgId, &atlasOrg).Execute(); err != nil {
179179
return handleError(response, constants.UPDATE, err)
180180
}
181181

182-
if _, response, err := conn.OrganizationsApi.UpdateOrganizationSettings(ctx, *currentModel.OrgId, newOrganizationSettings(currentModel)).Execute(); err != nil {
182+
if _, response, err := conn.OrganizationsApi.UpdateOrgSettings(ctx, *currentModel.OrgId, newOrganizationSettings(currentModel)).Execute(); err != nil {
183183
return handleError(response, constants.UPDATE, err)
184184
}
185185

@@ -221,7 +221,7 @@ func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler
221221
return handleError(response, constants.DELETE, err)
222222
}
223223

224-
deleteRequest := conn.OrganizationsApi.DeleteOrganization(ctx, *currentModel.OrgId)
224+
deleteRequest := conn.OrganizationsApi.DeleteOrg(ctx, *currentModel.OrgId)
225225

226226
// Since the Delete API is synchronous and takes more than 1 minute most of the time,
227227
// we need to make the call in a goroutine and return a progress event
@@ -298,7 +298,7 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
298298
}
299299

300300
func (model *Model) getOrgDetails(ctx context.Context, conn *admin.APIClient, currentModel *Model) (responseModel *Model, response *http.Response, err error) {
301-
org, response, err := conn.OrganizationsApi.GetOrganization(ctx, *currentModel.OrgId).Execute()
301+
org, response, err := conn.OrganizationsApi.GetOrg(ctx, *currentModel.OrgId).Execute()
302302
if err != nil {
303303
return nil, response, err
304304
}
@@ -307,7 +307,7 @@ func (model *Model) getOrgDetails(ctx context.Context, conn *admin.APIClient, cu
307307
model.IsDeleted = org.IsDeleted
308308
model.SkipDefaultAlertsSettings = org.SkipDefaultAlertsSettings
309309

310-
settings, _, err := conn.OrganizationsApi.GetOrganizationSettings(ctx, org.GetId()).Execute()
310+
settings, _, err := conn.OrganizationsApi.GetOrgSettings(ctx, org.GetId()).Execute()
311311
if err != nil {
312312
return nil, response, err
313313
}

cfn-resources/resource-policy/cmd/resource/mappings.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package resource
1616

1717
import (
18-
"go.mongodb.org/atlas-sdk/v20250312006/admin"
18+
"go.mongodb.org/atlas-sdk/v20250312010/admin"
1919

2020
"github.com/mongodb/mongodbatlas-cloudformation-resources/util"
2121
)

cfn-resources/resource-policy/cmd/resource/mappings_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package resource_test
1717
import (
1818
"testing"
1919

20-
"go.mongodb.org/atlas-sdk/v20250312006/admin"
20+
"go.mongodb.org/atlas-sdk/v20250312010/admin"
2121

2222
"github.com/aws/smithy-go/ptr"
2323
"github.com/mongodb/mongodbatlas-cloudformation-resources/resource-policy/cmd/resource"

cfn-resources/resource-policy/cmd/resource/resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"net/http"
2121

22-
"go.mongodb.org/atlas-sdk/v20250312006/admin"
22+
"go.mongodb.org/atlas-sdk/v20250312010/admin"
2323

2424
"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
2525
"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"

cfn-resources/test/e2e/cluster/cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/mongodb/mongodbatlas-cloudformation-resources/util"
2626
"github.com/stretchr/testify/assert"
2727
admin20231115014 "go.mongodb.org/atlas-sdk/v20231115014/admin"
28-
"go.mongodb.org/atlas-sdk/v20250312006/admin"
28+
"go.mongodb.org/atlas-sdk/v20250312010/admin"
2929
)
3030

3131
type localTestContext struct {

0 commit comments

Comments
 (0)