From 42f54810e04f57019532b4247c39f60931c02e57 Mon Sep 17 00:00:00 2001
From: Manuel Pedrozo <manuel.pedrozo@mongodb.com>
Date: Wed, 3 Dec 2025 12:02:25 +0100
Subject: [PATCH 1/3] Use timestamp instead of random number for test resource
 names to avoid duplicates

---
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../api-key/test/contract-testing/cfn-test-create-inputs.sh | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 cfn-resources/flex-cluster/test/cfn-test-create-inputs.sh   | 2 +-
 .../flex-cluster/test/contract-testing/cfn-test-create.sh   | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 6 +++---
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../project/test/contract-testing/cfn-test-create-inputs.sh | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh         | 6 +++---
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 cfn-resources/search-index/test/cfn-test-create-inputs.sh   | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../stream-connection/test/cfn-test-create-inputs.sh        | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 .../stream-instance/test/cfn-test-create-inputs.sh          | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh         | 4 ++--
 cfn-resources/trigger/test/cfn-test-create-inputs.sh        | 2 +-
 25 files changed, 45 insertions(+), 45 deletions(-)

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..f8dc7217e 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)"
 
-./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..3642ec437 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)"
 
-./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..e02d320d7 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)"
 
-./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..3d3ee028e 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)"
 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..a3ee0416d 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)"
 
-./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..707657dfc 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)"
 
-./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..c18866ac8 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)"
 # 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..2a72e35a4 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)"
 
-./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..9e7803e9e 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)"
 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..21611da33 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)"
 
 # 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..42d372077 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)"
 
-./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..995ff0b12 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)"
 
 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..f1025caa9 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)"
 
-./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..f1025caa9 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)"
 
-./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..34af53c82 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)"
 
-./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..ecb0585f0 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)"
 
 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..9462dc870 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)"
 
-./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..65017b488 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)"
 
-./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..7250ba820 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)"
 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..425ba8caa 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)"
 
-./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..4339b2a76 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)"
 cloudProvider="AWS"
-clusterName="cluster-$RANDOM"
+clusterName="cluster-$(date +%s)"
 
 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..d3f765a23 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)"
 
-./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..d1c602607 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)"
 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..a2c774897 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)"
 
-./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..0e2520a22 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)"
 func_name="${5:-$FUNC_NAME}"
 func_id="${6:-$FUNC_ID}"
 service_id="${7:-$SERVICE_ID}"

From b7688b9373ab2b6745172e983a238196c1b7f12e Mon Sep 17 00:00:00 2001
From: Manuel Pedrozo <manuel.pedrozo@mongodb.com>
Date: Thu, 4 Dec 2025 10:14:10 +0100
Subject: [PATCH 2/3] Use milliseconds

---
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../api-key/test/contract-testing/cfn-test-create-inputs.sh   | 2 +-
 .../auditing/test/contract-testing/cfn-test-create-inputs.sh  | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 cfn-resources/flex-cluster/test/cfn-test-create-inputs.sh     | 2 +-
 .../flex-cluster/test/contract-testing/cfn-test-create.sh     | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../project/test/contract-testing/cfn-test-create-inputs.sh   | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 cfn-resources/search-index/test/cfn-test-create-inputs.sh     | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../stream-connection/test/cfn-test-create-inputs.sh          | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 cfn-resources/stream-instance/test/cfn-test-create-inputs.sh  | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 cfn-resources/trigger/test/cfn-test-create-inputs.sh          | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)

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 f8dc7217e..0fad6da9e 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-$(date +%s)"
+projectName="cfn-bot-access-list-$(date +%s%3N)"
 
 ./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 3642ec437..8a7401bfa 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-$(date +%s)"
+projectName="ct-alert-config-$(date +%s%3N)"
 
 ./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 e02d320d7..767f62593 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-$(date +%s)"
+projectName="cfn-bot-apikey-test-$(date +%s%3N)"
 
 ./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 3d3ee028e..19e8077e2 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-$(date +%s)"
+project_name="Project-$(date +%s%3N)"
 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 a3ee0416d..0c7b380d4 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-$(date +%s)"
+projectName="ct-cloud-backup-restore-jobs-$(date +%s%3N)"
 
 ./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 707657dfc..aedfffa86 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-$(date +%s)"
