From 2f487f83b24c72535717aacc48cf45616eb8128f Mon Sep 17 00:00:00 2001 From: Jade Welton Date: Tue, 7 Jul 2026 15:26:05 -0700 Subject: [PATCH] Clean up access tokens for NoSQL. --- .github/workflows/ci.yml | 127 +++++++++++++++++++++------------------ test/fx.ts | 5 +- test/testData.ts | 5 +- 3 files changed, 73 insertions(+), 64 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db3e40257..7473b129c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -195,85 +195,92 @@ jobs: SHARD_INDEX=${{ matrix.shardIndex }} echo PLAYWRIGHT_SHARD_INDEX=$SHARD_INDEX >> $GITHUB_ENV - 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=${DE_ACCOUNT_PREFIX}-de-test-sql-${SHARD_INDEX}.documents.azure.com - 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 + echo "Acquiring tokens for shard $SHARD_INDEX and account $NOSQL_TESTACCOUNT" + NOSQL_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://$NOSQL_TESTACCOUNT/.default" -o tsv --query accessToken) + echo "::add-mask::$NOSQL_TESTACCOUNT_TOKEN" + echo NOSQL_TESTACCOUNT_TOKEN=$NOSQL_TESTACCOUNT_TOKEN >> $GITHUB_ENV - 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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 + #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_15_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-15.documents.azure.com/.default" -o tsv --query accessToken) - echo "::add-mask::$NOSQL_TESTACCOUNT_15_TOKEN" - echo NOSQL_TESTACCOUNT_15_TOKEN=$NOSQL_TESTACCOUNT_15_TOKEN >> $GITHUB_ENV + #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_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_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 - 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_15_TOKEN=$(az account get-access-token --scope "https://${ACCOUNT_PREFIX}-de-test-sql-15.documents.azure.com/.default" -o tsv --query accessToken) + #echo "::add-mask::$NOSQL_TESTACCOUNT_15_TOKEN" + #echo NOSQL_TESTACCOUNT_15_TOKEN=$NOSQL_TESTACCOUNT_15_TOKEN >> $GITHUB_ENV - 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_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_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_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_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_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://${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://${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://$DE_ACCOUNT_PREFIX-de-test-sql-readonly.documents.azure.com/.default" -o tsv --query accessToken) echo "::add-mask::$NOSQL_READONLY_TESTACCOUNT_TOKEN" diff --git a/test/fx.ts b/test/fx.ts index c16b0316f..dc8f742d2 100644 --- a/test/fx.ts +++ b/test/fx.ts @@ -1,7 +1,7 @@ import { DefaultAzureCredential } from "@azure/identity"; import { Frame, Locator, Page, expect } from "@playwright/test"; import crypto from "crypto"; -import { getNoSqlRbacToken } from "./NoSqlTestSetup"; +// import { getNoSqlRbacToken } from "./NoSqlTestSetup"; import { TestContainerContext } from "./testData"; const RETRY_COUNT = 3; @@ -126,7 +126,8 @@ export async function getTestExplorerUrl(accountType: TestAccount, options?: Tes // For now, since we don't test copilot, we can disable the copilot APIs by setting the feature flag to false. params.set("feature.enableCopilot", "false"); - const nosqlRbacToken = getNoSqlRbacToken(); + //const nosqlRbacToken = getNoSqlRbacToken(); + const nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_TOKEN; const nosqlReadOnlyRbacToken = process.env.NOSQL_READONLY_TESTACCOUNT_TOKEN; const nosqlContainerCopyRbacToken = process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN; diff --git a/test/testData.ts b/test/testData.ts index f9b493b70..91273530f 100644 --- a/test/testData.ts +++ b/test/testData.ts @@ -18,7 +18,7 @@ import { subscriptionId, TestAccount, } from "./fx"; -import { getNoSqlRbacToken } from "./NoSqlTestSetup"; +// import { getNoSqlRbacToken } from "./NoSqlTestSetup"; // In Node.js >= 19, globalThis.crypto is already available as a read-only getter. // Only assign the polyfill for older versions. @@ -135,7 +135,8 @@ async function createCosmosClientForSQLAccount( const rbacToken = accountType === TestAccount.SQL - ? getNoSqlRbacToken() + // ? getNoSqlRbacToken() + ? process.env.NOSQL_TESTACCOUNT_TOKEN : accountType === TestAccount.SQLContainerCopyOnly ? process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN : "";