Updates

Author: MicroFish91

extension.bundle.ts

@@ -19,8 +19,9 @@ export * from '@microsoft/vscode-azext-utils';
 export * from './src/commands/deployWorkspaceProject/DeployWorkspaceProjectContext';
 export * from './src/commands/deployWorkspaceProject/getDefaultValues/DefaultResourcesNameStep';
 export * from './src/commands/ingress/IngressContext';
+export * from './src/commands/ingress/IngressPromptStep';
 export * from './src/commands/ingress/editTargetPort/getDefaultPort';
-export * from './src/commands/ingress/tryConfigureIngressUsingDockerfile';
+export * from './src/commands/ingress/tryGetDockerfileExposePorts';
 export { activate, deactivate } from './src/extension';
 export * from './src/extensionVariables';
 export * from './src/utils/validateUtils';

src/commands/ingress/IngressPromptStep.ts

@@ -4,13 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AzureWizardExecuteStep, AzureWizardPromptStep, IWizardOptions } from "@microsoft/vscode-azext-utils";
+import { ext } from "../../extensionVariables";
 import { localize } from "../../utils/localize";
 import type { IngressContext } from "./IngressContext";
 import { DisableIngressStep } from "./disableIngress/DisableIngressStep";
 import { TargetPortInputStep } from "./editTargetPort/TargetPortInputStep";
+import { getDefaultPort } from "./editTargetPort/getDefaultPort";
 import { EnableIngressStep } from "./enableIngress/EnableIngressStep";
 import { IngressVisibilityStep } from "./enableIngress/IngressVisibilityStep";
-import { tryConfigureIngressUsingDockerfile } from "./tryConfigureIngressUsingDockerfile";
+import { tryGetDockerfileExposePorts } from "./tryGetDockerfileExposePorts";
 
 export class IngressPromptStep extends AzureWizardPromptStep<IngressContext> {
     public async prompt(context: IngressContext): Promise<void> {
@@ -42,3 +44,42 @@ export class IngressPromptStep extends AzureWizardPromptStep<IngressContext> {
         return { promptSteps, executeSteps };
     }
 }
+
+export async function tryConfigureIngressUsingDockerfile(context: IngressContext): Promise<void> {
+    if (!context.dockerfilePath) {
+        return;
+    }
+
+    context.dockerfileExposePorts = await tryGetDockerfileExposePorts(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.')
+    );
+}

src/commands/ingress/tryConfigureIngressUsingDockerfile.ts

@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+*  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";
+
+export async function tryGetDockerfileExposePorts(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())) {
+            continue;
+        }
+
+        // Identify all single port numbers that aren't for udp
+        // Example formats: `3000` or `3000/tcp` but not `3000/udp`
+        // Note: (?<=\s) prevents the last number in a range 3000-3010 from being selected
+        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
+        // Example format: `3000-3010`
+        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;
+}
+
+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;
+    }
+}

src/commands/ingress/tryGetDockerfileExposePorts.ts

@@ -1,5 +1,5 @@
 ## Modified example from Azure-Samples/acr-build-helloworld-node
-FROM node:15-alpine
+FROM node:lts-alpine
 
 COPY . /src
 RUN cd /src && npm install

test/ingress/dockerfileSamples/sample1.Dockerfile

@@ -1,5 +1,5 @@
 ## Modified example from Azure-Samples/acr-build-helloworld-node
-FROM node:15-alpine
+FROM node:lts-alpine
 
 COPY . /src
 RUN cd /src && npm install

test/ingress/dockerfileSamples/sample2.Dockerfile

@@ -1,5 +1,5 @@
 ## Modified example from Azure-Samples/acr-build-helloworld-node
-FROM node:15-alpine
+FROM node:lts-alpine
 
 COPY . /src
 RUN cd /src && npm install

test/ingress/dockerfileSamples/sample3.Dockerfile

@@ -1,5 +1,5 @@
 ## Modified example from Azure-Samples/acr-build-helloworld-node
-FROM node:15-alpine
+FROM node:lts-alpine
 
 COPY . /src
 RUN cd /src && npm install

test/ingress/dockerfileSamples/sample4.Dockerfile

@@ -1,5 +1,5 @@
 ## Modified example from Azure-Samples/acr-build-helloworld-node
-FROM node:15-alpine
+FROM node:lts-alpine
 
 COPY . /src
 RUN cd /src && npm install

test/ingress/dockerfileSamples/sample5.Dockerfile

@@ -1,5 +1,5 @@
 ## Modified example from Azure-Samples/acr-build-helloworld-node
-FROM node:15-alpine
+FROM node:lts-alpine
 
 COPY . /src
 RUN cd /src && npm install