+projectName="cluster-outage-simulation-$(date +%s%3N)"
 
 ./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 c18866ac8..313fad828 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-$(date +%s)"
+projectName="ct-federated-db-instance-$(date +%s%3N)"
 # trigger create inputs for the cfn test
 ./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 2a72e35a4..b5524ed6d 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-$(date +%s)"
+projectName="ct-federated-query-limit-$(date +%s%3N)"
 
 ./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 9e7803e9e..4616ac79b 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-$(date +%s)"
+clusterName="cfn-test-bot-$(date +%s%3N)"
 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 21611da33..af874777a 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-$(date +%s)"
+projectName="cfn-test-bot-$(date +%s%3N)"
 
 # 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 42d372077..ce4955bb3 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-$(date +%s)"
+projectName="ct-online-archive-$(date +%s%3N)"
 
 ./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 995ff0b12..bd93199c5 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
@@ -9,7 +9,7 @@ set -o nounset
 set -o pipefail
 
 # setting orgName
-orgName="cfn-bot-org-test-$(date +%s)"
+orgName="cfn-bot-org-test-$(date +%s%3N)"
 
 if [ -z ${MONGODB_ATLAS_PROFILE+x} ]; then
 	echo "MONGODB_ATLAS_PROFILE is not set, exiting..."
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 f1025caa9..8c1b877bd 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-$(date +%s)"
+projectName="ct-private-endpoint-$(date +%s%3N)"
 
 ./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 f1025caa9..8c1b877bd 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-$(date +%s)"
+projectName="ct-private-endpoint-$(date +%s%3N)"
 
 ./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 34af53c82..549e17b00 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-$(date +%s)"
+projectName="pes-online-archive-$(date +%s%3N)"
 
 ./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 ecb0585f0..e637f5d6a 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-$(date +%s)"
+project_name="Project-$(date +%s%3N)"
 
 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 9462dc870..3eb738eeb 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
@@ -10,6 +10,6 @@ set -o nounset
 set -o pipefail
 
 # setting policyName
-policyName="ct-resource-policy-$(date +%s)"
+policyName="ct-resource-policy-$(date +%s%3N)"
 
 ./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 65017b488..2fe502abc 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-$(date +%s)"
+projectName="ct-search-deployment-$(date +%s%3N)"
 
 ./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 7250ba820..87cfaf856 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-$(date +%s)"
+index_name="search-$(date +%s%3N)"
 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 425ba8caa..7861e71ab 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-$(date +%s)"
+projectName="ct-private-endpoint-serverless-$(date +%s%3N)"
 
 ./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 4339b2a76..93604e65a 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-$(date +%s)"
+instanceName="stream-instance-$(date +%s%3N)"
 cloudProvider="AWS"
-clusterName="cluster-$(date +%s)"
+clusterName="cluster-$(date +%s%3N)"
 
 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 d3f765a23..f922f2285 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-$(date +%s)"
+projectName="cfn-stream-conn-$(date +%s%3N)"
 
 ./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 d1c602607..b714179a3 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-$(date +%s)"
+streamInstanceName="stream-$(date +%s%3N)"
 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 a2c774897..f7e58599e 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-$(date +%s)"
+projectName="stream-instance-$(date +%s%3N)"
 
 ./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 0e2520a22..a0b360826 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-$(date +%s)"
+trigger_name="cfn-test-trigger-$(date +%s%3N)"
 func_name="${5:-$FUNC_NAME}"
 func_id="${6:-$FUNC_ID}"
 service_id="${7:-$SERVICE_ID}"

From 600fea9cdca706f7e3a2fbe231332fe15a25f3b3 Mon Sep 17 00:00:00 2001
From: Manuel Pedrozo <manuel.pedrozo@mongodb.com>
Date: Thu, 4 Dec 2025 11:19:50 +0100
Subject: [PATCH 3/3] Use seconds + random

