Add Dockerfile port detection to ingress configuration logic

extension.bundle.ts

@@ -16,6 +16,11 @@
 // 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/deployWorkspaceProject/DeployWorkspaceProjectContext';
+export * from './src/commands/deployWorkspaceProject/getDefaultValues/DefaultResourcesNameStep';
+export * from './src/commands/ingress/IngressContext';
+export * from './src/commands/ingress/editTargetPort/getDefaultPort';
+export * from './src/commands/ingress/tryConfigureIngressUsingDockerfile';
 export { activate, deactivate } from './src/extension';
 export * from './src/extensionVariables';
 export * from './src/utils/validateUtils';

gulpfile.ts

@@ -26,6 +26,13 @@ async function cleanReadme(): Promise<void> {
     await fse.writeFile(readmePath, data);
 }
 
+async function preTest(): Promise<void> {
+    const fromPath: string = path.join(__dirname, 'test', 'ingress', 'dockerfileSamples');
+    const toPath: string = path.join(__dirname, 'dist', 'test', 'ingress', 'dockerfileSamples');
+    fse.copySync(fromPath, toPath);
+}
+
 exports['webpack-dev'] = gulp.series(prepareForWebpack, () => gulp_webpack('development'));
 exports['webpack-prod'] = gulp.series(prepareForWebpack, () => gulp_webpack('production'));
 exports.cleanReadme = cleanReadme;
+exports.preTest = preTest;

package.json

@@ -86,6 +86,11 @@
                 "title": "%containerApps.deployImageApi%",
                 "category": "Azure Container Apps"
             },
+            {
+                "command": "containerApps.deployWorkspaceProject",
+                "title": "%containerApps.deployWorkspaceProject%",
+                "category": "Azure Container Apps"
+            },
             {
                 "command": "containerApps.deleteContainerApp",
                 "title": "%containerApps.deleteContainerApp%",
@@ -230,7 +235,31 @@
                 "category": "Azure Container Apps"
             }
         ],
