Skip to content

Commit b703b7b

Browse files
sivaram-mongodboutcomes-winter-rakhulsprakash
sivaram-mongodb
authored and
outcomes-winter-rakhulsprakash
committed
feat: update atlas-sdk version and unit tests in org-service-account resource
1 parent 4e67026 commit b703b7b

7 files changed

Lines changed: 28 additions & 466 deletions

File tree

‎cfn-resources/cfn-testing-helper.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,9 @@ done
157157
echo "Step 4/4: cleaning up 'cfn test' inputs "
158158
SAM_LOG=$(mktemp)
159159
for resource in ${resources}; do
160-
cd "${resource}"
161-
if [ -f ./test/cfn-test-delete-inputs.sh ]; then
160+
cd "${res}"
162161
chmod +x ./test/cfn-test-delete-inputs.sh
163-
./test/cfn-test-delete-inputs.sh "${PROJECT_NAME}-${resource}" && echo "resource:${resource} inputs delete OK" || echo "resource:${resource} input delete FAILED"
164-
else
165-
echo "resource:${resource} - delete script not found, skipping cleanup"
166-
fi
167-
cd -
162+
./test/cfn-test-delete-inputs.sh "${PROJECT_NAME}-${res}" && echo "resource:${res} inputs delete OK" || echo "resource:${res} input delete FAILED"
168163
done
169164

170165
echo "Clean up project"

‎cfn-resources/org-service-account/cmd/resource/mappings.go‎

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

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

2222
"github.com/mongodb/mongodbatlas-cloudformation-resources/util"
2323
)

‎cfn-resources/org-service-account/cmd/resource/mappings_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"testing"
1919
"time"
2020

21-
"go.mongodb.org/atlas-sdk/v20250312010/admin"
21+
"go.mongodb.org/atlas-sdk/v20250312012/admin"
2222

2323
"github.com/aws/smithy-go/ptr"
2424
"github.com/mongodb/mongodbatlas-cloudformation-resources/org-service-account/cmd/resource"

‎cfn-resources/org-service-account/cmd/resource/resource.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var (
2828
ListRequiredFields = []string{"OrgId"}
2929
)
3030

