Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cfn-resources/database-user/cmd/resource/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/logger"
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/progressevent"
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/validator"
"go.mongodb.org/atlas-sdk/v20250312002/admin"
"go.mongodb.org/atlas-sdk/v20250312005/admin"
)

var CreateRequiredFields = []string{constants.DatabaseName, constants.ProjectID, constants.Roles, constants.Username}
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/tidwall/pretty v1.2.1
go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0
go.mongodb.org/atlas-sdk/v20231115014 v20231115014.0.0
go.mongodb.org/atlas-sdk/v20250312002 v20250312002.0.0
go.mongodb.org/atlas-sdk/v20250312005 v20250312005.0.0
)

require (
Expand Down Expand Up @@ -53,7 +53,7 @@ require (
github.com/segmentio/ksuid v1.0.4 // indirect
github.com/stretchr/objx v0.5.2 // indirect
go.mongodb.org/atlas v0.37.0 // indirect
golang.org/x/oauth2 v0.28.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
gopkg.in/validator.v2 v2.0.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions cfn-resources/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ go.mongodb.org/atlas v0.37.0 h1:zQnO1o5+bVP9IotpAYpres4UjMD2F4nwNEFTZhNL4ck=
go.mongodb.org/atlas v0.37.0/go.mod h1:DJYtM+vsEpPEMSkQzJnFHrT0sP7ev6cseZc/GGjJYG8=
go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0 h1:x6nnq2pUIP9mN4WLD4/EseBzV88OmSgexxYchPilgno=
go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0/go.mod h1:el7cm23kEiiw72HAYimhNweKqp/ubHsNJk+Mk30yJhM=
go.mongodb.org/atlas-sdk/v20250312002 v20250312002.0.0 h1:KX8PrYp3/PCSxG4NbGLcc3+EsNcfyhcvylGbe/oRlx8=
go.mongodb.org/atlas-sdk/v20250312002 v20250312002.0.0/go.mod h1:HHCmHxHPdJRr1bUXlvRIZbm7M4gRujjur1GnjE44YgA=
golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
go.mongodb.org/atlas-sdk/v20250312005 v20250312005.0.0 h1:uKOtHXCP/Gwuj+IF1hsKtIAxNSVjKNo+o4Z+ulgCEXw=
go.mongodb.org/atlas-sdk/v20250312005 v20250312005.0.0/go.mod h1:UeRE741z+kDGH00qQasZmthQxJMeA6PmAtY/2dStW+Q=
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
Expand Down
2 changes: 1 addition & 1 deletion cfn-resources/organization/cmd/resource/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"net/http"
"time"

"go.mongodb.org/atlas-sdk/v20250312002/admin"
"go.mongodb.org/atlas-sdk/v20250312005/admin"

"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
"github.com/aws/aws-sdk-go/service/cloudformation"
Expand Down
2 changes: 1 addition & 1 deletion cfn-resources/resource-policy/cmd/resource/mappings.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package resource

import (
"go.mongodb.org/atlas-sdk/v20250312002/admin"
"go.mongodb.org/atlas-sdk/v20250312005/admin"

"github.com/mongodb/mongodbatlas-cloudformation-resources/util"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package resource_test
import (
"testing"

"go.mongodb.org/atlas-sdk/v20250312002/admin"
"go.mongodb.org/atlas-sdk/v20250312005/admin"

"github.com/aws/smithy-go/ptr"
"github.com/mongodb/mongodbatlas-cloudformation-resources/resource-policy/cmd/resource"
Expand Down
14 changes: 7 additions & 7 deletions cfn-resources/resource-policy/cmd/resource/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"net/http"

"go.mongodb.org/atlas-sdk/v20250312002/admin"
"go.mongodb.org/atlas-sdk/v20250312005/admin"

"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
"github.com/aws/aws-sdk-go/service/cloudformation"
Expand Down Expand Up @@ -62,7 +62,7 @@ func Create(req handler.Request, prevModel *Model, currentModel *Model) (handler

orgID := currentModel.OrgId
resourcePolicyReq := NewResourcePolicyCreateReq(currentModel)
resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.CreateAtlasResourcePolicy(ctx, *orgID, resourcePolicyReq).Execute()
resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.CreateOrgResourcePolicy(ctx, *orgID, resourcePolicyReq).Execute()
if err != nil {
return handleError(apiResp, constants.CREATE, err)
}
Expand All @@ -85,7 +85,7 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P

orgID := currentModel.OrgId
resourcePolicyID := currentModel.Id
resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.GetAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute()
resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.GetOrgResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute()
if err != nil {
return handleError(apiResp, constants.READ, err)
}
Expand All @@ -108,7 +108,7 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler

orgID := currentModel.OrgId
resourcePolicyID := currentModel.Id
_, _, err := conn.ResourcePoliciesApi.GetAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute()
_, _, err := conn.ResourcePoliciesApi.GetOrgResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute()
if err != nil {
return handler.ProgressEvent{
OperationStatus: handler.Failed,
Expand All @@ -117,7 +117,7 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler
}, nil
}
resourcePolicyReq := NewResourcePolicyUpdateReq(currentModel)
resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.UpdateAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID, resourcePolicyReq).Execute()
resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.UpdateOrgResourcePolicy(ctx, *orgID, *resourcePolicyID, resourcePolicyReq).Execute()
if err != nil {
return handleError(apiResp, constants.UPDATE, err)
}
Expand All @@ -141,7 +141,7 @@ func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler

orgID := currentModel.OrgId
resourcePolicyID := currentModel.Id
apiResp, err := conn.ResourcePoliciesApi.DeleteAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute()
apiResp, err := conn.ResourcePoliciesApi.DeleteOrgResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute()
if err != nil {
return handleError(apiResp, constants.DELETE, err)
}
Expand All @@ -162,7 +162,7 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P

orgID := currentModel.OrgId

resourcePolicies, apiResp, err := conn.ResourcePoliciesApi.GetAtlasResourcePolicies(ctx, *orgID).Execute()
resourcePolicies, apiResp, err := conn.ResourcePoliciesApi.ListOrgResourcePolicies(ctx, *orgID).Execute()
if err != nil {
return handleError(apiResp, constants.LIST, err)
}
Expand Down
2 changes: 1 addition & 1 deletion cfn-resources/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

admin20231115002 "go.mongodb.org/atlas-sdk/v20231115002/admin"
admin20231115014 "go.mongodb.org/atlas-sdk/v20231115014/admin"
"go.mongodb.org/atlas-sdk/v20250312002/admin"
"go.mongodb.org/atlas-sdk/v20250312005/admin"

"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/logging"
Expand Down
Loading