feat: Add SendUserProvidedResourceTags to third party integrations resource #1388
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -25,7 +25,7 @@ import ( | |||||
| log "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/v20250312005/admin" | ||||||
| ) | ||||||
|
|
||||||
| var RequiredFields = []string{constants.IntegrationType, constants.ProjectID} | ||||||
|
|
@@ -41,7 +41,7 @@ var requiredPerType = map[string][]string{ | |||||
| "FLOWDOCK": {"FlowName", "ApiToken", "OrgName"}, | ||||||
| "WEBHOOK": {"Url"}, | ||||||
| "MICROSOFT_TEAMS": {"MicrosoftTeamsWebhookUrl"}, | ||||||
| "PROMETHEUS": {"UserName", "Password", "ServiceDiscovery", "Enabled"}, | ||||||
EspenAlbert marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| } | ||||||
|
|
||||||
| func validateModel(fields []string, model *Model) *handler.ProgressEvent { | ||||||
|
|
@@ -76,18 +76,23 @@ func Create(req handler.Request, prevModel *Model, currentModel *Model) (handler | |||||
| } | ||||||
|
|
||||||
| requestBody := modelToIntegration(currentModel) | ||||||
| integrations, resModel, err := client.AtlasSDK.ThirdPartyIntegrationsApi.CreateThirdPartyIntegration(context.Background(), *IntegrationType, *ProjectID, requestBody).Execute() | ||||||
marcabreracast marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| if err != nil { | ||||||
| if apiError, ok := admin.AsError(err); ok && apiError.Error == http.StatusConflict { | ||||||
|
There was a problem hiding this comment. The comparison
Suggested change
|
||||||
| return progressevent.GetFailedEventByCode("INTEGRATION_ALREADY_CONFIGURED.", cloudformation.HandlerErrorCodeAlreadyExists), nil | ||||||
| } | ||||||
|
|
||||||
| return progressevent.GetFailedEventByResponse(err.Error(), resModel), nil | ||||||
| } | ||||||
|
|
||||||
| if integrations == nil || len(integrations.GetResults()) == 0 { | ||||||
|
There was a problem hiding this comment.
Suggested change
no need to check integration is not nil, see GetResults implementation: same for the other ocurrence There was a problem hiding this comment. in fact, as you're using results later, instead of retrieving again, you can do something like: |
||||||
| return progressevent.GetFailedEventByResponse("No integration returned from create", resModel), nil | ||||||
| } | ||||||
|
|
||||||
| results := integrations.GetResults() | ||||||
| return handler.ProgressEvent{ | ||||||
| OperationStatus: handler.Success, | ||||||
| ResourceModel: integrationToModel(*currentModel, &results[0]), | ||||||
| }, nil | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -108,7 +113,7 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P | |||||
| ProjectID := currentModel.ProjectId | ||||||
| IntegrationType := currentModel.Type | ||||||
|
|
||||||
| integration, res, err := client.AtlasSDK.ThirdPartyIntegrationsApi.GetThirdPartyIntegration(context.Background(), *ProjectID, *IntegrationType).Execute() | ||||||
|
|
||||||
| if err != nil { | ||||||
| return progressevent.GetFailedEventByResponse(err.Error(), res), nil | ||||||
|
|
@@ -139,24 +144,29 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler | |||||
| ProjectID := currentModel.ProjectId | ||||||
| IntegrationType := currentModel.Type | ||||||
|
|
||||||
| integration, res, err := client.AtlasSDK.ThirdPartyIntegrationsApi.GetThirdPartyIntegration(context.Background(), *ProjectID, *IntegrationType).Execute() | ||||||
| if err != nil { | ||||||
| return progressevent.GetFailedEventByResponse(err.Error(), res), nil | ||||||
| } | ||||||
|
|
||||||
| updateIntegrationFromSchema(currentModel, integration) | ||||||
| integrations, res, err := client.AtlasSDK.ThirdPartyIntegrationsApi.UpdateThirdPartyIntegration(context.Background(), *IntegrationType, *ProjectID, integration).Execute() | ||||||
| if err != nil { | ||||||
| return progressevent.GetFailedEventByResponse(err.Error(), res), nil | ||||||
| } | ||||||
|
|
||||||
| if integrations == nil || len(integrations.GetResults()) == 0 { | ||||||
| return progressevent.GetFailedEventByResponse("No integration returned from update", res), nil | ||||||
| } | ||||||
|
|
||||||
| results := integrations.GetResults() | ||||||
| return handler.ProgressEvent{ | ||||||
| OperationStatus: handler.Success, | ||||||
| ResourceModel: integrationToModel(*currentModel, &results[0]), | ||||||
| }, nil | ||||||
| } | ||||||
|
|
||||||
| func updateIntegrationFromSchema(currentModel *Model, integration *admin.ThirdPartyIntegration) { | ||||||
marcabreracast marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| if util.IsStringPresent(currentModel.Url) && !util.AreStringPtrEqual(currentModel.Url, integration.Url) { | ||||||
| integration.Url = currentModel.Url | ||||||
| } | ||||||
|
|
@@ -196,12 +206,13 @@ func updateIntegrationFromSchema(currentModel *Model, integration *admin.ThridPa | |||||
| if util.IsStringPresent(currentModel.ServiceDiscovery) && !util.AreStringPtrEqual(currentModel.ServiceDiscovery, integration.ServiceDiscovery) { | ||||||
| integration.ServiceDiscovery = currentModel.ServiceDiscovery | ||||||
| } | ||||||
|
There was a problem hiding this comment.
|
||||||
| if currentModel.Enabled != nil && currentModel.Enabled != integration.Enabled { | ||||||
| integration.Enabled = currentModel.Enabled | ||||||
| } | ||||||
|
|
||||||
| if currentModel.SendUserProvidedResourceTags != nil { | ||||||
| integration.SendUserProvidedResourceTags = currentModel.SendUserProvidedResourceTags | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler.ProgressEvent, error) { | ||||||
|
|
@@ -223,7 +234,7 @@ func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler | |||||
| ProjectID := currentModel.ProjectId | ||||||
| IntegrationType := currentModel.Type | ||||||
|
|
||||||
| res, err = client.AtlasSDK.ThirdPartyIntegrationsApi.DeleteThirdPartyIntegration(context.Background(), *IntegrationType, *ProjectID).Execute() | ||||||
|
There was a problem hiding this comment. why define vars res and err separated instead of using := here? |
||||||
|
|
||||||
| if err != nil { | ||||||
| return progressevent.GetFailedEventByResponse(err.Error(), res), nil | ||||||
|
|
@@ -251,15 +262,18 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P | |||||
|
|
||||||
| var res *http.Response | ||||||
| ProjectID := currentModel.ProjectId | ||||||
| integrations, res, err := client.AtlasSDK.ThirdPartyIntegrationsApi.ListThirdPartyIntegrations(context.Background(), *ProjectID).Execute() | ||||||
| if err != nil { | ||||||
| return progressevent.GetFailedEventByResponse(err.Error(), res), nil | ||||||
| } | ||||||
|
|
||||||
| mm := make([]interface{}, 0) | ||||||
| if integrations != nil { | ||||||
| results := integrations.GetResults() | ||||||
| for i := range results { | ||||||
| m := integrationToModel(*currentModel, &results[i]) | ||||||
| mm = append(mm, m) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // Response | ||||||
|
|
@@ -270,18 +284,15 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P | |||||
| }, nil | ||||||
| } | ||||||
|
|
||||||
| func modelToIntegration(currentModel *Model) (out *admin.ThirdPartyIntegration) { | ||||||
| out = &admin.ThirdPartyIntegration{} | ||||||
|
|
||||||
| if util.IsStringPresent(currentModel.Type) { | ||||||
| out.Type = currentModel.Type | ||||||
| } | ||||||
| if currentModel.Enabled != nil { | ||||||
| out.Enabled = currentModel.Enabled | ||||||
| } | ||||||
| if util.IsStringPresent(currentModel.ServiceDiscovery) { | ||||||
| out.ServiceDiscovery = currentModel.ServiceDiscovery | ||||||
| } | ||||||
|
|
@@ -321,11 +332,13 @@ func modelToIntegration(currentModel *Model) (out *admin.ThridPartyIntegration) | |||||
| if util.IsStringPresent(currentModel.ApiKey) { | ||||||
| out.ApiKey = currentModel.ApiKey | ||||||
| } | ||||||
| if currentModel.SendUserProvidedResourceTags != nil { | ||||||
marcabreracast marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| out.SendUserProvidedResourceTags = currentModel.SendUserProvidedResourceTags | ||||||
| } | ||||||
| return out | ||||||
| } | ||||||
|
|
||||||
| func integrationToModel(currentModel Model, integration *admin.ThirdPartyIntegration) Model { | ||||||
| // if "Enabled" is not set in the inputs we dont want to return "Enabled" in outputs | ||||||
| enabled := currentModel.Enabled != nil | ||||||
|
|
||||||
|
|
@@ -341,5 +354,6 @@ func integrationToModel(currentModel Model, integration *admin.ThridPartyIntegra | |||||
| if !enabled { | ||||||
| out.Enabled = nil | ||||||
| } | ||||||
|
|
||||||
| return out | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This update is needed in order to implement
SendUserProvidedResourceTagsfield.