Impl

Author: MicroFish91

extension.bundle.ts

@@ -18,6 +18,9 @@ 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

@@ -504,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"

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/deployImage/deployImage.ts

@@ -27,7 +27,7 @@ export async function deployImage(context: ITreeItemPickerContext & Partial<IDep
         ...context,
         ...createSubscriptionContext(subscription),
         subscription,
-        containerApp
+        containerApp,
     };
 
     const promptSteps: AzureWizardPromptStep<IDeployImageContext>[] = [

src/commands/ingress/IngressContext.ts

@@ -5,10 +5,16 @@
 
 import type { ExecuteActivityContext } from "@microsoft/vscode-azext-utils";
 import type { IContainerAppContext } from "../IContainerAppContext";
+import type { PortRange } from "./tryConfigureIngressUsingDockerfile";
 
 export interface IngressContext extends IContainerAppContext, ExecuteActivityContext {
     enableIngress?: boolean;
     enableExternal?: boolean;
 
     targetPort?: number;
+
+    // For detecting an expose port using a workspace Dockerfile
+    dockerfilePath?: string;
+    dockerfileExposePorts?: PortRange[];
+    alwaysPromptIngress?: boolean;
 }

src/commands/ingress/IngressPromptStep.ts

@@ -10,13 +10,18 @@ import { DisableIngressStep } from "./disableIngress/DisableIngressStep";
 import { TargetPortInputStep } from "./editTargetPort/TargetPortInputStep";
 import { EnableIngressStep } from "./enableIngress/EnableIngressStep";
 import { IngressVisibilityStep } from "./enableIngress/IngressVisibilityStep";
+import { tryConfigureIngressUsingDockerfile } from "./tryConfigureIngressUsingDockerfile";
 
 export class IngressPromptStep extends AzureWizardPromptStep<IngressContext> {
     public async prompt(context: IngressContext): Promise<void> {
         context.enableIngress = (await context.ui.showQuickPick([{ label: localize('enable', 'Enable'), data: true }, { label: localize('disable', 'Disable'), data: false }],
             { placeHolder: localize('enableIngress', 'Enable ingress for applications that need an HTTP endpoint.') })).data;
     }
 
+    public async configureBeforePrompt(context: IngressContext): Promise<void> {
+        await tryConfigureIngressUsingDockerfile(context);
+    }
+
     public shouldPrompt(context: IngressContext): boolean {
         return context.enableIngress === undefined;
     }

src/commands/ingress/editTargetPort/getDefaultPort.ts

@@ -6,5 +6,15 @@
 import type { IngressContext } from "../IngressContext";
 
 export function getDefaultPort(context: IngressContext, fallbackPort: number = 80): number {
-    return context.containerApp?.configuration?.ingress?.targetPort || fallbackPort;
+    const currentDeploymentPort: number | undefined = context.containerApp?.configuration?.ingress?.targetPort;
+
+    // If the new deployment's Dockerfile port range doesn't include the current deployed target port, suggest a new one in the appropriate EXPOSE range
+    let dockerfilePortSuggestion: number | undefined;
+    if (currentDeploymentPort && context.dockerfileExposePorts && !context.dockerfileExposePorts.some(p => p.includes(currentDeploymentPort))) {
+        dockerfilePortSuggestion = context.dockerfileExposePorts[0].start;
+    } else if (!currentDeploymentPort && context.dockerfileExposePorts) {
+        dockerfilePortSuggestion = context.dockerfileExposePorts[0].start;
+    }
+
+    return dockerfilePortSuggestion || currentDeploymentPort || fallbackPort;
 }

src/commands/ingress/tryConfigureIngressUsingDockerfile.ts

@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { AzExtFsExtra } from '@microsoft/vscode-azext-utils';
+import { ext } from '../../extensionVariables';
+import { localize } from '../../utils/localize';
+import { IngressContext } from './IngressContext';
+import { getDefaultPort } from './editTargetPort/getDefaultPort';
+
+export async function tryConfigureIngressUsingDockerfile(context: IngressContext): Promise<void> {
+    if (!context.dockerfilePath) {
+        return;
+    }
+
+    context.dockerfileExposePorts = await getDockerfileExposePort(context.dockerfilePath);
+
+    if (context.alwaysPromptIngress) {
+        return;
+    }
+
+    if (!context.dockerfileExposePorts) {
+        context.enableIngress = false;
+        context.enableExternal = false;
+    } else if (context.dockerfileExposePorts) {
+        context.enableIngress = true;
+        context.enableExternal = true;
+        context.targetPort = getDefaultPort(context);
+    }
+
+    // If a container app already exists, activity children will be added automatically in later execute steps
+    // if (!context.containerApp) {
+    //     context.activityChildren?.push(
+    //         new GenericTreeItem(undefined, {
+    //             contextValue: createActivityChildContext(['ingressPromptStep', activitySuccessContext]),
+    //             label: context.enableIngress ?
+    //                 localize('ingressEnableLabel', 'Enable ingress on port {0} (found Dockerfile configuration)', context.targetPort) :
+    //                 localize('ingressDisableLabel', 'Disable ingress (found Dockerfile configuration)'),
+    //             iconPath: activitySuccessIcon
+    //         })
+    //     );
+    // }
+
+    ext.outputChannel.appendLog(context.enableIngress ?
+        localize('ingressEnabledLabel', 'Detected ingress on port {0} using Dockerfile configuration.', context.targetPort) :
+        localize('ingressDisabledLabel', 'Detected no ingress using Dockerfile configuration.')
+    );
+}
+
+export class PortRange {
+    private readonly _start: number;
+    private readonly _end: number;
+
+    constructor(start: number, end?: number) {
+        this._start = start;
+        this._end = end ? end : start;
+    }
+
+    get start(): number {
+        return this._start;
+    }
+
+    get end(): number {
+        return this._end;
+    }
+
+    includes(port: number): boolean {
+        return port >= this.start && port <= this.end;
+    }
+}
+
+export async function getDockerfileExposePort(dockerfilePath: string): Promise<PortRange[] | undefined> {
+    if (!await AzExtFsExtra.pathExists(dockerfilePath)) {
+        return undefined;
+    }
+
+    const content: string = await AzExtFsExtra.readFile(dockerfilePath);
+    const lines: string[] = content.split('\n');
+
+    const portRanges: PortRange[] = [];
+    for (const line of lines) {
+        if (/^EXPOSE/i.test(line.trim())) {
+            // Identify all single port numbers that aren't for udp
+            const singlePorts: string[] = line.match(/(?<=\s)\d{2,5}(?!(\-)|(\/udp))\b/g) ?? [];
+            for (const sp of singlePorts) {
+                portRanges.push(new PortRange(parseInt(sp)));
+            }
+
+            // Identify all port ranges
+            const portRange: string[] = line.match(/\d{2,5}\-\d{2,5}/g) ?? [];
+            for (const pr of portRange) {
+                const [start, end] = pr.split('-');
+                portRanges.push(new PortRange(parseInt(start), parseInt(end)));
+            }
+        }
+    }
+
+    return portRanges.length ? portRanges : undefined;
+}

test/ingress/MockIngressContext.ts

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { PortRange } from "../../extension.bundle";
+
+export interface MockIngressContext {
+    containerApp?: { configuration: { ingress: { targetPort: number } } };
+
+    enableIngress?: boolean;
+    enableExternal?: boolean;
+
+    targetPort?: number;
+
+    dockerfilePath?: string;
+    dockerfileExposePorts?: PortRange[];
+    alwaysPromptIngress?: boolean;
+}