Merge branch 'main' into COMPASS-8451

Author: djechlin-mongodb

.evergreen/functions.yml

@@ -685,8 +685,6 @@ functions:
           DEBUG: ${debug|}
           COMPASS_E2E_ATLAS_CLOUD_SANDBOX_USERNAME: ${e2e_tests_compass_web_atlas_username}
           COMPASS_E2E_ATLAS_CLOUD_SANDBOX_PASSWORD: ${e2e_tests_compass_web_atlas_password}
-          COMPASS_E2E_ATLAS_CLOUD_SANDBOX_DBUSER_USERNAME: ${e2e_tests_compass_web_atlas_db_username}
-          COMPASS_E2E_ATLAS_CLOUD_SANDBOX_DBUSER_PASSWORD: ${e2e_tests_compass_web_atlas_password}
           MCLI_PUBLIC_API_KEY: ${e2e_tests_mcli_public_api_key}
           MCLI_PRIVATE_API_KEY: ${e2e_tests_mcli_private_api_key}
           MCLI_ORG_ID: ${e2e_tests_mcli_org_id}

.evergreen/start-atlas-cloud-cluster.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+RUN_ID="$(date +"%s")-$(git rev-parse --short HEAD)"
+DELETE_AFTER="$(date -u -Iseconds -d '+2 hours' 2>/dev/null || date -u -Iseconds -v '+2H')"
+
 # This script helps to automatically provision Atlas cluster for running the e2e
 # tests against. In CI this will always create a new cluster and delete it when
 # the test run is finished. You can also use this script locally to run e2e
@@ -16,8 +19,8 @@
 #
 # - Setup a new org and project. Save the org id and project id for later.
 #
-# - Create new db user with username / password auth and admin role. This user
-#   will be used to prepopulate dbs with data in tests. Save the credentials.
+# - Add test payment details within the organization (Billing) to be able to
+#   create clusters.
 #
 # - Create a new API key (Access Manager > Project Access > Create Application >
 #   API Key) for the project you created and save the public and private keys.
@@ -38,8 +41,6 @@
 #
 #     COMPASS_E2E_ATLAS_CLOUD_SANDBOX_USERNAME         Cloud user you created
 #     COMPASS_E2E_ATLAS_CLOUD_SANDBOX_PASSWORD         Cloud user password
-#     COMPASS_E2E_ATLAS_CLOUD_SANDBOX_DBUSER_USERNAME  Db user for the project
-#     COMPASS_E2E_ATLAS_CLOUD_SANDBOX_DBUSER_PASSWORD  Db user password
 #
 # - Source the script followed by running the tests to make sure that some
 #   variables exported from this script are available for the test env:
@@ -53,10 +54,13 @@ _ATLAS_CLOUD_TEST_CLUSTER_NAME=${ATLAS_CLOUD_TEST_CLUSTER_NAME:-""}
 # truncate if it's too long) so we're very limited in terms of how unique this
 # name can be. Hopefully the epoch + part of git hash is enough for these to not
 # overlap when tests are running
-DEFAULT_ATLAS_CLOUD_TEST_CLUSTER_NAME="e2e-$(date +"%s")-$(git rev-parse HEAD)"
+DEFAULT_ATLAS_CLOUD_TEST_CLUSTER_NAME="e2e-$RUN_ID"
 
 ATLAS_CLUSTER_NAME="${_ATLAS_CLOUD_TEST_CLUSTER_NAME:-$DEFAULT_ATLAS_CLOUD_TEST_CLUSTER_NAME}"
 
+ATLAS_TEST_DB_USERNAME="testuser-$RUN_ID"
+ATLAS_TEST_DB_PASSWORD="$(head -c 32 /dev/urandom | base64 | tr -dc 'a-zA-Z0-9')"
+
 function atlascli() {
   docker run \
     -e MCLI_PUBLIC_API_KEY \
@@ -79,15 +83,32 @@ cleanup() {
   else
     echo "Custom cluster name provided ($_ATLAS_CLOUD_TEST_CLUSTER_NAME), skipping cluster cleanup"
   fi
+  echo "Deleting Atlas db user \`$ATLAS_TEST_DB_USERNAME\`..."
+  atlascli dbusers delete $ATLAS_TEST_DB_USERNAME --force
 }
 
 trap cleanup EXIT
 
+echo "Allowing access from current ip..."
+atlascli accessList create \
+  --currentIp \
+  --deleteAfter "$DELETE_AFTER"
+
+echo "Creating Atlas db user \`$ATLAS_TEST_DB_USERNAME\`..."
+atlascli dbusers create atlasAdmin \
+  --username "$ATLAS_TEST_DB_USERNAME" \
+  --password "$ATLAS_TEST_DB_PASSWORD" \
+  --deleteAfter "$DELETE_AFTER" # so that it's autoremoved if cleaning up failed for some reason
+
+export COMPASS_E2E_ATLAS_CLOUD_SANDBOX_DBUSER_USERNAME="$ATLAS_TEST_DB_USERNAME"
+export COMPASS_E2E_ATLAS_CLOUD_SANDBOX_DBUSER_PASSWORD="$ATLAS_TEST_DB_PASSWORD"
+
 echo "Creating Atlas deployment \`$ATLAS_CLUSTER_NAME\` to test against..."
-atlascli clusters create $ATLAS_CLUSTER_NAME \
+(atlascli clusters create $ATLAS_CLUSTER_NAME \
   --provider AWS \
   --region US_EAST_1 \
-  --tier M10
+  --tier M10 \
+  --type GEOSHARDED || true) # can error if custom name was provided, will fail on next step if it's not expected failure
 
 echo "Waiting for the deployment to be provisioned..."
 atlascli clusters watch $ATLAS_CLUSTER_NAME

.github/workflows/check-pr-title.yml

@@ -19,6 +19,6 @@ jobs:
         # Skip the JIRA ticket check for PRs opened by bots
         if: ${{ !contains(github.event.pull_request.user.login, '[bot]') }}
         with:
-          regex: '[A-Z]{4,10}-[0-9]{1,5}$'
+          regex: '[A-Z]{4,10}-[0-9]{1,10}$'
           error-hint: 'Invalid PR title. Make sure it ends with a JIRA ticket - i.e. COMPASS-1234 or add the no-title-validation label'
           ignore-labels: 'no-title-validation'

AUTHORS

@@ -94,3 +94,4 @@ Kræn Hansen <[email protected]>
 Ruchitha Rajaghatta <[email protected]>
 syn-zhu <[email protected]>
 Nikola Irinchev <[email protected]>
+djechlin-mongodb <[email protected]>