From b735b0d425106b4389ab224251d87d8316007a77 Mon Sep 17 00:00:00 2001 From: lantoli <430982+lantoli@users.noreply.github.com> Date: Fri, 4 Oct 2024 06:21:15 +0000 Subject: [PATCH 1/2] build(deps): bump go.mongodb.org/atlas-sdk --- cfn-resources/go.mod | 2 +- cfn-resources/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfn-resources/go.mod b/cfn-resources/go.mod index ffebc9896..4b87fba2c 100644 --- a/cfn-resources/go.mod +++ b/cfn-resources/go.mod @@ -19,7 +19,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/v20240805004 v20240805004.2.0 + go.mongodb.org/atlas-sdk/v20240805004 v20240805004.5.0 go.mongodb.org/realm v0.1.0 ) diff --git a/cfn-resources/go.sum b/cfn-resources/go.sum index 49487901b..ed2463c14 100644 --- a/cfn-resources/go.sum +++ b/cfn-resources/go.sum @@ -109,8 +109,8 @@ go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0 h1:x6nnq2pUIP9mN4WLD4/Ese go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0/go.mod h1:el7cm23kEiiw72HAYimhNweKqp/ubHsNJk+Mk30yJhM= go.mongodb.org/atlas-sdk/v20231115014 v20231115014.0.0 h1:hN7x3m6THf03q/tE48up1j0U/26lJmx+s1LXB/qvHHc= go.mongodb.org/atlas-sdk/v20231115014 v20231115014.0.0/go.mod h1:pCl46YnWOIde8lq27whXDwUseNeUvtAy3vy5ZDeTcBA= -go.mongodb.org/atlas-sdk/v20240805004 v20240805004.2.0 h1:f40gW44GYiaF29nSJd0kU+SzRfrLlgU/8PmMIQdO+zc= -go.mongodb.org/atlas-sdk/v20240805004 v20240805004.2.0/go.mod h1:64cvOvwsE0TTi9nAl16XlVkHzT0gFLGcZeG7HnnXxtE= +go.mongodb.org/atlas-sdk/v20240805004 v20240805004.5.0 h1:m14HgMj470RF+QvAgqSQdk+T+M9Ah8x9GL0RwNxdE90= +go.mongodb.org/atlas-sdk/v20240805004 v20240805004.5.0/go.mod h1:7KSDRNJm1Dxc+ggk2MOggp2/4zUpM4aRcP12evvsrQ4= go.mongodb.org/realm v0.1.0 h1:zJiXyLaZrznQ+Pz947ziSrDKUep39DO4SfA0Fzx8M4M= go.mongodb.org/realm v0.1.0/go.mod h1:4Vj6iy+Puo1TDERcoh4XZ+pjtwbOzPpzqy3Cwe8ZmDM= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From d94514e2bd9cd620faae946e35b37e30ee3d0e0d Mon Sep 17 00:00:00 2001 From: Leo Antoli <430982+lantoli@users.noreply.github.com> Date: Fri, 4 Oct 2024 08:06:20 +0100 Subject: [PATCH 2/2] fix build errors --- .../resource-policy/cmd/resource/resource.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cfn-resources/resource-policy/cmd/resource/resource.go b/cfn-resources/resource-policy/cmd/resource/resource.go index 51c38ac0f..8d3a2b09c 100644 --- a/cfn-resources/resource-policy/cmd/resource/resource.go +++ b/cfn-resources/resource-policy/cmd/resource/resource.go @@ -60,7 +60,7 @@ func Create(req handler.Request, prevModel *Model, currentModel *Model) (handler orgID := currentModel.OrgId resourcePolicyReq := NewResourcePolicyCreateReq(currentModel) - resourcePolicyResp, apiResp, err := conn.AtlasResourcePoliciesApi.CreateAtlasResourcePolicy(ctx, *orgID, resourcePolicyReq).Execute() + resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.CreateAtlasResourcePolicy(ctx, *orgID, resourcePolicyReq).Execute() if err != nil { return handleError(apiResp, constants.CREATE, err) } @@ -83,7 +83,7 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P orgID := currentModel.OrgId resourcePolicyID := currentModel.Id - resourcePolicyResp, apiResp, err := conn.AtlasResourcePoliciesApi.GetAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute() + resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.GetAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute() if err != nil { return handleError(apiResp, constants.READ, err) } @@ -106,7 +106,7 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler orgID := currentModel.OrgId resourcePolicyID := currentModel.Id - _, _, err := conn.AtlasResourcePoliciesApi.GetAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute() + _, _, err := conn.ResourcePoliciesApi.GetAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute() if err != nil { return handler.ProgressEvent{ OperationStatus: handler.Failed, @@ -115,7 +115,7 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler }, nil } resourcePolicyReq := NewResourcePolicyUpdateReq(currentModel) - resourcePolicyResp, apiResp, err := conn.AtlasResourcePoliciesApi.UpdateAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID, resourcePolicyReq).Execute() + resourcePolicyResp, apiResp, err := conn.ResourcePoliciesApi.UpdateAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID, resourcePolicyReq).Execute() if err != nil { return handleError(apiResp, constants.UPDATE, err) } @@ -139,7 +139,7 @@ func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler orgID := currentModel.OrgId resourcePolicyID := currentModel.Id - _, apiResp, err := conn.AtlasResourcePoliciesApi.DeleteAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute() + _, apiResp, err := conn.ResourcePoliciesApi.DeleteAtlasResourcePolicy(ctx, *orgID, *resourcePolicyID).Execute() if err != nil { return handleError(apiResp, constants.DELETE, err) } @@ -160,7 +160,7 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P orgID := currentModel.OrgId - resourcePolicies, apiResp, err := conn.AtlasResourcePoliciesApi.GetAtlasResourcePolicies(ctx, *orgID).Execute() + resourcePolicies, apiResp, err := conn.ResourcePoliciesApi.GetAtlasResourcePolicies(ctx, *orgID).Execute() if err != nil { return handleError(apiResp, constants.LIST, err) }