Add cfn test workflow, use http util functions

Author: outcomes-winter-rakhulsprakash

.github/workflows/contract-testing.yaml

@@ -22,6 +22,7 @@ jobs:
      flex-cluster: ${{ steps.filter.outputs.flex-cluster }}
      online-archive: ${{ steps.filter.outputs.online-archive }}
      organization: ${{ steps.filter.outputs.organization }}
+     org-service-account: ${{ steps.filter.outputs.org-service-account }}
      private-endpoint-aws: ${{ steps.filter.outputs.private-endpoint-aws }}
      private-endpoint-service: ${{ steps.filter.outputs.private-endpoint-service }}
      privatelink-endpoint-service-data-federation-online-archive: ${{ steps.filter.outputs.privatelink-endpoint-service-data-federation-online-archive }}
@@ -60,6 +61,8 @@ jobs:
           - 'cfn-resources/online-archive/**'
         organization:
           - 'cfn-resources/organization/**'
+        org-service-account:
+          - 'cfn-resources/org-service-account/**'
         private-endpoint-aws:
           - 'cfn-resources/private-endpoint-aws/**'
         private-endpoint-service:
@@ -522,7 +525,48 @@ jobs:
         run: |
           pushd cfn-resources/organization
           make create-test-resources
-          
+
+          cat inputs/inputs_1_create.json
+          cat inputs/inputs_1_update.json
+
+          make run-contract-testing
+          make delete-test-resources
+  org-service-account:
+    needs: change-detection
+    if: ${{ needs.change-detection.outputs.org-service-account == '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
+        run: |
+          cd cfn-resources/org-service-account
+          make create-test-resources
+
           cat inputs/inputs_1_create.json
           cat inputs/inputs_1_update.json
           

cfn-resources/org-service-account/Makefile

@@ -1,4 +1,4 @@
-.PHONY: build test clean debug
+.PHONY: build test clean debug create-test-resources delete-test-resources run-contract-testing
 tags=logging callback metrics scheduler
 cgo=0
 goos=linux
@@ -21,3 +21,17 @@ test:
 
 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

…rg-service-account/cmd/resource/share.go …service-account/cmd/resource/handlers.gocfn-resources/org-service-account/cmd/resource/share.go renamed to cfn-resources/org-service-account/cmd/resource/handlers.go cfn-resources/org-service-account/cmd/resource/share.go renamed to cfn-resources/org-service-account/cmd/resource/handlers.go

@@ -76,7 +76,7 @@ func handleUpdate(client *util.MongoDBClient, model *Model) handler.ProgressEven
 
 	_, apiResp, err := client.AtlasSDK.ServiceAccountsApi.GetOrgServiceAccount(ctx, *orgID, *clientID).Execute()
 	if err != nil {
-		if apiResp != nil && apiResp.StatusCode == http.StatusNotFound {
+		if util.StatusNotFound(apiResp) {
 			return handler.ProgressEvent{
 				OperationStatus:  handler.Failed,
 				Message:          "Resource not found",
@@ -113,7 +113,7 @@ func handleDelete(client *util.MongoDBClient, model *Model) handler.ProgressEven
 
 	_, resp, err := client.AtlasSDK.ServiceAccountsApi.GetOrgServiceAccount(ctx, *orgID, *clientID).Execute()
 	if err != nil {
-		if resp != nil && resp.StatusCode == http.StatusNotFound {
+		if util.StatusNotFound(resp) {
 			return handler.ProgressEvent{
 				OperationStatus:  handler.Failed,
 				Message:          "Resource not found",

cfn-resources/org-service-account/test/contract-testing/cfn-test-create.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# This tool generates json files in the inputs/ for `cfn test`.
+set -o errexit
+set -o nounset
+set -o pipefail
+
+serviceAccountName="cfn-test-service-account-$(date +%s)-$RANDOM"
+
+echo "serviceAccountName: $serviceAccountName"
+
+./test/cfn-test-create-inputs.sh "$serviceAccountName"

cfn-resources/org-service-account/test/contract-testing/cfn-test-delete.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# This tool deletes the mongodb resources used for `cfn test` as inputs.
+# For org-service-account, no pre-created resources need cleanup.
+# The CloudFormation test framework handles resource cleanup automatically.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+echo "No test resources to delete"