Fix and re-enable long running tests (#786)

Author: MicroFish91

extension.bundle.ts

@@ -16,6 +16,7 @@
 // At runtime the tests live in dist/tests and will therefore pick up the main webpack bundle at dist/extension.bundle.js.
 export * from '@microsoft/vscode-azext-utils';
 // Export activate/deactivate for main.js
+export * from './src/commands/createManagedEnvironment/createManagedEnvironment';
 export * from './src/commands/deployWorkspaceProject/deployWorkspaceProject';
 export * from './src/commands/deployWorkspaceProject/getDeployWorkspaceProjectResults';
 export * from './src/commands/deployWorkspaceProject/internal/DeployWorkspaceProjectInternalContext';

package-lock.json

@@ -773,7 +773,7 @@
     "devDependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
         "@microsoft/eslint-config-azuretools": "^0.2.2",
-        "@microsoft/vscode-azext-dev": "^2.0.4",
+        "@microsoft/vscode-azext-dev": "^2.0.5",
         "@types/deep-eql": "^4.0.0",
         "@types/fs-extra": "^8.1.1",
         "@types/gulp": "^4.0.6",
@@ -810,7 +810,7 @@
         "@azure/storage-blob": "^12.4.1",
         "@microsoft/vscode-azext-azureutils": "^3.1.1",
         "@microsoft/vscode-azext-github": "^1.0.0",
-        "@microsoft/vscode-azext-utils": "^2.5.10",
+        "@microsoft/vscode-azext-utils": "^2.5.11",
         "@microsoft/vscode-azureresources-api": "^2.0.2",
         "buffer": "^6.0.3",
         "dayjs": "^1.11.3",

package.json

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { type ManagedEnvironment } from "@azure/arm-appcontainers";
 import { LocationListStep, ResourceGroupCreateStep } from "@microsoft/vscode-azext-azureutils";
 import { AzureWizard, createSubscriptionContext, nonNullProp, subscriptionExperience, type AzureWizardExecuteStep, type AzureWizardPromptStep, type IActionContext } from "@microsoft/vscode-azext-utils";
 import { type AzureSubscription } from "@microsoft/vscode-azureresources-api";
@@ -16,7 +17,7 @@ import { type ManagedEnvironmentCreateContext } from "./ManagedEnvironmentCreate
 import { ManagedEnvironmentCreateStep } from "./ManagedEnvironmentCreateStep";
 import { ManagedEnvironmentNameStep } from "./ManagedEnvironmentNameStep";
 
-export async function createManagedEnvironment(context: IActionContext, node?: { subscription: AzureSubscription }): Promise<void> {
+export async function createManagedEnvironment(context: IActionContext, node?: { subscription: AzureSubscription }): Promise<ManagedEnvironment> {
     const subscription = node?.subscription ?? await subscriptionExperience(context, ext.rgApiV2.resources.azureResourceTreeDataProvider);
 
     const wizardContext: ManagedEnvironmentCreateContext = {
@@ -54,4 +55,5 @@ export async function createManagedEnvironment(context: IActionContext, node?: {
     await wizard.execute();
 
     ext.branchDataProvider.refresh();
+    return nonNullProp(wizardContext, 'managedEnvironment');
 }

src/commands/createManagedEnvironment/createManagedEnvironment.ts

@@ -9,12 +9,10 @@ import * as assert from 'assert';
 import * as vscode from 'vscode';
 import { ext, registerOnActionStartHandler, registerUIExtensionVariables } from '../extension.bundle';
 
-// const longRunningLocalTestsEnabled: boolean = !/^(false|0)?$/i.test(process.env.AzCode_EnableLongRunningTestsLocal || '');
-// const longRunningRemoteTestsEnabled: boolean = !/^(false|0)?$/i.test(process.env.AzCode_UseAzureFederatedCredentials || '');
+const longRunningLocalTestsEnabled: boolean = !/^(false|0)?$/i.test(process.env.AzCode_EnableLongRunningTestsLocal || '');
+const longRunningRemoteTestsEnabled: boolean = !/^(false|0)?$/i.test(process.env.AzCode_UseAzureFederatedCredentials || '');
 
-// export const longRunningTestsEnabled: boolean = longRunningLocalTestsEnabled || longRunningRemoteTestsEnabled;
-
-export const longRunningTestsEnabled: boolean = false;
+export const longRunningTestsEnabled: boolean = longRunningLocalTestsEnabled || longRunningRemoteTestsEnabled;
 
 // Runs before all tests
 suiteSetup(async function (this: Mocha.Context): Promise<void> {

test/global.test.ts

@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { type ManagedEnvironment } from '@azure/arm-appcontainers';
 import { runWithTestActionContext } from '@microsoft/vscode-azext-dev';
-import { parseError, type IParsedError } from "@microsoft/vscode-azext-utils";
+import { nonNullProp, parseError, randomUtils, type IParsedError } from "@microsoft/vscode-azext-utils";
 import * as assert from 'assert';
 import * as path from 'path';
 import { workspace, type Uri, type WorkspaceFolder } from 'vscode';
-import { AzExtFsExtra, deployWorkspaceProject, dwpSettingUtilsV2, settingUtils, type DeploymentConfigurationSettings, type DeployWorkspaceProjectResults } from '../../../extension.bundle';
+import { AzExtFsExtra, createManagedEnvironment, deployWorkspaceProject, dwpSettingUtilsV2, settingUtils, type DeploymentConfigurationSettings, type DeployWorkspaceProjectResults } from '../../../extension.bundle';
 import { longRunningTestsEnabled } from '../../global.test';
 import { assertStringPropsMatch, getWorkspaceFolderUri } from '../../testUtils';
 import { resourceGroupsToDelete } from '../global.nightly.test';
@@ -17,10 +18,17 @@ import { dwpTestScenarios } from './dwpTestScenarios';
 suite('deployWorkspaceProject', function (this: Mocha.Suite) {
     this.timeout(15 * 60 * 1000);
 
-    suiteSetup(function (this: Mocha.Context) {
+    suiteSetup(async function (this: Mocha.Context) {
         if (!longRunningTestsEnabled) {
             this.skip();
         }
+
+        // Create a managed environment first so that we can guarantee one is always built before workspace deployment tests start.
+        // This is crucial for test consistency because the managed environment prompt will skip if no managed environment
+        // resources are available yet. Creating at least one environment first ensures consistent reproduceability.
+        const managedEnvironment: ManagedEnvironment | undefined = await setupManagedEnvironment();
+        assert.ok(managedEnvironment, 'Failed to create managed environment - skipping "deployWorkspaceProject" tests.');
+        resourceGroupsToDelete.add(nonNullProp(managedEnvironment, 'name'));
     });
 
     for (const scenario of dwpTestScenarios) {
@@ -83,6 +91,17 @@ suite('deployWorkspaceProject', function (this: Mocha.Suite) {
     }
 });
 
+async function setupManagedEnvironment(): Promise<ManagedEnvironment | undefined> {
+    let managedEnvironment: ManagedEnvironment | undefined;
+    await runWithTestActionContext('createManagedEnvironment', async context => {
+        const resourceName: string = 'dwp' + randomUtils.getRandomHexString(6);
+        await context.ui.runWithInputs([resourceName, 'East US'], async () => {
+            managedEnvironment = await createManagedEnvironment(context);
+        });
+    });
+    return managedEnvironment;
+}
+
 function getMethodCleanWorkspaceFolderSettings(rootFolder: WorkspaceFolder) {
     return async function cleanWorkspaceFolderSettings(): Promise<void> {
         const settingsPath: string = settingUtils.getDefaultRootWorkspaceSettingsPath(rootFolder);

test/nightly/deployWorkspaceProject/deployWorkspaceProject.test.ts

@@ -27,6 +27,8 @@ export function generateAlbumApiJavaScriptTestCases(): DeployWorkspaceProjectTes
                 sharedResourceName.slice(0, -1), // Isolate by using a different resource group name since we expect this case to fail
                 appResourceName,
                 `.${path.sep}src`,
+                'Docker Login Credentials',
+                'Enable',
                 'East US',
                 'Save'
             ],
@@ -45,6 +47,8 @@ export function generateAlbumApiJavaScriptTestCases(): DeployWorkspaceProjectTes
                 sharedResourceName,
                 appResourceName,
                 `.${path.sep}src`,
+                'Docker Login Credentials',
+                'Enable',
                 'East US',
                 'Save'
             ],

test/nightly/deployWorkspaceProject/testCases/albumApiJavaScriptTestCases.ts

@@ -26,6 +26,8 @@ export function generateMonoRepoBasicTestCases(): DeployWorkspaceProjectTestCase
                 sharedResourceName,
                 'app1',
                 `.${path.sep}app1`,
+                'Docker Login Credentials',
+                'Enable',
                 path.join('app1', '.env.example'),
                 'East US',
                 'Save'
@@ -49,6 +51,7 @@ export function generateMonoRepoBasicTestCases(): DeployWorkspaceProjectTestCase
                 'Continue',
                 'app2',
                 `.${path.sep}app2`,
+                'Docker Login Credentials',
                 path.join('app2', '.env.example'),
                 'Save'
             ],
@@ -71,6 +74,7 @@ export function generateMonoRepoBasicTestCases(): DeployWorkspaceProjectTestCase
                 'Continue',
                 'app3',
                 `.${path.sep}app3`,
+                'Docker Login Credentials',
                 path.join('app3', '.env.example'),
                 'Save'
             ],

test/nightly/deployWorkspaceProject/testCases/monoRepoBasicTestCases.ts

@@ -1,9 +1,5 @@
 {
     "folders": [
-        {
-            "name": "albumapi-go",
-            "path": "./testProjects/containerapps-albumapi-go"
-        },
         {
             "name": "albumapi-js",
             "path": "./testProjects/containerapps-albumapi-javascript"