diff --git a/.eslintrc.js b/.eslintrc.js index 0d7a3c18b..fb1ed3a73 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -40,6 +40,7 @@ module.exports = { }, ], rules: { + "no-console": ["error", { allow: ["error", "warn", "dir"] }], curly: "error", "@typescript-eslint/switch-exhaustiveness-check": "error", "@typescript-eslint/no-unused-vars": "error", diff --git a/test/NoSqlTestSetup.ts b/test/NoSqlTestSetup.ts deleted file mode 100644 index ea457fd55..000000000 --- a/test/NoSqlTestSetup.ts +++ /dev/null @@ -1,71 +0,0 @@ -export function getNoSqlRbacToken(): string | undefined { - let nosqlRbacToken: string | undefined; - const shardIndex = process.env.PLAYWRIGHT_SHARD_INDEX ?? ""; - switch (parseInt(shardIndex)) { - case 1: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_1_TOKEN; - break; - case 2: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_2_TOKEN; - break; - case 3: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_3_TOKEN; - break; - case 4: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_4_TOKEN; - break; - case 5: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_5_TOKEN; - break; - case 6: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_6_TOKEN; - break; - case 7: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_7_TOKEN; - break; - case 8: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_8_TOKEN; - break; - case 9: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_9_TOKEN; - break; - case 10: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_10_TOKEN; - break; - case 11: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_11_TOKEN; - break; - case 12: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_12_TOKEN; - break; - case 13: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_13_TOKEN; - break; - case 14: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_14_TOKEN; - break; - case 15: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_15_TOKEN; - break; - case 16: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_16_TOKEN; - break; - case 17: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_17_TOKEN; - break; - case 18: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_18_TOKEN; - break; - case 19: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_19_TOKEN; - break; - case 20: - nosqlRbacToken = process.env.NOSQL_TESTACCOUNT_20_TOKEN; - break; - } - - if (!nosqlRbacToken) { - console.warn(`No NoSQL RBAC token found for shard index ${shardIndex}`); - } - return nosqlRbacToken; -} diff --git a/test/fx.ts b/test/fx.ts index e3a5400af..eb9b25a08 100644 --- a/test/fx.ts +++ b/test/fx.ts @@ -131,7 +131,6 @@ 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 = process.env.NOSQL_TESTACCOUNT_TOKEN; const nosqlReadOnlyRbacToken = process.env.NOSQL_READONLY_TESTACCOUNT_TOKEN; diff --git a/test/testExplorer/TestExplorer.ts b/test/testExplorer/TestExplorer.ts index ec116928e..3c1c36a1a 100644 --- a/test/testExplorer/TestExplorer.ts +++ b/test/testExplorer/TestExplorer.ts @@ -3,7 +3,6 @@ import "../../less/hostedexplorer.less"; import { DataExplorerInputsFrame } from "../../src/Contracts/ViewModels"; import { updateUserContext } from "../../src/UserContext"; import { get, listKeys } from "../../src/Utils/arm/generatedClients/cosmos/databaseAccounts"; -import { getNoSqlRbacToken } from "../NoSqlTestSetup"; const urlSearchParams = new URLSearchParams(window.location.search); const resourceGroup = urlSearchParams.get("resourceGroup") || process.env.RESOURCE_GROUP || ""; @@ -16,7 +15,7 @@ const enablecontainercopy = urlSearchParams.get("enablecontainercopy"); const nosqlRbacToken = urlSearchParams.get("nosqlRbacToken") || - (enablecontainercopy ? process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN : getNoSqlRbacToken()) || + (enablecontainercopy ? process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN : process.env.NOSQL_TESTACCOUNT_TOKEN) || ""; const nosqlReadOnlyRbacToken =