31-
var SetupRequest = func(req handler.Request, model *Model, requiredFields []string) (*util.MongoDBClient, *handler.ProgressEvent) {
31+
func setupRequest(req handler.Request, model *Model, requiredFields []string) (*util.MongoDBClient, *handler.ProgressEvent) {
3232
util.SetupLogger("mongodb-atlas-org-service-account")
3333
if modelValidation := validator.ValidateModel(requiredFields, model); modelValidation != nil {
3434
return nil, modelValidation
@@ -42,41 +42,41 @@ var SetupRequest = func(req handler.Request, model *Model, requiredFields []stri
4242
}
4343

4444
func Create(req handler.Request, prevModel *Model, model *Model) (handler.ProgressEvent, error) {
45-
client, setupErr := SetupRequest(req, model, CreateRequiredFields)
45+
client, setupErr := setupRequest(req, model, CreateRequiredFields)
4646
if setupErr != nil {
4747
return *setupErr, nil
4848
}
49-
return HandleCreate(&req, client, model), nil
49+
return handleCreate(client, model), nil
5050
}
5151

5252
func Read(req handler.Request, prevModel *Model, model *Model) (handler.ProgressEvent, error) {
53-
client, setupErr := SetupRequest(req, model, ReadRequiredFields)
53+
client, setupErr := setupRequest(req, model, ReadRequiredFields)
5454
if setupErr != nil {
5555
return *setupErr, nil
5656
}
57-
return HandleRead(&req, client, model), nil
57+
return handleRead(client, model), nil
5858
}
5959

6060
func Update(req handler.Request, prevModel *Model, model *Model) (handler.ProgressEvent, error) {
61-
client, setupErr := SetupRequest(req, model, UpdateRequiredFields)
61+
client, setupErr := setupRequest(req, model, UpdateRequiredFields)
6262
if setupErr != nil {
6363
return *setupErr, nil
6464
}
65-
return HandleUpdate(&req, client, model), nil
65+
return handleUpdate(client, model), nil
6666
}
6767

6868
func Delete(req handler.Request, prevModel *Model, model *Model) (handler.ProgressEvent, error) {
69-
client, setupErr := SetupRequest(req, model, DeleteRequiredFields)
69+
client, setupErr := setupRequest(req, model, DeleteRequiredFields)
7070
if setupErr != nil {
7171
return *setupErr, nil
7272
}
73-
return HandleDelete(&req, client, model), nil
73+
return handleDelete(client, model), nil
7474
}
7575

7676
func List(req handler.Request, prevModel *Model, model *Model) (handler.ProgressEvent, error) {
77-
client, setupErr := SetupRequest(req, model, ListRequiredFields)
77+
client, setupErr := setupRequest(req, model, ListRequiredFields)
7878
if setupErr != nil {
7979
return *setupErr, nil
8080
}
81-
return HandleList(&req, client, model), nil
81+
return handleList(client, model), nil
8282
}

‎cfn-resources/org-service-account/cmd/resource/resource_test.go‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎cfn-resources/org-service-account/cmd/resource/share.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ import (
2626
progress_events "github.com/mongodb/mongodbatlas-cloudformation-resources/util/progressevent"
2727
)
2828

29-
func HandleCreate(req *handler.Request, client *util.MongoDBClient, model *Model) handler.ProgressEvent {
29+
func handleCreate(client *util.MongoDBClient, model *Model) handler.ProgressEvent {
3030
ctx := context.Background()
3131
orgID := model.OrgId
3232
serviceAccountReq := NewOrgServiceAccountCreateReq(model)
3333

3434
serviceAccountResp, apiResp, err := client.AtlasSDK.ServiceAccountsApi.CreateOrgServiceAccount(ctx, *orgID, serviceAccountReq).Execute()
3535
if err != nil {
36-
return HandleError(apiResp, constants.CREATE, err)
36+
return handleError(apiResp, constants.CREATE, err)
3737
}
3838

3939
resourceModel := GetOrgServiceAccountModel(serviceAccountResp, model)
@@ -45,14 +45,14 @@ func HandleCreate(req *handler.Request, client *util.MongoDBClient, model *Model
4545
}
4646
}
4747

48-
func HandleRead(req *handler.Request, client *util.MongoDBClient, model *Model) handler.ProgressEvent {
48+
func handleRead(client *util.MongoDBClient, model *Model) handler.ProgressEvent {
4949
ctx := context.Background()
5050
orgID := model.OrgId
5151
clientID := model.ClientId
5252

5353
serviceAccount, apiResp, err := client.AtlasSDK.ServiceAccountsApi.GetOrgServiceAccount(ctx, *orgID, *clientID).Execute()
5454
if err != nil {
55-
return HandleError(apiResp, constants.READ, err)
55+
return handleError(apiResp, constants.READ, err)
5656
}
5757

5858
resourceModel := GetOrgServiceAccountModel(serviceAccount, model)
@@ -69,7 +69,7 @@ func HandleRead(req *handler.Request, client *util.MongoDBClient, model *Model)
6969
}
7070
}
7171

72-
func HandleUpdate(req *handler.Request, client *util.MongoDBClient, model *Model) handler.ProgressEvent {
72+
func handleUpdate(client *util.MongoDBClient, model *Model) handler.ProgressEvent {
7373
ctx := context.Background()
7474
orgID := model.OrgId
7575
clientID := model.ClientId
@@ -83,13 +83,13 @@ func HandleUpdate(req *handler.Request, client *util.MongoDBClient, model *Model
8383
HandlerErrorCode: string(types.HandlerErrorCodeNotFound),
8484
}
8585
}
86-
return HandleError(apiResp, constants.UPDATE, err)
86+
return handleError(apiResp, constants.UPDATE, err)
8787
}
8888

8989
serviceAccountReq := NewOrgServiceAccountUpdateReq(model)
9090
serviceAccountResp, apiResp, err := client.AtlasSDK.ServiceAccountsApi.UpdateOrgServiceAccount(ctx, *clientID, *orgID, serviceAccountReq).Execute()
9191
if err != nil {
92-
return HandleError(apiResp, constants.UPDATE, err)
92+
return handleError(apiResp, constants.UPDATE, err)
9393
}
9494

9595
resourceModel := GetOrgServiceAccountModel(serviceAccountResp, model)
@@ -106,7 +106,7 @@ func HandleUpdate(req *handler.Request, client *util.MongoDBClient, model *Model
106106
}
107107
}
108108

109-
func HandleDelete(req *handler.Request, client *util.MongoDBClient, model *Model) handler.ProgressEvent {
109+
func handleDelete(client *util.MongoDBClient, model *Model) handler.ProgressEvent {
110110
ctx := context.Background()
111111
orgID := model.OrgId
112112
clientID := model.ClientId
@@ -120,12 +120,12 @@ func HandleDelete(req *handler.Request, client *util.MongoDBClient, model *Model
120120
HandlerErrorCode: string(types.HandlerErrorCodeNotFound),
121121
}
122122
}
123-
return HandleError(resp, constants.DELETE, err)
123+
return handleError(resp, constants.DELETE, err)
124124
}
125125

126126
apiResp, err := client.AtlasSDK.ServiceAccountsApi.DeleteOrgServiceAccount(ctx, *clientID, *orgID).Execute()
127127
if err != nil {
128-
return HandleError(apiResp, constants.DELETE, err)
128+
return handleError(apiResp, constants.DELETE, err)
129129
}
130130

131131
return handler.ProgressEvent{
@@ -134,13 +134,13 @@ func HandleDelete(req *handler.Request, client *util.MongoDBClient, model *Model
134134
}
135135
}
136136

137-
func HandleList(req *handler.Request, client *util.MongoDBClient, model *Model) handler.ProgressEvent {
137+
func handleList(client *util.MongoDBClient, model *Model) handler.ProgressEvent {
138138
ctx := context.Background()
139139
orgID := model.OrgId
140140

141141
serviceAccounts, apiResp, err := client.AtlasSDK.ServiceAccountsApi.ListOrgServiceAccounts(ctx, *orgID).Execute()
142142
if err != nil {
143-
return HandleError(apiResp, constants.LIST, err)
143+
return handleError(apiResp, constants.LIST, err)
144144
}
145145

146146
response := make([]interface{}, 0)
@@ -166,7 +166,7 @@ func HandleList(req *handler.Request, client *util.MongoDBClient, model *Model)
166166
}
167167
}
168168

169-
func HandleError(response *http.Response, method constants.CfnFunctions, err error) handler.ProgressEvent {
169+
func handleError(response *http.Response, method constants.CfnFunctions, err error) handler.ProgressEvent {
170170
errMsg := fmt.Sprintf("%s error:%s", method, err.Error())
171171
return progress_events.GetFailedEventByResponse(errMsg, response)
172172
}

0 commit comments

Comments
 (0)