diff --git a/cfn-resources/access-list-api-key/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/access-list-api-key/test/contract-testing/cfn-test-create-inputs.sh index 575803856..cf3628008 100755 --- a/cfn-resources/access-list-api-key/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/access-list-api-key/test/contract-testing/cfn-test-create-inputs.sh @@ -15,6 +15,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="cfn-bot-access-list-$((1 + RANDOM % 10000))" +projectName="cfn-bot-access-list-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/alert-configuration/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/alert-configuration/test/contract-testing/cfn-test-create-inputs.sh index 27047320a..32dfc51e0 100755 --- a/cfn-resources/alert-configuration/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/alert-configuration/test/contract-testing/cfn-test-create-inputs.sh @@ -10,6 +10,6 @@ set -o nounset set -o pipefail # setting projectName -projectName="ct-alert-config-$((1 + RANDOM % 10000))" +projectName="ct-alert-config-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/api-key/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/api-key/test/contract-testing/cfn-test-create-inputs.sh index e5800dad4..41ab826fc 100755 --- a/cfn-resources/api-key/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/api-key/test/contract-testing/cfn-test-create-inputs.sh @@ -9,6 +9,6 @@ set -o nounset set -o pipefail # setting projectName -projectName="cfn-bot-apikey-test-$((1 + RANDOM % 10000))" +projectName="cfn-bot-apikey-test-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/auditing/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/auditing/test/contract-testing/cfn-test-create-inputs.sh index 6c1687f39..87dcc8d97 100755 --- a/cfn-resources/auditing/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/auditing/test/contract-testing/cfn-test-create-inputs.sh @@ -32,7 +32,7 @@ fi org_id="${MONGODB_ATLAS_ORG_ID}" profile="${MONGODB_ATLAS_PROFILE}" -project_name="Project-$((1 + RANDOM % 10000))" +project_name="Project-$(date +%s)-$RANDOM" projectId=$(atlas projects create "${project_name}" --orgId "${org_id}" --output json | jq -r '.id') rm -rf "inputs" && mkdir "inputs" diff --git a/cfn-resources/cloud-backup-restore-jobs/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/cloud-backup-restore-jobs/test/contract-testing/cfn-test-create-inputs.sh index f4aebb411..0cac1cc2c 100755 --- a/cfn-resources/cloud-backup-restore-jobs/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/cloud-backup-restore-jobs/test/contract-testing/cfn-test-create-inputs.sh @@ -10,6 +10,6 @@ set -o nounset set -o pipefail # setting projectName -projectName="ct-cloud-backup-restore-jobs-$((1 + RANDOM % 10000))" +projectName="ct-cloud-backup-restore-jobs-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/cluster-outage-simulation/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/cluster-outage-simulation/test/contract-testing/cfn-test-create-inputs.sh index 162b1b794..4bab768a8 100755 --- a/cfn-resources/cluster-outage-simulation/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/cluster-outage-simulation/test/contract-testing/cfn-test-create-inputs.sh @@ -15,6 +15,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="cluster-outage-simulation-limit-$((1 + RANDOM % 10000))" +projectName="cluster-outage-simulation-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/federated-database-instance/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/federated-database-instance/test/contract-testing/cfn-test-create-inputs.sh index 263a3b0f4..acac6c8bf 100755 --- a/cfn-resources/federated-database-instance/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/federated-database-instance/test/contract-testing/cfn-test-create-inputs.sh @@ -31,6 +31,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="ct-federated-db-instance-$((1 + RANDOM % 10000))" +projectName="ct-federated-db-instance-$(date +%s)-$RANDOM" # trigger create inputs for the cfn test -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/federated-query-limit/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/federated-query-limit/test/contract-testing/cfn-test-create-inputs.sh index 598cd8e1d..c7ebf531c 100755 --- a/cfn-resources/federated-query-limit/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/federated-query-limit/test/contract-testing/cfn-test-create-inputs.sh @@ -15,6 +15,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="ct-federated-query-limit-$((1 + RANDOM % 10000))" +projectName="ct-federated-query-limit-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/flex-cluster/test/cfn-test-create-inputs.sh b/cfn-resources/flex-cluster/test/cfn-test-create-inputs.sh index a74224134..787ab875f 100755 --- a/cfn-resources/flex-cluster/test/cfn-test-create-inputs.sh +++ b/cfn-resources/flex-cluster/test/cfn-test-create-inputs.sh @@ -36,7 +36,7 @@ else echo -e "FOUND project \"${projectName}\" with id: ${projectId}\n" fi -clusterName="cfn-test-bot-$((1 + RANDOM % 10000))" +clusterName="cfn-test-bot-$(date +%s)-$RANDOM" echo "clusterName: $clusterName" WORDTOREMOVE="template." diff --git a/cfn-resources/flex-cluster/test/contract-testing/cfn-test-create.sh b/cfn-resources/flex-cluster/test/contract-testing/cfn-test-create.sh index 601dea3d7..4b795316e 100755 --- a/cfn-resources/flex-cluster/test/contract-testing/cfn-test-create.sh +++ b/cfn-resources/flex-cluster/test/contract-testing/cfn-test-create.sh @@ -5,7 +5,7 @@ set -o errexit set -o nounset set -o pipefail -projectName="cfn-test-bot-$((1 + RANDOM % 10000))" +projectName="cfn-test-bot-$(date +%s)-$RANDOM" # create project projectId=$(atlas projects create "${projectName}" --output=json | jq -r '.id') diff --git a/cfn-resources/online-archive/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/online-archive/test/contract-testing/cfn-test-create-inputs.sh index 96b5dd4c3..f8c69774b 100755 --- a/cfn-resources/online-archive/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/online-archive/test/contract-testing/cfn-test-create-inputs.sh @@ -15,6 +15,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="ct-online-archive-$((1 + RANDOM % 10000))" +projectName="ct-online-archive-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/organization/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/organization/test/contract-testing/cfn-test-create-inputs.sh index 058d4c538..21d33e255 100755 --- a/cfn-resources/organization/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/organization/test/contract-testing/cfn-test-create-inputs.sh @@ -8,12 +8,12 @@ set -o errexit set -o nounset set -o pipefail -# setting projectName -orgName="cfn-bot-org-test-$((1 + RANDOM % 1000))" +# setting orgName +orgName="cfn-bot-org-test-$(date +%s)-$RANDOM" if [ -z ${MONGODB_ATLAS_PROFILE+x} ]; then echo "MONGODB_ATLAS_PROFILE is not set, exiting..." exit 1 fi -./test/cfn-test-create-inputs.sh $orgName +./test/cfn-test-create-inputs.sh "$orgName" diff --git a/cfn-resources/private-endpoint-aws/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/private-endpoint-aws/test/contract-testing/cfn-test-create-inputs.sh index dd76f3a92..b06a5baa7 100755 --- a/cfn-resources/private-endpoint-aws/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/private-endpoint-aws/test/contract-testing/cfn-test-create-inputs.sh @@ -16,6 +16,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ];then fi # setting projectName -projectName="ct-private-endpoint-$((1 + RANDOM % 10000))" +projectName="ct-private-endpoint-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName \ No newline at end of file +./test/cfn-test-create-inputs.sh "$projectName" \ No newline at end of file diff --git a/cfn-resources/private-endpoint-service/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/private-endpoint-service/test/contract-testing/cfn-test-create-inputs.sh index dd76f3a92..b06a5baa7 100755 --- a/cfn-resources/private-endpoint-service/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/private-endpoint-service/test/contract-testing/cfn-test-create-inputs.sh @@ -16,6 +16,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ];then fi # setting projectName -projectName="ct-private-endpoint-$((1 + RANDOM % 10000))" +projectName="ct-private-endpoint-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName \ No newline at end of file +./test/cfn-test-create-inputs.sh "$projectName" \ No newline at end of file diff --git a/cfn-resources/privatelink-endpoint-service-data-federation-online-archive/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/privatelink-endpoint-service-data-federation-online-archive/test/contract-testing/cfn-test-create-inputs.sh index e226d93d7..074e98088 100755 --- a/cfn-resources/privatelink-endpoint-service-data-federation-online-archive/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/privatelink-endpoint-service-data-federation-online-archive/test/contract-testing/cfn-test-create-inputs.sh @@ -14,6 +14,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="pes-online-archive-$((1 + RANDOM % 10000))" +projectName="pes-online-archive-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/project/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/project/test/contract-testing/cfn-test-create-inputs.sh index 2334e6e41..fe5940f63 100755 --- a/cfn-resources/project/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/project/test/contract-testing/cfn-test-create-inputs.sh @@ -32,7 +32,7 @@ fi org_id="${MONGODB_ATLAS_ORG_ID}" team_id="${MONGODB_ATLAS_TEAM_ID}" profile="${MONGODB_ATLAS_PROFILE}" -project_name="Project-$((1 + RANDOM % 10000))" +project_name="Project-$(date +%s)-$RANDOM" if [ -z "${MONGODB_ATLAS_ORG_API_KEY_ID+x}" ]; then api_key_id=$(atlas organizations apikeys create --desc "Created as part of the contract testing: ${project_name}" --role ORG_MEMBER --output json | jq -r '.id') diff --git a/cfn-resources/resource-policy/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/resource-policy/test/contract-testing/cfn-test-create-inputs.sh index 333f3184c..253163f35 100755 --- a/cfn-resources/resource-policy/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/resource-policy/test/contract-testing/cfn-test-create-inputs.sh @@ -9,7 +9,7 @@ set -o errexit set -o nounset set -o pipefail -# setting projectName -policyName="ct-resource-policy-$((1 + RANDOM % 10000))" +# setting policyName +policyName="ct-resource-policy-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $policyName +./test/cfn-test-create-inputs.sh "$policyName" diff --git a/cfn-resources/search-deployment/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/search-deployment/test/contract-testing/cfn-test-create-inputs.sh index f2e2ed4b8..64d27e598 100755 --- a/cfn-resources/search-deployment/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/search-deployment/test/contract-testing/cfn-test-create-inputs.sh @@ -10,6 +10,6 @@ set -o nounset set -o pipefail # setting projectName -projectName="ct-search-deployment-$((1 + RANDOM % 10000))" +projectName="ct-search-deployment-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/search-index/test/cfn-test-create-inputs.sh b/cfn-resources/search-index/test/cfn-test-create-inputs.sh index d87a13efa..4fe72b7a0 100755 --- a/cfn-resources/search-index/test/cfn-test-create-inputs.sh +++ b/cfn-resources/search-index/test/cfn-test-create-inputs.sh @@ -43,7 +43,7 @@ fi cluster_name=${ClusterName} db_name="${4:-sample_airbnb}" coll_name="${5:-listingsAndReviews}" -index_name="search-$RANDOM" +index_name="search-$(date +%s)-$RANDOM" u_index_name="${index_name}" WORDTOREMOVE="template." cd "$(dirname "$0")" || exit diff --git a/cfn-resources/serverless-private-endpoint/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/serverless-private-endpoint/test/contract-testing/cfn-test-create-inputs.sh index f1fb3b4ac..e82518b6e 100755 --- a/cfn-resources/serverless-private-endpoint/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/serverless-private-endpoint/test/contract-testing/cfn-test-create-inputs.sh @@ -15,6 +15,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="ct-private-endpoint-serverless-$((1 + RANDOM % 10000))" +projectName="ct-private-endpoint-serverless-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/stream-connection/test/cfn-test-create-inputs.sh b/cfn-resources/stream-connection/test/cfn-test-create-inputs.sh index 078758377..c64cf16aa 100755 --- a/cfn-resources/stream-connection/test/cfn-test-create-inputs.sh +++ b/cfn-resources/stream-connection/test/cfn-test-create-inputs.sh @@ -28,9 +28,9 @@ else fi echo -e "=====\nrun this command to clean up\n=====\nmongocli iam projects delete ${projectId} --force\n=====" -instanceName="stream-instance-$RANDOM" +instanceName="stream-instance-$(date +%s)-$RANDOM" cloudProvider="AWS" -clusterName="cluster-$RANDOM" +clusterName="cluster-$(date +%s)-$RANDOM" atlas streams instances create "${instanceName}" --projectId "${projectId}" --region VIRGINIA_USA --provider ${cloudProvider} echo -e "Created StreamInstance \"${instanceName}\"" diff --git a/cfn-resources/stream-connection/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/stream-connection/test/contract-testing/cfn-test-create-inputs.sh index 8aad4260f..eb16a88c9 100755 --- a/cfn-resources/stream-connection/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/stream-connection/test/contract-testing/cfn-test-create-inputs.sh @@ -14,6 +14,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="cfn-stream-conn-$((1 + RANDOM % 10000))" +projectName="cfn-stream-conn-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/stream-instance/test/cfn-test-create-inputs.sh b/cfn-resources/stream-instance/test/cfn-test-create-inputs.sh index d36dc8abf..4a62541b9 100755 --- a/cfn-resources/stream-instance/test/cfn-test-create-inputs.sh +++ b/cfn-resources/stream-instance/test/cfn-test-create-inputs.sh @@ -27,7 +27,7 @@ else echo -e "FOUND project \"${projectName}\" with id: ${projectId}\n" fi -streamInstanceName="stream-$RANDOM" +streamInstanceName="stream-$(date +%s)-$RANDOM" cloudProvider="AWS" region="VIRGINIA_USA" tier="SP30" diff --git a/cfn-resources/stream-instance/test/contract-testing/cfn-test-create-inputs.sh b/cfn-resources/stream-instance/test/contract-testing/cfn-test-create-inputs.sh index 6bed4d8dd..83e21a0fc 100755 --- a/cfn-resources/stream-instance/test/contract-testing/cfn-test-create-inputs.sh +++ b/cfn-resources/stream-instance/test/contract-testing/cfn-test-create-inputs.sh @@ -16,6 +16,6 @@ if [ -z "${AWS_DEFAULT_REGION+x}" ]; then fi # setting projectName -projectName="stream-instance-$((1 + RANDOM % 10000))" +projectName="stream-instance-$(date +%s)-$RANDOM" -./test/cfn-test-create-inputs.sh $projectName +./test/cfn-test-create-inputs.sh "$projectName" diff --git a/cfn-resources/trigger/test/cfn-test-create-inputs.sh b/cfn-resources/trigger/test/cfn-test-create-inputs.sh index 5f037607e..441d39d8c 100755 --- a/cfn-resources/trigger/test/cfn-test-create-inputs.sh +++ b/cfn-resources/trigger/test/cfn-test-create-inputs.sh @@ -39,7 +39,7 @@ mkdir inputs project_Id="${2:-$PROJECT_ID}" db_name="${3:-$DB_NAME}" coll_name="${4:-$COLLECTION_NAME}" -trigger_name="cfn-test-trigger-${RANDOM}" +trigger_name="cfn-test-trigger-$(date +%s)-$RANDOM" func_name="${5:-$FUNC_NAME}" func_id="${6:-$FUNC_ID}" service_id="${7:-$SERVICE_ID}"