feat: Complete FlexCluster implementation (#1425)

Author: lantoli

.github/workflows/contract-testing.yaml

@@ -19,6 +19,7 @@ jobs:
      cluster-outage-simulation: ${{ steps.filter.outputs.cluster-outage-simulation }}
      federated-database-instance: ${{ steps.filter.outputs.federated-database-instance }}
      federated-query-limit: ${{ steps.filter.outputs.federated-query-limit }}
+     flex-cluster: ${{ steps.filter.outputs.flex-cluster }}
      online-archive: ${{ steps.filter.outputs.online-archive }}
      organization: ${{ steps.filter.outputs.organization }}
      private-endpoint-aws: ${{ steps.filter.outputs.private-endpoint-aws }}
@@ -53,6 +54,8 @@ jobs:
           - 'cfn-resources/federated-database-instance/**'
         federated-query-limit:
           - 'cfn-resources/federated-query-limit/**'
+        flex-cluster:
+          - 'cfn-resources/flex-cluster/**'
         online-archive:
           - 'cfn-resources/online-archive/**'
         organization:
@@ -401,6 +404,48 @@ jobs:
           
           make run-contract-testing
           make delete-test-resources
+
+  flex-cluster:
+    needs: change-detection
+    if: ${{ needs.change-detection.outputs.flex-cluster == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+    - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+      with:
+        go-version-file: 'cfn-resources/go.mod'
+    - name: setup Atlas CLI
+      uses: mongodb/atlas-github-action@15663d068c40a8582d881560961fce9d45e0df9a
+    - uses: aws-actions/setup-sam@f664fad9e12492edfc187a31f575537dfbb0ff63
+      with:
+        use-installer: true
+    - uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a
+      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@a26af69be951a213d495a4c3e4e4022e16d87065
+      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: |
+        pushd cfn-resources/flex-cluster
+        make create-test-resources
+        
+        cat inputs/inputs_1_create.json
+        cat inputs/inputs_1_update.json
+        
+        make run-contract-testing
+        make delete-test-resources
   online-archive:
     needs: change-detection
     if: ${{ needs.change-detection.outputs.online-archive == 'true' }}
@@ -853,4 +898,4 @@ jobs:
           make create-test-resources
           cat inputs/inputs_1_create.json
           make run-contract-testing
-          make delete-test-resources
+          make delete-test-resources

.github/workflows/e2e-testing.yaml

@@ -12,6 +12,7 @@ jobs:
       repository-projects: read
     outputs:
       cluster: ${{ steps.filter.outputs.cluster }}
+      flex-cluster: ${{ steps.filter.outputs.flex-cluster }}
       project: ${{ steps.filter.outputs.project }}
       search-deployment: ${{ steps.filter.outputs.search-deployment }}
     steps:
@@ -24,6 +25,9 @@ jobs:
             cluster:
               - 'cfn-resources/cluster/**'
               - 'cfn-resources/test/e2e/cluster/**'
+            flex-cluster:
+              - 'cfn-resources/flex-cluster/**'
+              - 'cfn-resources/test/e2e/flex-cluster/**'
             project:
               - 'cfn-resources/project/**'
               - 'cfn-resources/test/e2e/project/**'
@@ -60,6 +64,39 @@ jobs:
         run: |
           cd cfn-resources/test/e2e/cluster
           go test -timeout 90m -v cluster_test.go
+  
+  
+  flex-cluster:
+    needs: change-detection
+    if: ${{ needs.change-detection.outputs.flex-cluster == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+        with:
+          python-version: '3.9'
+          cache: 'pip'
+      - run: pip install cloudformation-cli-go-plugin
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+        with:
+          go-version-file: 'cfn-resources/go.mod'
+      - uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a
+        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
+      - name: Run E2E test
+        shell: bash
+        env:
+          MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.CLOUD_DEV_PUBLIC_KEY }}
+          MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.CLOUD_DEV_PRIVATE_KEY }}
+          MONGODB_ATLAS_ORG_ID: ${{ secrets.CLOUD_DEV_ORG_ID }}
+          MONGODB_ATLAS_BASE_URL: https://cloud-dev.mongodb.com/
+          MONGODB_ATLAS_SECRET_PROFILE: cfn-cloud-dev-github-action
+        run: |
+          cd cfn-resources/test/e2e/flex-cluster
+          go test -timeout 60m -v flexcluster_test.go
+        
   project:
     needs: change-detection
     if: ${{ needs.change-detection.outputs.project == 'true' }}

cfn-resources/flex-cluster/.rpdk-config

@@ -1,12 +1,12 @@
 {
-    "typeName": "MongoDB::Atlas::FlexCluster",
-    "language": "go",
-    "runtime": "provided.al2",
-    "entrypoint": "bootstrap",
-    "testEntrypoint": "bootstrap",
-    "settings": {
-        "import_path": "github.com/mongodb/mongodbatlas-cloudformation-resources/flex-cluster",
-        "protocolVersion": "2.0.0",
-        "pluginVersion": "2.0.4"
-    }
+  "typeName": "MongoDB::Atlas::FlexCluster",
+  "language": "go",
+  "runtime": "provided.al2",
+  "entrypoint": "bootstrap",
+  "testEntrypoint": "bootstrap",
+  "settings": {
+    "import_path": "github.com/mongodb/mongodbatlas-cloudformation-resources/flex-cluster",
+    "protocolVersion": "2.0.0",
+    "pluginVersion": "2.0.4"
+  }
 }

cfn-resources/flex-cluster/Makefile

@@ -19,4 +19,20 @@ clean:
 	rm -rf bin
 
 submit: clean build # submit to private registry must use release build not debug build
+	@echo "==> Submitting to private registry for testing"
 	 cfn submit --set-default --region us-east-1
+
+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
+