From acd49f16ff3dee9bd1da7d33201328e2d8454897 Mon Sep 17 00:00:00 2001 From: Jade Welton Date: Tue, 7 Jul 2026 11:45:26 -0700 Subject: [PATCH] Remove test step. Fix up account names in test code. --- .github/workflows/ci.yml | 69 +++++++++++++++++----------------------- test/fx.ts | 25 +++++++++------ 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0a41da7a..f124de453 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -171,18 +171,6 @@ jobs: shardTotal: [20] steps: - uses: actions/checkout@v4 - - name: "Az CLI test" - uses: Azure/login@v2 - with: - client-id: ${{ secrets.E2ETESTS_CLIENT_ID }} - tenant-id: ${{ secrets.E2ETESTS_TENANT_ID }} - subscription-id: ${{ secrets.E2ETESTS_SUBSCRIPTION_ID }} - - name: Azure CLI script - uses: azure/cli@v2 - with: - azcliversion: latest - inlineScript: | - az account show - name: Use Node.js 18.x uses: actions/setup-node@v4 with: @@ -199,66 +187,67 @@ jobs: - name: "Acquire RBAC tokens for test accounts" uses: azure/cli@v2 env: - ACCOUNT_PREFIX: ${{ secrets.E2ETESTS_ACCOUNT_PREFIX }} + DE_ACCOUNT_PREFIX: ${{ secrets.E2ETESTS_ACCOUNT_PREFIX }} + DE_TEST_RESOURCE_GROUP: ${{ secrets.E2ETESTS_RESOURCEGROUP_NAME }} with: azcliversion: latest inlineScript: | SHARD_INDEX=${{ matrix.shardIndex }} echo PLAYWRIGHT_SHARD_INDEX=$SHARD_INDEX >> $GITHUB_ENV - NOSQL_TESTACCOUNT_1_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-1.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_1_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-1.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_1_TOKEN" echo NOSQL_TESTACCOUNT_1_TOKEN=$NOSQL_TESTACCOUNT_1_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_2_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-2.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_2_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-2.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_2_TOKEN" echo NOSQL_TESTACCOUNT_2_TOKEN=$NOSQL_TESTACCOUNT_2_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_3_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-3.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_3_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-3.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_3_TOKEN" echo NOSQL_TESTACCOUNT_3_TOKEN=$NOSQL_TESTACCOUNT_3_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_4_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-4.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_4_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-4.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_4_TOKEN" echo NOSQL_TESTACCOUNT_4_TOKEN=$NOSQL_TESTACCOUNT_4_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_5_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-5.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_5_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-5.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_5_TOKEN" echo NOSQL_TESTACCOUNT_5_TOKEN=$NOSQL_TESTACCOUNT_5_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_6_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-6.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_6_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-6.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_6_TOKEN" echo NOSQL_TESTACCOUNT_6_TOKEN=$NOSQL_TESTACCOUNT_6_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_7_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-7.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_7_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-7.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_7_TOKEN" echo NOSQL_TESTACCOUNT_7_TOKEN=$NOSQL_TESTACCOUNT_7_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_8_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-8.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_8_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-8.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_8_TOKEN" echo NOSQL_TESTACCOUNT_8_TOKEN=$NOSQL_TESTACCOUNT_8_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_9_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-9.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_9_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-9.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_9_TOKEN" echo NOSQL_TESTACCOUNT_9_TOKEN=$NOSQL_TESTACCOUNT_9_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_10_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-10.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_10_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-10.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_10_TOKEN" echo NOSQL_TESTACCOUNT_10_TOKEN=$NOSQL_TESTACCOUNT_10_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_11_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-11.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_11_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-11.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_11_TOKEN" echo NOSQL_TESTACCOUNT_11_TOKEN=$NOSQL_TESTACCOUNT_11_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_12_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-12.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_12_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-12.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_12_TOKEN" echo NOSQL_TESTACCOUNT_12_TOKEN=$NOSQL_TESTACCOUNT_12_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_13_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-13.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_13_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-13.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_13_TOKEN" echo NOSQL_TESTACCOUNT_13_TOKEN=$NOSQL_TESTACCOUNT_13_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_14_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-14.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_14_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-14.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_14_TOKEN" echo NOSQL_TESTACCOUNT_14_TOKEN=$NOSQL_TESTACCOUNT_14_TOKEN >> $GITHUB_ENV @@ -266,48 +255,48 @@ jobs: echo "::add-mask::$NOSQL_TESTACCOUNT_15_TOKEN" echo NOSQL_TESTACCOUNT_15_TOKEN=$NOSQL_TESTACCOUNT_15_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_16_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-16.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_16_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-16.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_16_TOKEN" echo NOSQL_TESTACCOUNT_16_TOKEN=$NOSQL_TESTACCOUNT_16_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_17_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-17.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_17_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-17.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_17_TOKEN" echo NOSQL_TESTACCOUNT_17_TOKEN=$NOSQL_TESTACCOUNT_17_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_18_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-18.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_18_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-18.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_18_TOKEN" echo NOSQL_TESTACCOUNT_18_TOKEN=$NOSQL_TESTACCOUNT_18_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_19_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-19.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_19_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-19.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_19_TOKEN" echo NOSQL_TESTACCOUNT_19_TOKEN=$NOSQL_TESTACCOUNT_19_TOKEN >> $GITHUB_ENV - NOSQL_TESTACCOUNT_20_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-20.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_TESTACCOUNT_20_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-20.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_TESTACCOUNT_20_TOKEN" echo NOSQL_TESTACCOUNT_20_TOKEN=$NOSQL_TESTACCOUNT_20_TOKEN >> $GITHUB_ENV - NOSQL_READONLY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-readonly.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_READONLY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-readonly.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_READONLY_TESTACCOUNT_TOKEN" echo NOSQL_READONLY_TESTACCOUNT_TOKEN=$NOSQL_READONLY_TESTACCOUNT_TOKEN >> $GITHUB_ENV - NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-containercopy.documents.azure.com/.default" -o tsv --query accessToken) + NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-sql-containercopy.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN" echo NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN=$NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN >> $GITHUB_ENV - TABLE_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-table-1.documents.azure.com/.default" -o tsv --query accessToken) + TABLE_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-table-1.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$TABLE_TESTACCOUNT_TOKEN" echo TABLE_TESTACCOUNT_TOKEN=$TABLE_TESTACCOUNT_TOKEN >> $GITHUB_ENV - GREMLIN_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-gremlin-1.documents.azure.com/.default" -o tsv --query accessToken) + GREMLIN_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-gremlin-1.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$GREMLIN_TESTACCOUNT_TOKEN" echo GREMLIN_TESTACCOUNT_TOKEN=$GREMLIN_TESTACCOUNT_TOKEN >> $GITHUB_ENV - CASSANDRA_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-cassandra-1.documents.azure.com/.default" -o tsv --query accessToken) + CASSANDRA_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-cassandra-1.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$CASSANDRA_TESTACCOUNT_TOKEN" echo CASSANDRA_TESTACCOUNT_TOKEN=$CASSANDRA_TESTACCOUNT_TOKEN >> $GITHUB_ENV - MONGO_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-mongo-1.documents.azure.com/.default" -o tsv --query accessToken) + MONGO_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-mongo-1.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$MONGO_TESTACCOUNT_TOKEN" echo MONGO_TESTACCOUNT_TOKEN=$MONGO_TESTACCOUNT_TOKEN >> $GITHUB_ENV - MONGO32_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-mongo32-1.documents.azure.com/.default" -o tsv --query accessToken) + MONGO32_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-mongo32-1.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$MONGO32_TESTACCOUNT_TOKEN" echo MONGO32_TESTACCOUNT_TOKEN=$MONGO32_TESTACCOUNT_TOKEN >> $GITHUB_ENV - MONGO_READONLY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-mongo-readonly.documents.azure.com/.default" -o tsv --query accessToken) + MONGO_READONLY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://${DE_ACCOUNT_PREFIX}-de-test-mongo-readonly.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$MONGO_READONLY_TESTACCOUNT_TOKEN" echo MONGO_READONLY_TESTACCOUNT_TOKEN=$MONGO_READONLY_TESTACCOUNT_TOKEN >> $GITHUB_ENV - name: List test files for shard ${{ matrix['shardIndex'] }} of ${{ matrix['shardTotal']}} diff --git a/test/fx.ts b/test/fx.ts index 26b2893bc..26c36c371 100644 --- a/test/fx.ts +++ b/test/fx.ts @@ -45,29 +45,34 @@ export enum TestAccount { } export function getDefaultAccountName(accountType: TestAccount): string { + const accountNamePrefix = process.env.DE_TEST_ACCOUNT_PREFIX; + if (!accountNamePrefix) { + throw new Error("DE_TEST_ACCOUNT_PREFIX is not set"); + } + switch (accountType) { case TestAccount.Tables: - return "github-e2etests-tables"; + return `${accountNamePrefix}-de-test-table-1`; case TestAccount.Cassandra: - return "github-e2etests-cassandra"; + return `${accountNamePrefix}-de-test-cassandra-1`; case TestAccount.Gremlin: - return "github-e2etests-gremlin"; + return `${accountNamePrefix}-de-test-gremlin-1`; case TestAccount.Mongo: - return "github-e2etests-mongo"; + return `${accountNamePrefix}-de-test-mongo-1`; case TestAccount.MongoReadonly: - return "github-e2etests-mongo-readonly"; + return `${accountNamePrefix}-de-test-mongo-readonly`; case TestAccount.Mongo32: - return "github-e2etests-mongo32"; + return `${accountNamePrefix}-de-test-mongo32-1`; case TestAccount.SQLReadOnly: - return "github-e2etests-sql-readonly"; + return `${accountNamePrefix}-de-test-sql-readonly`; case TestAccount.SQLContainerCopyOnly: - return "github-e2etests-sql-containercopyonly"; + return `${accountNamePrefix}-de-test-sql-containercopy`; case TestAccount.SQL: { const shardIndex = process.env.PLAYWRIGHT_SHARD_INDEX ?? ""; if (!shardIndex) { throw new Error("PLAYWRIGHT_SHARD_INDEX is not set"); } - return "github-e2etests-sql-" + shardIndex; + return `${accountNamePrefix}-de-test-sql-${shardIndex}`; } default: throw new Error(`No default account name defined for account type ${accountType}`); @@ -75,7 +80,7 @@ export function getDefaultAccountName(accountType: TestAccount): string { } export const resourceGroupName = process.env.DE_TEST_RESOURCE_GROUP ?? "de-e2e-tests"; -export const subscriptionId = process.env.DE_TEST_SUBSCRIPTION_ID ?? "69e02f2d-f059-4409-9eac-97e8a276ae2c"; +export const subscriptionId = process.env.DE_TEST_SUBSCRIPTION_ID ?? process.env.AZURE_SUBSCRIPTION_ID ?? ""; export const TEST_AUTOSCALE_THROUGHPUT_RU = 1000; export const TEST_MANUAL_THROUGHPUT_RU = 800; export const TEST_AUTOSCALE_MAX_THROUGHPUT_RU_2K = 2000;