feat: CLOUDP-380110: Update input scripts to fix publish error (#1601)

Co-authored-by: Rakhul S Prakash <rakhul.s.prakash@peerislands.io>

Author: rakhul-mongo

cfn-resources/service-account-access-list-entry/test/cfn-test-create-inputs.sh

@@ -9,13 +9,21 @@ set -o nounset
 set -o pipefail
 
 function usage {
-	echo "usage:$0 <org_id>"
+	echo "usage: $0"
+	echo "  Requires MONGODB_ATLAS_ORG_ID environment variable to be set."
 	echo "Generates test input files for service account access list entry"
 	exit 0
 }
 
-if [ "$#" -ne 1 ]; then usage; fi
-if [[ "$*" == help ]]; then usage; fi
+if [[ "${1:-}" == help ]]; then usage; fi
+
+if [ -z "${MONGODB_ATLAS_ORG_ID:-}" ]; then
+	echo "Error: MONGODB_ATLAS_ORG_ID environment variable is not set"
+	exit 1
+fi
+
+orgId="${MONGODB_ATLAS_ORG_ID}"
+echo "OrgId: $orgId"
 
 rm -rf inputs
 mkdir inputs
@@ -27,9 +35,6 @@ if [ ${MONGODB_ATLAS_PROFILE+x} ]; then
 	profile=${MONGODB_ATLAS_PROFILE}
 fi
 
-orgId="${1}"
-echo "OrgId: $orgId"
-
 serviceAccountName="cfn-test-sa-accesslist-$(date +%s)-$RANDOM"
 echo "Creating service account: $serviceAccountName"
 

cfn-resources/service-account-access-list-entry/test/contract-testing/cfn-test-create.sh

@@ -5,12 +5,4 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-if [ -z "${MONGODB_ATLAS_ORG_ID:-}" ]; then
-	echo "Error: MONGODB_ATLAS_ORG_ID environment variable is not set"
-	exit 1
-fi
-
-orgId="${MONGODB_ATLAS_ORG_ID}"
-echo "Using OrgId: $orgId"
-
-./test/cfn-test-create-inputs.sh "$orgId"
+./test/cfn-test-create-inputs.sh

cfn-resources/service-account-secret/test/cfn-test-create-inputs.sh

@@ -9,13 +9,21 @@ set -o nounset
 set -o pipefail
 
 function usage {
-	echo "usage:$0 <org_id>"
+	echo "usage: $0"
+	echo "  Requires MONGODB_ATLAS_ORG_ID environment variable to be set."
 	echo "Generates test input files for service account secret"
 	exit 0
 }
 
-if [ "$#" -ne 1 ]; then usage; fi
-if [[ "$*" == help ]]; then usage; fi
+if [[ "${1:-}" == help ]]; then usage; fi
+
+if [ -z "${MONGODB_ATLAS_ORG_ID:-}" ]; then
+	echo "Error: MONGODB_ATLAS_ORG_ID environment variable is not set"
+	exit 1
+fi
+
+orgId="${MONGODB_ATLAS_ORG_ID}"
+echo "OrgId: $orgId"
 
 rm -rf inputs
 mkdir inputs
@@ -27,9 +35,6 @@ if [ ${MONGODB_ATLAS_PROFILE+x} ]; then
 	profile=${MONGODB_ATLAS_PROFILE}
 fi
 
-orgId="${1}"
-echo "OrgId: $orgId"
-
 # Create a service account for testing using Atlas CLI
 serviceAccountName="cfn-test-sa-$(date +%s)-$RANDOM"
 echo "Creating service account: $serviceAccountName"

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

@@ -5,13 +5,4 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# Get org ID from environment or use default
-if [ -z "${MONGODB_ATLAS_ORG_ID:-}" ]; then
-	echo "Error: MONGODB_ATLAS_ORG_ID environment variable is not set"
-	exit 1
-fi
-
-orgId="${MONGODB_ATLAS_ORG_ID}"
-echo "Using OrgId: $orgId"
-
-./test/cfn-test-create-inputs.sh "$orgId"
+./test/cfn-test-create-inputs.sh

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

@@ -1,26 +1,8 @@
 #!/usr/bin/env bash
 
-# This tool deletes the mongodb resources used for `cfn test` as inputs.
+# This tool deletes the MongoDB resources used for `cfn test` as inputs.
 set -o errexit
 set -o nounset
 set -o pipefail
 
-if [ ! -f ./inputs/inputs_1_create.json ]; then
-	echo "No inputs file found, nothing to clean up"
-	exit 0
-fi
-
-orgId=$(jq -r '.OrgId' ./inputs/inputs_1_create.json)
-clientId=$(jq -r '.ClientId' ./inputs/inputs_1_create.json)
-
-# Delete service account using Atlas CLI (this will also delete all its secrets)
-if atlas api serviceAccounts deleteOrgServiceAccount --orgId "$orgId" --clientId "$clientId" --version "2024-08-05" --output json 2>/dev/null; then
-	echo "Service account $clientId deletion OK"
-else
-	exitCode=$?
-	if [ $exitCode -eq 0 ]; then
-		echo "Service account $clientId deletion OK"
-	else
-		echo "Warning: Failed cleaning service account: $clientId (may already be deleted)"
-	fi
-fi
+./test/cfn-test-delete-inputs.sh