Merge branch 'master' into CLOUDP-369801-federated-settings-identity-provider

Author: ParthasarathyV

.github/workflows/contract-testing.yaml

@@ -31,6 +31,7 @@ jobs:
      search-deployment: ${{ steps.filter.outputs.search-deployment }}
      stream-connection: ${{ steps.filter.outputs.stream-connection }}
      stream-instance: ${{ steps.filter.outputs.stream-instance }}
+     stream-processor: ${{ steps.filter.outputs.stream-processor }}
      stream-workspace: ${{ steps.filter.outputs.stream-workspace }}
    steps:
    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
@@ -79,6 +80,8 @@ jobs:
           - 'cfn-resources/stream-connection/**'
         stream-instance:
           - 'cfn-resources/stream-instance/**'
+        stream-processor:
+          - 'cfn-resources/stream-processor/**'
         stream-workspace:
           - 'cfn-resources/stream-workspace/**'
   access-list-api-key:
@@ -901,6 +904,46 @@ jobs:
           pushd cfn-resources/stream-instance
           make create-test-resources
           cat inputs/inputs_1_create.json
+          make run-contract-testing
+          make delete-test-resources
+  stream-processor:
+    needs: change-detection
+    if: ${{ needs.change-detection.outputs.stream-processor == '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/stream-processor
+          make create-test-resources
+
+          cat inputs/*
+
           make run-contract-testing
           make delete-test-resources
   stream-workspace:
@@ -943,4 +986,4 @@ jobs:
           cat inputs/inputs_1_update.json
 
           make run-contract-testing
-          make delete-test-resources
+          make delete-test-resources

cfn-resources/federated-query-limit/cmd/resource/resource.go

@@ -19,6 +19,8 @@ import (
 	"fmt"
 	"net/http"
 
+	"go.mongodb.org/atlas-sdk/v20250312012/admin"
+
 	"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
@@ -29,7 +31,6 @@ import (
 	progress_events "github.com/mongodb/mongodbatlas-cloudformation-resources/util/progressevent"
 	"github.com/mongodb/mongodbatlas-cloudformation-resources/util/validator"
 	"github.com/spf13/cast"
-	admin20231115014 "go.mongodb.org/atlas-sdk/v20231115014/admin"
 )
 
 var CreateOrUpdateRequiredFields = []string{constants.ProjectID, constants.TenantName, constants.LimitName, constants.Value}
@@ -132,7 +133,7 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler
 	// Check already exists or not
 	_, response, err := getFederatedQueryLimit(atlas, currentModel)
 
-	if err != nil && response.StatusCode == http.StatusNotFound {
+	if err != nil && util.StatusNotFound(response) {
 		return handler.ProgressEvent{
 			OperationStatus:  handler.Failed,
 			Message:          DoesntExists,
@@ -157,7 +158,7 @@ func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler
 	if peErr != nil {
 		return *peErr, nil
 	}
-	_, response, err := client.Atlas20231115014.DataFederationApi.DeleteOneDataFederationInstanceQueryLimit(
+	response, err := client.AtlasSDK.DataFederationApi.DeleteDataFederationLimit(
 		context.Background(),
 		*currentModel.ProjectId,
 		*currentModel.TenantName,
@@ -191,7 +192,7 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 	if peErr != nil {
 		return *peErr, nil
 	}
-	listQueryLimitsAPIResult, response, err := client.Atlas20231115014.DataFederationApi.ReturnFederatedDatabaseQueryLimits(
+	listQueryLimitsAPIResult, response, err := client.AtlasSDK.DataFederationApi.ListDataFederationLimits(
 		context.Background(),
 		*currentModel.ProjectId,
 		*currentModel.TenantName,
@@ -220,7 +221,7 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 func handleError(response *http.Response, method string, err error) (handler.ProgressEvent, error) {
 	errMsg := fmt.Sprintf("%s error:%s", method, err.Error())
 	_, _ = logger.Warn(errMsg)
-	if response.StatusCode == http.StatusConflict {
+	if util.StatusConflict(response) {
 		return handler.ProgressEvent{
 			OperationStatus:  handler.Failed,
 			Message:          errMsg,
@@ -229,8 +230,8 @@ func handleError(response *http.Response, method string, err error) (handler.Pro
 	return progress_events.GetFailedEventByResponse(errMsg, response), nil
 }
 
-func getFederatedQueryLimit(client *util.MongoDBClient, currentModel *Model) (*admin20231115014.DataFederationTenantQueryLimit, *http.Response, error) {
-	getQueryLimitAPIRequest := client.Atlas20231115014.DataFederationApi.ReturnFederatedDatabaseQueryLimit(
+func getFederatedQueryLimit(client *util.MongoDBClient, currentModel *Model) (*admin.DataFederationTenantQueryLimit, *http.Response, error) {
+	getQueryLimitAPIRequest := client.AtlasSDK.DataFederationApi.GetDataFederationLimit(
 		context.Background(),
 		*currentModel.ProjectId,
 		*currentModel.TenantName,
@@ -242,7 +243,7 @@ func getFederatedQueryLimit(client *util.MongoDBClient, currentModel *Model) (*a
 
 func createOrUpdateQueryLimit(currentModel *Model, client *util.MongoDBClient, method string) (handler.ProgressEvent, error) {
 	queryLimitInput := currentModel.setQueryLimit()
-	queryLimit, response, err := client.Atlas20231115014.DataFederationApi.CreateOneDataFederationQueryLimit(
+	queryLimit, response, err := client.AtlasSDK.DataFederationApi.SetDataFederationLimit(
 		context.Background(),
 		*currentModel.ProjectId,
 		*currentModel.TenantName,
@@ -262,22 +263,24 @@ func createOrUpdateQueryLimit(currentModel *Model, client *util.MongoDBClient, m
 		ResourceModel:   currentModel}, nil
 }
 
-func (model *Model) setQueryLimit() *admin20231115014.DataFederationTenantQueryLimit {
-	queryLimit := &admin20231115014.DataFederationTenantQueryLimit{
+func (model *Model) setQueryLimit() *admin.DataFederationTenantQueryLimit {
+	queryLimit := &admin.DataFederationTenantQueryLimit{
 		OverrunPolicy: model.OverrunPolicy,
 	}
 	if model.Value != nil {
 		queryLimit.Value = cast.ToInt64(*model.Value)
 	}
 	return queryLimit
 }
-func (model *Model) getQueryLimit(atlasQueryLimit *admin20231115014.DataFederationTenantQueryLimit) *Model {
+func (model *Model) getQueryLimit(atlasQueryLimit *admin.DataFederationTenantQueryLimit) *Model {
 	if atlasQueryLimit == nil {
 		return nil
 	}
 
 	model.TenantName = atlasQueryLimit.TenantName
-	model.OverrunPolicy = atlasQueryLimit.OverrunPolicy
+	if atlasQueryLimit.OverrunPolicy != nil {
+		model.OverrunPolicy = atlasQueryLimit.OverrunPolicy
+	}
 	model.LimitName = &atlasQueryLimit.Name
 	if atlasQueryLimit.CurrentUsage != nil {
 		currentUsage := cast.ToString(atlasQueryLimit.CurrentUsage)

cfn-resources/federated-query-limit/docs/README.md

@@ -77,7 +77,7 @@ _Update requires_: [Replacement](https://docs.aws.amazon.com/AWSCloudFormation/l
 
 #### OverrunPolicy
 
-Only used for Data Federation limits. Action to take when the usage limit is exceeded. If limit span is set to QUERY, this is ignored because MongoDB Cloud stops the query when it exceeds the usage limit. "enum" : [ "BLOCK", "BLOCK_AND_KILL" ]
+Action to take when the usage limit is exceeded. If limit span is set to QUERY, this is ignored because MongoDB Cloud stops the query when it exceeds the usage limit.
 
 _Required_: No
 
@@ -117,10 +117,6 @@ For more information about using the `Fn::GetAtt` intrinsic function, see [Fn::G
 
 Amount that indicates the current usage of the limit.
 
-#### DefaultLimit
-
-Default value of the limit.
-
 #### LastModifiedDate
 
 Only used for Data Federation limits. Timestamp that indicates when this usage limit was last modified. This field uses the ISO 8601 timestamp format in UTC.

cfn-resources/federated-query-limit/mongodb-atlas-federatedquerylimit.json

@@ -43,7 +43,7 @@
     },
     "OverrunPolicy": {
       "type": "string",
-      "description": "Only used for Data Federation limits. Action to take when the usage limit is exceeded. If limit span is set to QUERY, this is ignored because MongoDB Cloud stops the query when it exceeds the usage limit. \"enum\" : [ \"BLOCK\", \"BLOCK_AND_KILL\" ]"
+      "description": "Action to take when the usage limit is exceeded. If limit span is set to QUERY, this is ignored because MongoDB Cloud stops the query when it exceeds the usage limit."
     },
     "Value": {
       "type": "string",

cfn-resources/federated-query-limit/test/README.md

@@ -0,0 +1,40 @@
+# MongoDB::Atlas::FederatedQueryLimit
+
+## Prerequisites 
+### Resources needed to run the manual QA
+All resources are created as part of `cfn-testing-helper.sh`:
+
+- Atlas Project
+- Federated Database Instance (Tenant)
+
+## Manual QA
+Please follow the steps in [TESTING.md](../../../TESTING.md).
+
+
+### Success criteria when testing the resource
+1. Ensure general [CFN resource success criteria](../../../TESTING.md#success-criteria-when-testing-the-resource) for this resource is met.
+
+## Important Links
+- [API Documentation](https://www.mongodb.com/docs/api/doc/atlas-admin-api-v2/group/endpoint-data-federation)
+
+## Unit Testing Locally
+
+The local tests are integrated with the AWS `sam local` and `cfn invoke` tooling features:
+
+```
+sam local start-lambda --skip-pull-image
+```
+then in another shell:
+```bash
+repo_root=$(git rev-parse --show-toplevel)
+source <(${repo_root}/quickstart-mongodb-atlas/scripts/export-mongocli-config.py)
+cd ${repo_root}/cfn-resources/federated-query-limit
+./test/cfn-test-create-inputs.sh YourProjectName YourTenantName > test.request.json 
+echo "Sample request:"
+cat test.request.json
+cfn invoke resource CREATE test.request.json 
+cfn invoke resource DELETE test.request.json 
+cd -
+```
+
+Both CREATE & DELETE tests must pass.

cfn-resources/federated-query-limit/test/cfn-test-create-inputs.sh

@@ -56,3 +56,15 @@ jq --arg projectId "${projectId}" \
 	--arg profile "$profile" \
 	'.Profile?|=$profile |.ProjectId?|=$projectId | .TenantName?|=$tenantName' \
 	"$(dirname "$0")/inputs_1_update.template.json" >"inputs/inputs_1_update.json"
+
+jq --arg projectId "${projectId}" \
+	--arg tenantName "${tenantName}" \
+	--arg profile "$profile" \
+	'.Profile?|=$profile |.ProjectId?|=$projectId | .TenantName?|=$tenantName' \
+	"$(dirname "$0")/inputs_2_create.template.json" >"inputs/inputs_2_create.json"
+
+jq --arg projectId "${projectId}" \
+	--arg tenantName "${tenantName}" \
+	--arg profile "$profile" \
+	'.Profile?|=$profile |.ProjectId?|=$projectId | .TenantName?|=$tenantName' \
+	"$(dirname "$0")/inputs_2_update.template.json" >"inputs/inputs_2_update.json"

cfn-resources/federated-query-limit/test/inputs_1_create.template.json

@@ -2,6 +2,7 @@
   "ProjectId": "",
   "TenantName":"",
   "LimitName": "bytesProcessed.query",
+  "OverrunPolicy": "BLOCK",
   "Value": "2000000000",
   "Profile": "default"
 }

cfn-resources/federated-query-limit/test/inputs_1_update.template.json

@@ -2,6 +2,7 @@
   "ProjectId": "",
   "TenantName":"",
   "LimitName": "bytesProcessed.query",
+  "OverrunPolicy": "BLOCK_AND_KILL",
   "Value": "3000000000",
   "Profile": "default"
 }

cfn-resources/federated-query-limit/test/inputs_2_create.template.json

@@ -0,0 +1,8 @@
+{
+  "ProjectId": "",
+  "TenantName":"",
+  "LimitName": "bytesProcessed.query",
+  "Value": "2000000000",
+  "Profile": "default"
+}
+

cfn-resources/federated-query-limit/test/inputs_2_update.template.json

@@ -0,0 +1,8 @@
+{
+  "ProjectId": "",
+  "TenantName":"",
+  "LimitName": "bytesProcessed.query",
+  "Value": "3000000000",
+  "Profile": "default"
+}
+