Update deployWorkspaceProject tests to reflect the new deployment modes

src/commands/image/imageSource/containerRegistry/acr/AcrListStep.ts

@@ -16,6 +16,7 @@ import { RegistryNameStep } from "./createAcr/RegistryNameStep";
 import { SkuListStep } from "./createAcr/SkuListStep";
 
 export interface AcrListStepOptions {
+    createIfNone?: boolean;
     suppressCreatePick?: boolean;
     pickUpdateStrategy?: AcrPickUpdateStrategy;
 }
@@ -48,7 +49,7 @@ export class AcrListStep<T extends ContainerRegistryImageSourceContext> extends
         let result: Registry | typeof noMatchingResources | undefined;
         do {
             const picks: IAzureQuickPickItem<Registry | typeof noMatchingResources | undefined>[] = await this.getPicks(context);
-            if (picks.length === 1 && picks[0] === acrCreatePick) {
+            if (this.options.createIfNone && picks.length === 1 && picks[0] === acrCreatePick) {
                 pick = acrCreatePick;
                 result = pick.data as typeof acrCreatePick['data'];
                 break;

test/nightly/deployWorkspaceProject/deployWorkspaceProject.test.ts

@@ -3,18 +3,11 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { type ManagedEnvironment } from "@azure/arm-appcontainers";
-import { type Registry } from "@azure/arm-containerregistry";
-import { runWithTestActionContext } from "@microsoft/vscode-azext-dev";
-import { nonNullProp, randomUtils } from "@microsoft/vscode-azext-utils";
-import * as assert from "assert";
-import { createAcr, createManagedEnvironment } from "../../../extension.bundle";
+import { nonNullProp } from "@microsoft/vscode-azext-utils";
 import { longRunningTestsEnabled } from '../../global.test';
-import { resourceGroupsToDelete } from "../global.nightly.test";
-import { buildParallelTestScenarios, type DwpParallelTestScenario } from './buildParallelScenarios';
+import { generateParallelTests, type DwpParallelTestScenario } from "./parallelTests";
 
-let setupTask: Promise<void>;
-const testScenarios: DwpParallelTestScenario[] = buildParallelTestScenarios();
+const testScenarios: DwpParallelTestScenario[] = generateParallelTests();
 
 suite('deployWorkspaceProject', async function (this: Mocha.Suite) {
     this.timeout(15 * 60 * 1000);
@@ -24,13 +17,8 @@ suite('deployWorkspaceProject', async function (this: Mocha.Suite) {
             this.skip();
         }
 
-        // Create a container registry & managed environment first so that we can guarantee one is always built before workspace deployment tests start.
-        // This is crucial for test consistency because some resource prompts will skip if no existing resources exist to choose from
-        // Creating at least one of each resource first ensures consistent reproduceability.
-        setupTask = setupResources();
-
         for (const s of testScenarios) {
-            s.scenario = s.callback(setupTask);
+            s.scenario = s.callback();
         }
     });
 
@@ -40,39 +28,3 @@ suite('deployWorkspaceProject', async function (this: Mocha.Suite) {
         });
     }
 });
-
-async function setupResources(): Promise<void> {
-    let envResourceTask: Promise<void> | undefined;
-    let managedEnvironment: ManagedEnvironment | undefined;
-    try {
-        envResourceTask = runWithTestActionContext('createManagedEnvironment', async context => {
-            const resourceName: string = 'dwp' + randomUtils.getRandomHexString(6);
-            await context.ui.runWithInputs([resourceName, 'East US'], async () => {
-                managedEnvironment = await createManagedEnvironment(context);
-            });
-        });
-    } catch (e) {
-        console.error(e);
-    }
-
-    let acrResourceTask: Promise<void> | undefined;
-    let registry: Registry | undefined;
-    try {
-        acrResourceTask = runWithTestActionContext('createContainerRegistry', async context => {
-            const resourceName: string = 'dwp' + randomUtils.getRandomHexString(6);
-            await context.ui.runWithInputs([resourceName, 'Basic', 'East US'], async () => {
-                registry = await createAcr(context);
-            });
-        });
-    } catch (e) {
-        console.error(e);
-    }
-
-    await Promise.allSettled([envResourceTask, acrResourceTask]);
-
-    assert.ok(managedEnvironment, 'Failed to create managed environment - skipping "deployWorkspaceProject" tests.');
-    resourceGroupsToDelete.add(nonNullProp(managedEnvironment, 'name'));
-
-    assert.ok(registry, 'Failed to create container registry - skipping "deployWorkspaceProject" tests.');
-    resourceGroupsToDelete.add(nonNullProp(registry, 'name'));
-}

test/nightly/deployWorkspaceProject/dwpTestUtils.ts

@@ -10,7 +10,7 @@ import * as assert from "assert";
 import { createContainerAppsAPIClient, type DeployWorkspaceProjectResults } from "../../../extension.bundle";
 import { type StringOrRegExpProps } from "../../typeUtils";
 import { subscriptionContext } from "../global.nightly.test";
-import { type PostTestAssertion } from "./testCases/DeployWorkspaceProjectTestCase";
+import { type PostTestAssertion } from "./scenarios/DeployWorkspaceProjectTestScenario";
 
 export namespace dwpTestUtils {
     export function generateExpectedResultsWithCredentials(sharedResourceName: string, acrResourceName: string, appResourceName: string): StringOrRegExpProps<DeployWorkspaceProjectResults> {
@@ -19,10 +19,10 @@ export namespace dwpTestUtils {
             imageName: new RegExp(appResourceName, 'i'),
             logAnalyticsWorkspaceId: new RegExp(`\/resourceGroups\/${sharedResourceName}\/providers\/Microsoft\.OperationalInsights\/workspaces\/${sharedResourceName}`, 'i'),
             managedEnvironmentId: new RegExp(`\/resourceGroups\/${sharedResourceName}\/providers\/Microsoft\.App\/managedEnvironments\/${sharedResourceName}`, 'i'),
-            registryId: new RegExp(`\/resourceGroups\/${sharedResourceName}\/providers\/Microsoft\.ContainerRegistry\/registries\/${acrResourceName}.{6}`, 'i'),
-            registryLoginServer: new RegExp(`${acrResourceName}.{6}\.azurecr\.io`, 'i'),
+            registryId: new RegExp(`\/resourceGroups\/${sharedResourceName}\/providers\/Microsoft\.ContainerRegistry\/registries\/${acrResourceName}`, 'i'),
+            registryLoginServer: new RegExp(`${acrResourceName}(?:.{6})?\.azurecr\.io`, 'i'),
             registryPassword: new RegExp('.*'),
-            registryUsername: new RegExp(`${acrResourceName}.{6}`, 'i'),
+            registryUsername: new RegExp(acrResourceName, 'i'),
             resourceGroupId: new RegExp(`\/resourceGroups\/${sharedResourceName}`, 'i')
         };
     }
@@ -33,8 +33,8 @@ export namespace dwpTestUtils {
             imageName: new RegExp(appResourceName, 'i'),
             logAnalyticsWorkspaceId: new RegExp(`\/resourceGroups\/${sharedResourceName}\/providers\/Microsoft\.OperationalInsights\/workspaces\/${sharedResourceName}`, 'i'),
             managedEnvironmentId: new RegExp(`\/resourceGroups\/${sharedResourceName}\/providers\/Microsoft\.App\/managedEnvironments\/${sharedResourceName}`, 'i'),
-            registryId: new RegExp(`\/resourceGroups\/${sharedResourceName}\/providers\/Microsoft\.ContainerRegistry\/registries\/${acrResourceName}.{6}`, 'i'),
-            registryLoginServer: new RegExp(`${acrResourceName}.{6}\.azurecr\.io`, 'i'),
+            registryId: new RegExp(`\/resourceGroups\/${sharedResourceName}\/providers\/Microsoft\.ContainerRegistry\/registries\/${acrResourceName}`, 'i'),
+            registryLoginServer: new RegExp(`${acrResourceName}(?:.{6})?\.azurecr\.io`, 'i'),
             registryPassword: undefined,
             registryUsername: undefined,
             resourceGroupId: new RegExp(`\/resourceGroups\/${sharedResourceName}`, 'i')

test/nightly/deployWorkspaceProject/buildParallelScenarios.ts → test/nightly/deployWorkspaceProject/parallelTests.ts

@@ -10,27 +10,26 @@ import { workspace, type Uri, type WorkspaceFolder } from "vscode";
 import { AzExtFsExtra, deployWorkspaceProject, dwpSettingUtilsV2, ext, parseError, settingUtils, type DeploymentConfigurationSettings, type DeployWorkspaceProjectResults, type IParsedError } from "../../../extension.bundle";
 import { assertStringPropsMatch, getWorkspaceFolderUri } from "../../testUtils";
 import { resourceGroupsToDelete } from "../global.nightly.test";
-import { getDwpTestScenarios, type DeployWorkspaceProjectTestScenario } from "./dwpTestScenarios";
+import { type DeployWorkspaceProjectTestScenario } from "./scenarios/DeployWorkspaceProjectTestScenario";
+import { generateTestScenarios } from "./scenarios/testScenarios";
 
 export interface DwpParallelTestScenario {
     title: string;
-    callback(setupTask: Promise<void>): Promise<void>;
+    callback(): Promise<void>;
     scenario?: Promise<void>;
 }
 
-export function buildParallelTestScenarios(): DwpParallelTestScenario[] {
-    return getDwpTestScenarios().map(scenario => {
+export function generateParallelTests(): DwpParallelTestScenario[] {
+    return generateTestScenarios().map(scenario => {
         return {
             title: scenario.label,
-            callback: buildParallelScenarioCallback(scenario),
+            callback: runTestScenario(scenario),
         };
     });
 }
 
-function buildParallelScenarioCallback(scenario: DeployWorkspaceProjectTestScenario): DwpParallelTestScenario['callback'] {
-    return async (setupTask: Promise<void>) => {
-        await setupTask;
-
+function runTestScenario(scenario: DeployWorkspaceProjectTestScenario): DwpParallelTestScenario['callback'] {
+    return async () => {
         const workspaceFolderUri: Uri = getWorkspaceFolderUri(scenario.folderName);
         const rootFolder: WorkspaceFolder | undefined = workspace.getWorkspaceFolder(workspaceFolderUri);
         assert.ok(rootFolder, 'Could not retrieve root workspace folder.');

test/nightly/deployWorkspaceProject/testCases/DeployWorkspaceProjectTestCase.ts → test/nightly/deployWorkspaceProject/scenarios/DeployWorkspaceProjectTestScenario.ts

@@ -6,6 +6,12 @@
 import { type DeploymentConfigurationSettings, type DeployWorkspaceProjectResults, type IActionContext } from "../../../../extension.bundle";
 import { type StringOrRegExpProps } from "../../../typeUtils";
 
+export interface DeployWorkspaceProjectTestScenario {
+    label: string;
+    folderName: string;
+    testCases: DeployWorkspaceProjectTestCase[];
+}
+
 export interface DeployWorkspaceProjectTestCase {
     /**
      * Label to display when executing the test