feat: update third-party-integrations resource (#1554)

rakhul-mongo · outcomes-winter-rakhulsprakash · web-flow · commit 9899afc9d2e9 · 2026-02-05T03:58:56.000Z
Co-authored-by: Rakhul S Prakash &lt;rakhul.s.prakash@peerislands.io&gt;
diff --git a/.github/workflows/contract-testing.yaml b/.github/workflows/contract-testing.yaml
@@ -36,6 +36,7 @@ jobs:
      stream-instance: ${{ steps.filter.outputs.stream-instance }}
      stream-processor: ${{ steps.filter.outputs.stream-processor }}
      stream-workspace: ${{ steps.filter.outputs.stream-workspace }}
+     third-party-integration: ${{ steps.filter.outputs.third-party-integration }}
    steps:
    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
      if: ${{ github.event_name == 'push' }}
@@ -93,6 +94,8 @@ jobs:
           - 'cfn-resources/stream-processor/**'
         stream-workspace:
           - 'cfn-resources/stream-workspace/**'
+        third-party-integration:
+          - 'cfn-resources/third-party-integration/**'
   access-list-api-key:
     needs: change-detection
     if: ${{ needs.change-detection.outputs.access-list-api-key == 'true' }}
@@ -1116,5 +1119,57 @@ jobs:
           cat inputs/inputs_1_create.json
           cat inputs/inputs_1_update.json
 
+          make run-contract-testing
+          make delete-test-resources
+  third-party-integration:
+    needs: change-detection
+    if: ${{ needs.change-detection.outputs.third-party-integration == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5
+        with:
+          go-version-file: 'cfn-resources/go.mod'
+      - name: setup Atlas CLI
+        uses: mongodb/atlas-github-action@e3c9e0204659bafbb3b65e1eb1ee745cca0e9f3b
+      - uses: aws-actions/setup-sam@c2a20b1822cc4a6bc594ff7f1dbb658758e383c3
+        with:
+          use-installer: true
+      - uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_TEST_ENV }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_TEST_ENV }}
+          aws-region: eu-west-1
+      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548
+        with:
+          python-version: '3.9'
+          cache: 'pip' # caching pip dependencies
+      - run: pip install cloudformation-cli cloudformation-cli-go-plugin
+      - name: Run the Contract test
+        shell: bash
+        env:
+          MONGODB_ATLAS_PUBLIC_API_KEY: ${{ secrets.CLOUD_DEV_PUBLIC_KEY }}
+          MONGODB_ATLAS_PRIVATE_API_KEY: ${{ secrets.CLOUD_DEV_PRIVATE_KEY }}
+          MONGODB_ATLAS_ORG_ID: ${{ secrets.CLOUD_DEV_ORG_ID }}
+          MONGODB_ATLAS_OPS_MANAGER_URL: ${{ vars.MONGODB_ATLAS_BASE_URL }}
+          MONGODB_ATLAS_PROFILE: cfn-cloud-dev-github-action
+          WEBHOOK_CREATE_URL: ${{ vars.WEBHOOK_CREATE_URL }}
+          WEBHOOK_UPDATE_URL: ${{ vars.WEBHOOK_UPDATE_URL }}
+          WEBHOOK_UPDATE_SECRET: ${{ vars.WEBHOOK_UPDATE_SECRET }}
+          PROMETHEUS_USER_NAME: ${{ vars.PROMETHEUS_USER_NAME }}
+          PROMETHEUS_PASSWORD_NAME: ${{ vars.PROMETHEUS_PASSWORD_NAME }}
+          PAGER_DUTY_CREATE_SERVICE_KEY: ${{ vars.PAGER_DUTY_CREATE_SERVICE_KEY }}
+          PAGER_DUTY_UPDATE_SERVICE_KEY: ${{ vars.PAGER_DUTY_UPDATE_SERVICE_KEY }}
+          DATA_DOG_CREATE_API_KEY: ${{ vars.DATA_DOG_CREATE_API_KEY }}
+          DATA_DOG_UPDATE_API_KEY: ${{ vars.DATA_DOG_UPDATE_API_KEY }}
+          OPS_GENIE_API_KEY: ${{ vars.OPS_GENIE_API_KEY }}
+          MICROSOFT_TEAMS_WEBHOOK_CREATE_URL: ${{ vars.MICROSOFT_TEAMS_WEBHOOK_CREATE_URL }}
+          MICROSOFT_TEAMS_WEBHOOK_UPDATE_URL: ${{ vars.MICROSOFT_TEAMS_WEBHOOK_UPDATE_URL }}
+        run: |
+          cd cfn-resources/third-party-integration
+          make create-test-resources
+          
+          cat inputs/*
+
           make run-contract-testing
           make delete-test-resources
diff --git a/cfn-resources/third-party-integration/Makefile b/cfn-resources/third-party-integration/Makefile
@@ -13,7 +13,21 @@ build:
 
 debug:
 	cfn generate
-	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/bootstrap cmd/main.go
+	env GOOS=$(goos) CGO_ENABLED=$(cgo) GOARCH=$(goarch) go build -ldflags="$(ldXflagsD)" -tags="$(tags)" -o bin/debug cmd/main.go
 
 clean:
 	rm -rf bin
+
+create-test-resources:
+	@echo "==> Creating test files and resources for contract testing"
+	./test/contract-testing/cfn-test-create.sh
+
+delete-test-resources:
+	@echo "==> Delete test resources used for contract testing"
+	./test/contract-testing/cfn-test-delete.sh
+
+run-contract-testing:
+	@echo "==> Run contract testing"
+	make build
+	sam local start-lambda &
+	cfn test --function-name TestEntrypoint --verbose
diff --git a/cfn-resources/third-party-integration/cmd/resource/model.go b/cfn-resources/third-party-integration/cmd/resource/model.go
diff --git a/cfn-resources/third-party-integration/cmd/resource/resource.go b/cfn-resources/third-party-integration/cmd/resource/resource.go
@@ -214,6 +214,12 @@ func updateIntegrationFromSchema(currentModel *Model, integration *admin.ThirdPa
 	if currentModel.SendUserProvidedResourceTags != nil {
 		integration.SendUserProvidedResourceTags = currentModel.SendUserProvidedResourceTags
 	}
+	if currentModel.SendCollectionLatencyMetrics != nil {
+		integration.SendCollectionLatencyMetrics = currentModel.SendCollectionLatencyMetrics
+	}
+	if currentModel.SendDatabaseMetrics != nil {
+		integration.SendDatabaseMetrics = currentModel.SendDatabaseMetrics
+	}
 }
 
 func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler.ProgressEvent, error) {
@@ -331,6 +337,12 @@ func modelToIntegration(currentModel *Model) (out *admin.ThirdPartyIntegration)
 	if currentModel.SendUserProvidedResourceTags != nil {
 		out.SendUserProvidedResourceTags = currentModel.SendUserProvidedResourceTags
 	}
+	if currentModel.SendCollectionLatencyMetrics != nil {
+		out.SendCollectionLatencyMetrics = currentModel.SendCollectionLatencyMetrics
+	}
+	if currentModel.SendDatabaseMetrics != nil {
+		out.SendDatabaseMetrics = currentModel.SendDatabaseMetrics
+	}
 	return out
 }
 
@@ -346,6 +358,8 @@ func integrationToModel(currentModel Model, integration *admin.ThirdPartyIntegra
 		ProjectId:                    currentModel.ProjectId,
 		Profile:                      currentModel.Profile,
 		SendUserProvidedResourceTags: currentModel.SendUserProvidedResourceTags,
+		SendCollectionLatencyMetrics: currentModel.SendCollectionLatencyMetrics,
+		SendDatabaseMetrics:          currentModel.SendDatabaseMetrics,
 	}
 
 	if !enabled {
diff --git a/cfn-resources/third-party-integration/docs/README.md b/cfn-resources/third-party-integration/docs/README.md
@@ -31,7 +31,9 @@ To declare this entity in your AWS CloudFormation template, use the following sy
         "<a href="#enabled" title="Enabled">Enabled</a>" : <i>Boolean</i>,
         "<a href="#listenaddress" title="ListenAddress">ListenAddress</a>" : <i>String</i>,
         "<a href="#tlspempath" title="TlsPemPath">TlsPemPath</a>" : <i>String</i>,
-        "<a href="#senduserprovidedresourcetags" title="SendUserProvidedResourceTags">SendUserProvidedResourceTags</a>" : <i>Boolean</i>
+        "<a href="#senduserprovidedresourcetags" title="SendUserProvidedResourceTags">SendUserProvidedResourceTags</a>" : <i>Boolean</i>,
+        "<a href="#sendcollectionlatencymetrics" title="SendCollectionLatencyMetrics">SendCollectionLatencyMetrics</a>" : <i>Boolean</i>,
+        "<a href="#senddatabasemetrics" title="SendDatabaseMetrics">SendDatabaseMetrics</a>" : <i>Boolean</i>
     }
 }
 </pre>
@@ -61,6 +63,8 @@ Properties:
     <a href="#listenaddress" title="ListenAddress">ListenAddress</a>: <i>String</i>
     <a href="#tlspempath" title="TlsPemPath">TlsPemPath</a>: <i>String</i>
     <a href="#senduserprovidedresourcetags" title="SendUserProvidedResourceTags">SendUserProvidedResourceTags</a>: <i>Boolean</i>
+    <a href="#sendcollectionlatencymetrics" title="SendCollectionLatencyMetrics">SendCollectionLatencyMetrics</a>: <i>Boolean</i>
+    <a href="#senddatabasemetrics" title="SendDatabaseMetrics">SendDatabaseMetrics</a>: <i>Boolean</i>
 </pre>
 
 ## Properties
@@ -269,3 +273,23 @@ _Type_: Boolean
 
 _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
 
+#### SendCollectionLatencyMetrics
+
+Flag that indicates whether to send collection latency metrics to Datadog, including database names, collection names, and latency metrics on reads, writes, commands, and transactions.
+
+_Required_: No
+
+_Type_: Boolean
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+
+#### SendDatabaseMetrics
+
+Flag that indicates whether to send database metrics to Datadog, including database names and metrics on the number of collections, storage size, and index size.
+
+_Required_: No
+
+_Type_: Boolean
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+
diff --git a/cfn-resources/third-party-integration/mongodb-atlas-thirdpartyintegration.json b/cfn-resources/third-party-integration/mongodb-atlas-thirdpartyintegration.json
@@ -155,6 +155,14 @@
     "SendUserProvidedResourceTags": {
       "type": "boolean",
       "description": "Flag that indicates whether to include user-defined resource tags when sending metrics and alerts to third-party services."
+    },
+    "SendCollectionLatencyMetrics": {
+      "type": "boolean",
+      "description": "Flag that indicates whether to send collection latency metrics to Datadog, including database names, collection names, and latency metrics on reads, writes, commands, and transactions."
+    },
+    "SendDatabaseMetrics": {
+      "type": "boolean",
+      "description": "Flag that indicates whether to send database metrics to Datadog, including database names and metrics on the number of collections, storage size, and index size."
     }
   },
   "typeName": "MongoDB::Atlas::ThirdPartyIntegration",
diff --git a/cfn-resources/third-party-integration/test/cfn-test-create-inputs.sh b/cfn-resources/third-party-integration/test/cfn-test-create-inputs.sh
@@ -15,6 +15,12 @@ function usage {
 if [ "$#" -ne 1 ]; then usage; fi
 if [[ "$*" == help ]]; then usage; fi
 
+profile="default"
+if [ ${MONGODB_ATLAS_PROFILE+x} ]; then
+	echo "profile set to ${MONGODB_ATLAS_PROFILE}"
+	profile=${MONGODB_ATLAS_PROFILE}
+fi
+
 rm -rf inputs
 mkdir inputs
 
@@ -35,30 +41,34 @@ webHookUpdateUrl="$WEBHOOK_UPDATE_URL"
 webHookUpdateSecret="$WEBHOOK_UPDATE_SECRET"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg web_hook_create_url "$webHookCreateUrl" \
-	'.ProjectId?|=$project_id | .Url?|=$web_hook_create_url' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .Url?|=$web_hook_create_url' \
 	"$(dirname "$0")/inputs_1_create.template.json" >"inputs/inputs_1_create.json"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg web_hook_create_url "$webHookUpdateUrl" \
 	--arg web_hook_create_secret "$webHookUpdateSecret" \
-	'.ProjectId?|=$project_id | .Url?|=$web_hook_create_url | .Secret?|=$web_hook_create_secret' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .Url?|=$web_hook_create_url | .Secret?|=$web_hook_create_secret' \
 	"$(dirname "$0")/inputs_1_update.template.json" >"inputs/inputs_1_update.json"
 
 #PROMETHEUS
 prometheusUsrName="$PROMETHEUS_USER_NAME"
 prometheusPassword="$PROMETHEUS_PASSWORD_NAME"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg prometheus_usr_name "$prometheusUsrName" \
 	--arg prometheus_password "$prometheusPassword" \
-	'.ProjectId?|=$project_id | .UserName?|=$prometheus_usr_name | .Password?|=$prometheus_password' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .UserName?|=$prometheus_usr_name | .Password?|=$prometheus_password' \
 	"$(dirname "$0")/inputs_2_create.template.json" >"inputs/inputs_2_create.json"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg prometheus_usr_name "$prometheusUsrName" \
 	--arg prometheus_password "$prometheusPassword" \
-	'.ProjectId?|=$project_id | .UserName?|=$prometheus_usr_name | .Password?|=$prometheus_password' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .UserName?|=$prometheus_usr_name | .Password?|=$prometheus_password' \
 	"$(dirname "$0")/inputs_2_update.template.json" >"inputs/inputs_2_update.json"
 
 #PAGER_DUTY
@@ -67,13 +77,15 @@ pagerDutyCreateServiceKey="$PAGER_DUTY_CREATE_SERVICE_KEY"
 pagerDutyUpdateServiceKey="$PAGER_DUTY_UPDATE_SERVICE_KEY"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg service_key "$pagerDutyCreateServiceKey" \
-	'.ProjectId?|=$project_id | .ServiceKey?|=$service_key' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .ServiceKey?|=$service_key' \
 	"$(dirname "$0")/inputs_3_create.template.json" >"inputs/inputs_3_create.json"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg service_key "$pagerDutyUpdateServiceKey" \
-	'.ProjectId?|=$project_id | .ServiceKey?|=$service_key' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .ServiceKey?|=$service_key' \
 	"$(dirname "$0")/inputs_3_update.template.json" >"inputs/inputs_3_update.json"
 
 #DATA_DOG
@@ -82,27 +94,31 @@ dataDogCreateApiKey="$DATA_DOG_CREATE_API_KEY"
 dataDogUpdateApiKey="$DATA_DOG_UPDATE_API_KEY"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg data_dog_create_api_key "$dataDogCreateApiKey" \
-	'.ProjectId?|=$project_id | .ApiKey?|=$data_dog_create_api_key' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .ApiKey?|=$data_dog_create_api_key' \
 	"$(dirname "$0")/inputs_4_create.template.json" >"inputs/inputs_4_create.json"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg data_dog_update_api_key "$dataDogUpdateApiKey" \
-	'.ProjectId?|=$project_id | .ApiKey?|=$data_dog_update_api_key' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .ApiKey?|=$data_dog_update_api_key' \
 	"$(dirname "$0")/inputs_4_update.template.json" >"inputs/inputs_4_update.json"
 
 #OPS_GENIE
 
 opsGenieApiKey="$OPS_GENIE_API_KEY"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg ops_genie_api_key "$opsGenieApiKey" \
-	'.ProjectId?|=$project_id | .ApiKey?|=$ops_genie_api_key' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .ApiKey?|=$ops_genie_api_key' \
 	"$(dirname "$0")/inputs_5_create.template.json" >"inputs/inputs_5_create.json"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg ops_genie_api_key "$opsGenieApiKey" \
-	'.ProjectId?|=$project_id | .ApiKey?|=$ops_genie_api_key' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .ApiKey?|=$ops_genie_api_key' \
 	"$(dirname "$0")/inputs_5_update.template.json" >"inputs/inputs_5_update.json"
 
 #MICROSOFT_TEAMS
@@ -111,13 +127,15 @@ microsoftTeamsCreateWebHook="$MICROSOFT_TEAMS_WEBHOOK_CREATE_URL"
 microsoftTeamsUpdateWebHook="$MICROSOFT_TEAMS_WEBHOOK_UPDATE_URL"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg microsoft_teams_create_web_hook "$microsoftTeamsCreateWebHook" \
-	'.ProjectId?|=$project_id | .MicrosoftTeamsWebhookUrl?|=$microsoft_teams_create_web_hook' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .MicrosoftTeamsWebhookUrl?|=$microsoft_teams_create_web_hook' \
 	"$(dirname "$0")/inputs_6_create.template.json" >"inputs/inputs_6_create.json"
 
 jq --arg project_id "$projectId" \
+	--arg profile "$profile" \
 	--arg microsoft_teams_update_web_hook "$microsoftTeamsUpdateWebHook" \
-	'.ProjectId?|=$project_id | .MicrosoftTeamsWebhookUrl?|=$microsoft_teams_update_web_hook' \
+	'.ProjectId?|=$project_id | .Profile?|=$profile | .MicrosoftTeamsWebhookUrl?|=$microsoft_teams_update_web_hook' \
 	"$(dirname "$0")/inputs_6_update.template.json" >"inputs/inputs_6_update.json"
 
 cd ..
diff --git a/cfn-resources/third-party-integration/test/cfn-test-delete-inputs.sh b/cfn-resources/third-party-integration/test/cfn-test-delete-inputs.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# cfn-test-delete-inputs.sh
+#
+# This tool deletes the mongodb resources used for `cfn test` as inputs.
+#
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+function usage {
+	echo "usage:$0 "
+}
+
+projectId=$(jq -r '.ProjectId' ./inputs/inputs_1_create.json)
+
+#delete project
+if atlas projects delete "$projectId" --force; then
+	echo "$projectId project deletion OK"
+else
+	(echo "Failed cleaning project:$projectId" && exit 1)
+fi
diff --git a/cfn-resources/third-party-integration/test/contract-testing/cfn-test-create.sh b/cfn-resources/third-party-integration/test/contract-testing/cfn-test-create.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# This tool generates the resources and json files in the inputs/ for `cfn test`.
+set -o errexit
+set -o nounset
+set -o pipefail
+
+projectName="cfn-test-bot-$(date +%s)-$RANDOM"
+
+# create project
+projectId=$(atlas projects create "${projectName}" --output=json | jq -r '.id')
+
+echo "projectId: $projectId"
+echo "projectName: $projectName"
+
+./test/cfn-test-create-inputs.sh "$projectName"
diff --git a/cfn-resources/third-party-integration/test/contract-testing/cfn-test-delete.sh b/cfn-resources/third-party-integration/test/contract-testing/cfn-test-delete.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# This tool deletes the mongodb resources used for `cfn test` as inputs.
+set -o errexit
+set -o nounset
+set -o pipefail
+
+./test/cfn-test-delete-inputs.sh
diff --git a/cfn-resources/third-party-integration/test/inputs_4_create.template.json b/cfn-resources/third-party-integration/test/inputs_4_create.template.json
@@ -4,5 +4,7 @@
   "Type": "DATADOG",
   "ApiKey": "",
   "Region": "US",
-  "SendUserProvidedResourceTags": false
+  "SendUserProvidedResourceTags": "false",
+  "SendCollectionLatencyMetrics": "false",
+  "SendDatabaseMetrics": "false"
 }
diff --git a/cfn-resources/third-party-integration/test/inputs_4_update.template.json b/cfn-resources/third-party-integration/test/inputs_4_update.template.json
@@ -4,5 +4,7 @@
   "Type": "DATADOG",
   "ApiKey": "",
   "Region": "US",
-  "SendUserProvidedResourceTags": true
+  "SendUserProvidedResourceTags": "true",
+  "SendCollectionLatencyMetrics": "true",
+  "SendDatabaseMetrics": "true"
 }
diff --git a/examples/thirdpartyintegrations/datadog.json b/examples/thirdpartyintegrations/datadog.json