+        "submenus": [
+            {
+                "id": "containerApps.submenus.workspaceActions",
+                "label": "Azure Container Apps",
+                "icon": "resources/azure-containerapps.svg"
+            }
+        ],
         "menus": {
+            "containerApps.submenus.workspaceActions": [
+                {
+                    "command": "containerApps.deployWorkspaceProject",
+                    "group": "1_deploy@1"
+                },
+                {
+                    "command": "containerApps.createContainerApp",
+                    "group": "2_create@1"
+                }
+            ],
+            "view/title": [
+                {
+                    "submenu": "containerApps.submenus.workspaceActions",
+                    "when": "view == azureWorkspace",
+                    "group": "navigation@4"
+                }
+            ],
             "view/item/context": [
                 {
                     "command": "containerApps.createManagedEnvironment",
@@ -475,7 +504,8 @@
         "package": "vsce package --githubBranch main --no-dependencies",
         "lint": "eslint --ext .ts .",
         "lint-fix": "eslint --ext .ts . --fix",
-        "test": "node ./out/test/runTest.js",
+        "pretest": "gulp preTest",
+        "test": "node ./dist/test/runTest.js",
         "webpack": "tsc && gulp webpack-dev",
         "webpack-profile": "webpack --profile --json --mode production > webpack-stats.json && echo Use http://webpack.github.io/analyse to analyze the stats",
         "prepare": "husky install"
@@ -518,7 +548,7 @@
         "@azure/storage-blob": "^12.4.1",
         "@microsoft/vscode-azext-azureutils": "^2.0.0",
         "@microsoft/vscode-azext-github": "^1.0.0",
-        "@microsoft/vscode-azext-utils": "^2.0.0",
+        "@microsoft/vscode-azext-utils": "^2.0.5",
         "@microsoft/vscode-azureresources-api": "^2.0.2",
         "buffer": "^6.0.3",
         "dayjs": "^1.11.3",

package.nls.json

@@ -9,6 +9,7 @@
     "containerApps.editContainerApp": "Edit Container App (Advanced)...",
     "containerApps.deployImage": "Update Container App Image...",
     "containerApps.deployImageApi": "Update Container App Image (API)...",
+    "containerApps.deployWorkspaceProject": "Deploy Project from Workspace...",
     "containerApps.deleteContainerApp": "Delete Container App...",
     "containerApps.disableIngress": "Disable Ingress for Container App",
     "containerApps.enableIngress": "Enable Ingress for Container App...",

src/commands/createContainerApp/ContainerAppNameStep.ts

@@ -5,7 +5,7 @@
 
 import { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
 import { getResourceGroupFromId } from "@microsoft/vscode-azext-azureutils";
-import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils";
+import { AzureWizardPromptStep, ISubscriptionActionContext, nonNullProp } from "@microsoft/vscode-azext-utils";
 import { createContainerAppsAPIClient } from '../../utils/azureClients';
 import { localize } from "../../utils/localize";
 import { ICreateContainerAppContext } from './ICreateContainerAppContext';
@@ -14,22 +14,22 @@ export class ContainerAppNameStep extends AzureWizardPromptStep<ICreateContainer
     public hideStepCount: boolean = true;
 
     public async prompt(context: ICreateContainerAppContext): Promise<void> {
-        const prompt: string = localize('containerAppNamePrompt', 'Enter a name for the new container app.');
+        const prompt: string = localize('containerAppNamePrompt', 'Enter a container app name.');
         context.newContainerAppName = (await context.ui.showInputBox({
             prompt,
-            validateInput: async (value: string | undefined): Promise<string | undefined> => await this.validateInput(context, value)
+            validateInput: this.validateInput,
+            asyncValidationTask: (name: string) => this.validateNameAvailable(context, name)
         })).trim();
 
         context.valuesToMask.push(context.newContainerAppName);
     }
 
     public shouldPrompt(context: ICreateContainerAppContext): boolean {
-        return !context.newContainerAppName;
+        return !context.containerApp && !context.newContainerAppName;
     }
 
-    private async validateInput(context: ICreateContainerAppContext, name: string | undefined): Promise<string | undefined> {
+    private validateInput(name: string | undefined): string | undefined {
         name = name ? name.trim() : '';
-        // to prevent showing an error when the character types the first letter
 
         const { minLength, maxLength } = { minLength: 1, maxLength: 32 };
         if (!/^[a-z][a-z0-9]*(-[a-z0-9]+)*$/.test(name)) {
@@ -38,17 +38,24 @@ export class ContainerAppNameStep extends AzureWizardPromptStep<ICreateContainer
             return localize('invalidLength', 'The name must be between {0} and {1} characters.', minLength, maxLength);
         }
 
-        // do the API call last
-        try {
-            const client: ContainerAppsAPIClient = await createContainerAppsAPIClient(context);
-            const managedEnvironmentRg = getResourceGroupFromId(context.managedEnvironmentId);
-            await client.containerApps.get(managedEnvironmentRg, name);
-            return localize('containerAppExists', 'The container app "{0}" already exists in resource group "{1}". Please enter a unique name.', name, managedEnvironmentRg);
-        } catch (err) {
-            // do nothing
-        }
-
+        return undefined;
+    }
 
+    private async validateNameAvailable(context: ICreateContainerAppContext, name: string): Promise<string | undefined> {
+        const resourceGroupName: string = getResourceGroupFromId(nonNullProp(context, 'managedEnvironmentId'));
+        if (!await ContainerAppNameStep.isNameAvailable(context, resourceGroupName, name)) {
+            return localize('containerAppExists', 'The container app "{0}" already exists in resource group "{1}".', name, resourceGroupName);
+        }
         return undefined;
     }
+
+    public static async isNameAvailable(context: ISubscriptionActionContext, resourceGroupName: string, containerAppName: string): Promise<boolean> {
+        const client: ContainerAppsAPIClient = await createContainerAppsAPIClient(context);
+        try {
+            await client.containerApps.get(resourceGroupName, containerAppName);
+            return false;
+        } catch (_e) {
+            return true;
+        }
+    }
 }

src/commands/createContainerApp/ICreateContainerAppContext.ts

@@ -3,13 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type { ManagedEnvironment } from '@azure/arm-appcontainers';
 import type { IResourceGroupWizardContext } from '@microsoft/vscode-azext-azureutils';
 import type { ExecuteActivityContext } from '@microsoft/vscode-azext-utils';
 import type { IContainerAppContext } from '../IContainerAppContext';
 import type { ImageSourceBaseContext } from '../deployImage/imageSource/ImageSourceBaseContext';
 import type { IngressContext } from '../ingress/IngressContext';
 
 export interface ICreateContainerAppContext extends IResourceGroupWizardContext, ImageSourceBaseContext, IngressContext, IContainerAppContext, ExecuteActivityContext {
-    managedEnvironmentId: string;
     newContainerAppName?: string;
+
+    managedEnvironmentId?: string;
+    managedEnvironment?: ManagedEnvironment;
 }

src/commands/createContainerApp/createContainerApp.ts

@@ -30,6 +30,7 @@ export async function createContainerApp(context: IActionContext & Partial<ICrea
         ...(await createActivityContext()),
         subscription: node.subscription,
         managedEnvironmentId: node.managedEnvironment.id,
+        alwaysPromptIngress: true
     };
 
     const title: string = localize('createContainerApp', 'Create Container App');

src/commands/createManagedEnvironment/IManagedEnvironmentContext.ts

@@ -6,9 +6,12 @@
 import { ManagedEnvironment } from "@azure/arm-appcontainers";
 import { Workspace } from '@azure/arm-operationalinsights';
 import { IResourceGroupWizardContext } from '@microsoft/vscode-azext-azureutils';
-import { ExecuteActivityContext } from '@microsoft/vscode-azext-utils';
+import { ExecuteActivityContext, ISubscriptionActionContext } from '@microsoft/vscode-azext-utils';
+import { AzureSubscription } from "@microsoft/vscode-azureresources-api";
+
+export interface IManagedEnvironmentContext extends ISubscriptionActionContext, IResourceGroupWizardContext, ExecuteActivityContext {
+    subscription: AzureSubscription;
 
-export interface IManagedEnvironmentContext extends IResourceGroupWizardContext, ExecuteActivityContext {
     newManagedEnvironmentName?: string;
     logAnalyticsWorkspace?: Workspace;
 

src/commands/createManagedEnvironment/ManagedEnvironmentNameStep.ts

@@ -3,26 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils";
+import { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
+import { AzureWizardPromptStep, ISubscriptionActionContext, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
+import { createContainerAppsAPIClient } from "../../utils/azureClients";
 import { localize } from "../../utils/localize";
 import { IManagedEnvironmentContext } from './IManagedEnvironmentContext';
 
 export class ManagedEnvironmentNameStep extends AzureWizardPromptStep<IManagedEnvironmentContext> {
     public async prompt(context: IManagedEnvironmentContext): Promise<void> {
-        const prompt: string = localize('containerAppNamePrompt', 'Enter a name for the new Container Apps environment.');
+        const prompt: string = localize('containerAppNamePrompt', 'Enter a container apps environment name.');
         context.newManagedEnvironmentName = (await context.ui.showInputBox({
             prompt,
-            validateInput: async (value: string | undefined): Promise<string | undefined> => await this.validateInput(value)
+            validateInput: this.validateInput,
+            asyncValidationTask: (name: string) => this.validateNameAvailable(context, name)
         })).trim();
 
         context.valuesToMask.push(context.newManagedEnvironmentName);
     }
 
     public shouldPrompt(context: IManagedEnvironmentContext): boolean {
-        return !context.managedEnvironment;
+        return !context.managedEnvironment && !context.newManagedEnvironmentName;
     }
 
-    private async validateInput(name: string | undefined): Promise<string | undefined> {
+    private validateInput(name: string | undefined): string | undefined {
         name = name ? name.trim() : '';
 
         const { minLength, maxLength } = { minLength: 4, maxLength: 20 };
@@ -34,4 +37,28 @@ export class ManagedEnvironmentNameStep extends AzureWizardPromptStep<IManagedEn
 
         return undefined;
     }
+
+    private async validateNameAvailable(context: IManagedEnvironmentContext, name: string): Promise<string | undefined> {
+        if (!context.resourceGroup) {
+            // If a new resource group will house the managed environment, we can skip the name check
+            return undefined;
+        }
+
+        const resourceGroupName: string = nonNullValueAndProp(context.resourceGroup, 'name');
+        if (!await ManagedEnvironmentNameStep.isNameAvailable(context, resourceGroupName, name)) {
+            return localize('managedEnvironmentExists', 'The container apps environment "{0}" already exists in resource group "{1}".', name, resourceGroupName);
+        }
+
+        return undefined;
+    }
+
+    public static async isNameAvailable(context: ISubscriptionActionContext, resourceGroupName: string, environmentName: string): Promise<boolean> {
+        const client: ContainerAppsAPIClient = await createContainerAppsAPIClient(context);
+        try {
+            await client.managedEnvironments.get(resourceGroupName, environmentName);
+            return false;
+        } catch (_e) {
+            return true;
+        }
+    }
 }

src/commands/createManagedEnvironment/createManagedEnvironment.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { LocationListStep, ResourceGroupCreateStep, VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
-import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, createSubscriptionContext, IActionContext, nonNullProp, subscriptionExperience } from "@microsoft/vscode-azext-utils";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, createSubscriptionContext, nonNullProp, subscriptionExperience } from "@microsoft/vscode-azext-utils";
 import { AzureSubscription } from "@microsoft/vscode-azureresources-api";
 import { ext } from "../../extensionVariables";
 import { createActivityContext } from "../../utils/activityUtils";
@@ -20,7 +20,8 @@ export async function createManagedEnvironment(context: IActionContext, node?: {
     const wizardContext: IManagedEnvironmentContext = {
         ...context,
         ...createSubscriptionContext(subscription),
-        ...(await createActivityContext())
+        ...(await createActivityContext()),
+        subscription
     };
 
     const title: string = localize('createManagedEnv', 'Create Container Apps environment');

src/commands/deployImage/imageSource/buildImageInAzure/DockerFileItemStep.ts

@@ -11,10 +11,10 @@ import type { IBuildImageInAzureContext } from "./IBuildImageInAzureContext";
 
 export class DockerFileItemStep extends AzureWizardPromptStep<IBuildImageInAzureContext> {
     public async prompt(context: IBuildImageInAzureContext): Promise<void> {
-        context.dockerFilePath = await selectWorkspaceFile(context, localize('dockerFilePick', 'Select a Dockerfile'), { filters: {} }, DOCKERFILE_GLOB_PATTERN);
+        context.dockerfilePath = await selectWorkspaceFile(context, localize('dockerFilePick', 'Select a Dockerfile'), { filters: {} }, DOCKERFILE_GLOB_PATTERN);
     }
 
     public shouldPrompt(context: IBuildImageInAzureContext): boolean {
-        return !context.dockerFilePath;
+        return !context.dockerfilePath;
     }
 }

src/commands/deployImage/imageSource/buildImageInAzure/IBuildImageInAzureContext.ts

@@ -9,7 +9,7 @@ import { IContainerRegistryImageContext } from '../containerRegistry/IContainerR
 
 export interface IBuildImageInAzureContext extends IContainerRegistryImageContext {
     rootFolder: vscode.WorkspaceFolder;
-    dockerFilePath: string;
+    dockerfilePath: string;
     imageName: string;
     os: 'Windows' | 'Linux';
 

src/commands/deployImage/imageSource/buildImageInAzure/ImageNameStep.ts

@@ -10,7 +10,7 @@ import type { IBuildImageInAzureContext } from "./IBuildImageInAzureContext";
 
 export class ImageNameStep extends AzureWizardPromptStep<IBuildImageInAzureContext> {
     public async prompt(context: IBuildImageInAzureContext): Promise<void> {
-        const suggestedImageName = await getSuggestedName(context, context.dockerFilePath);
+        const suggestedImageName = await getSuggestedName(context, context.dockerfilePath);
 
         context.imageName = await context.ui.showInputBox({
             prompt: localize('imageNamePrompt', 'Enter a name for the image'),

src/commands/deployImage/imageSource/buildImageInAzure/RunStep.ts

@@ -23,7 +23,7 @@ export class RunStep extends AzureWizardExecuteStep<IBuildImageInAzureContext> {
                 isPushEnabled: true,
                 sourceLocation: context.uploadedSourceLocation,
                 platform: { os: context.os },
-                dockerFilePath: path.relative(rootUri.path, context.dockerFilePath)
+                dockerFilePath: path.relative(rootUri.path, context.dockerfilePath)
             };
 
             const building: string = localize('buildingImage', 'Building image "{0}" in registry "{1}"...', context.imageName, context.registryName);