---
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../api-key/test/contract-testing/cfn-test-create-inputs.sh   | 2 +-
 .../auditing/test/contract-testing/cfn-test-create-inputs.sh  | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 cfn-resources/flex-cluster/test/cfn-test-create-inputs.sh     | 2 +-
 .../flex-cluster/test/contract-testing/cfn-test-create.sh     | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../project/test/contract-testing/cfn-test-create-inputs.sh   | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 cfn-resources/search-index/test/cfn-test-create-inputs.sh     | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 .../stream-connection/test/cfn-test-create-inputs.sh          | 4 ++--
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 cfn-resources/stream-instance/test/cfn-test-create-inputs.sh  | 2 +-
 .../test/contract-testing/cfn-test-create-inputs.sh           | 2 +-
 cfn-resources/trigger/test/cfn-test-create-inputs.sh          | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)

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 0fad6da9e..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-$(date +%s%3N)"
+projectName="cfn-bot-access-list-$(date +%s)-$RANDOM"
 
 ./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 8a7401bfa..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-$(date +%s%3N)"
+projectName="ct-alert-config-$(date +%s)-$RANDOM"
 
 ./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 767f62593..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-$(date +%s%3N)"
+projectName="cfn-bot-apikey-test-$(date +%s)-$RANDOM"
 
 ./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 19e8077e2..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-$(date +%s%3N)"
+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 0c7b380d4..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-$(date +%s%3N)"
+projectName="ct-cloud-backup-restore-jobs-$(date +%s)-$RANDOM"
 
 ./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 aedfffa86..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-$(date +%s%3N)"
+projectName="cluster-outage-simulation-$(date +%s)-$RANDOM"
 
 ./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 313fad828..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-$(date +%s%3N)"
+projectName="ct-federated-db-instance-$(date +%s)-$RANDOM"
 # trigger create inputs for the cfn test
 ./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 b5524ed6d..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-$(date +%s%3N)"
+projectName="ct-federated-query-limit-$(date +%s)-$RANDOM"
 
 ./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 4616ac79b..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-$(date +%s%3N)"
+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 af874777a..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-$(date +%s%3N)"
+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 ce4955bb3..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-$(date +%s%3N)"
+projectName="ct-online-archive-$(date +%s)-$RANDOM"
 
 ./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 bd93199c5..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
@@ -9,7 +9,7 @@ set -o nounset
 set -o pipefail
 
 # setting orgName
-orgName="cfn-bot-org-test-$(date +%s%3N)"
+orgName="cfn-bot-org-test-$(date +%s)-$RANDOM"
 
 if [ -z ${MONGODB_ATLAS_PROFILE+x} ]; then
 	echo "MONGODB_ATLAS_PROFILE is not set, exiting..."
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 8c1b877bd..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-$(date +%s%3N)"
+projectName="ct-private-endpoint-$(date +%s)-$RANDOM"
 
 ./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 8c1b877bd..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-$(date +%s%3N)"
+projectName="ct-private-endpoint-$(date +%s)-$RANDOM"
 
 ./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 549e17b00..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-$(date +%s%3N)"
+projectName="pes-online-archive-$(date +%s)-$RANDOM"
 
 ./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 e637f5d6a..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-$(date +%s%3N)"
+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 3eb738eeb..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
@@ -10,6 +10,6 @@ set -o nounset
 set -o pipefail
 
 # setting policyName
-policyName="ct-resource-policy-$(date +%s%3N)"
+policyName="ct-resource-policy-$(date +%s)-$RANDOM"
 
 ./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 2fe502abc..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-$(date +%s%3N)"
+projectName="ct-search-deployment-$(date +%s)-$RANDOM"
 
 ./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 87cfaf856..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-$(date +%s%3N)"
+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 7861e71ab..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-$(date +%s%3N)"
+projectName="ct-private-endpoint-serverless-$(date +%s)-$RANDOM"
 
 ./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 93604e65a..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-$(date +%s%3N)"
+instanceName="stream-instance-$(date +%s)-$RANDOM"
 cloudProvider="AWS"
-clusterName="cluster-$(date +%s%3N)"
+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 f922f2285..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-$(date +%s%3N)"
+projectName="cfn-stream-conn-$(date +%s)-$RANDOM"
 
 ./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 b714179a3..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-$(date +%s%3N)"
+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 f7e58599e..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-$(date +%s%3N)"
+projectName="stream-instance-$(date +%s)-$RANDOM"
 
 ./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 a0b360826..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-$(date +%s%3N)"
+trigger_name="cfn-test-trigger-$(date +%s)-$RANDOM"
 func_name="${5:-$FUNC_NAME}"
 func_id="${6:-$FUNC_ID}"
 service_id="${7:-$SERVICE_ID}"