More misc updates

Author: MicroFish91

src/commands/ingress/IngressContext.ts

@@ -5,7 +5,7 @@
 
 import type { ExecuteActivityContext } from "@microsoft/vscode-azext-utils";
 import type { IContainerAppContext } from "../IContainerAppContext";
-import type { PortRange } from "./tryConfigureIngressUsingDockerfile";
+import { PortRange } from "./tryGetDockerfileExposePorts";
 
 export interface IngressContext extends IContainerAppContext, ExecuteActivityContext {
     enableIngress?: boolean;

test/ingress/tryConfigureIngressUsingDockerfile.test.ts

@@ -6,29 +6,20 @@
 import { AzExtFsExtra } from "@microsoft/vscode-azext-utils";
 import * as assert from "assert";
 import * as path from "path";
-import { IngressContext, PortRange, tryConfigureIngressUsingDockerfile, tryGetDockerfileExposePorts } from "../../extension.bundle";
+import { IngressContext, tryConfigureIngressUsingDockerfile } from "../../extension.bundle";
 import type { MockIngressContext } from "./MockIngressContext";
+import { expectedSamplePorts } from "./tryGetDockerfileExposePorts.test";
 
-const expectedSamplePorts: PortRange[][] = [
-    [new PortRange(443), new PortRange(80)],
-    [new PortRange(80), new PortRange(443)],
-    [new PortRange(80), new PortRange(8080, 8090)],
-    [new PortRange(80), new PortRange(8080, 8090)],
-    [new PortRange(443)],
-    [new PortRange(80), new PortRange(443), new PortRange(8080, 8090)],
-    []
-];
-
-suite('tryConfigureIngressUsingDockerfile', async () => {
-    test('self', async () => {
+suite('IngressPromptStep', async () => {
+    test('tryConfigureIngressUsingDockerfile', async () => {
         const dockerfileSamplesPath: string = path.join(__dirname, 'dockerfileSamples');
         const dockerfileSamples = await AzExtFsExtra.readDirectory(dockerfileSamplesPath);
 
         const expectedResult: MockIngressContext[] = [
             { enableIngress: true, enableExternal: true, dockerfileExposePorts: expectedSamplePorts[0], targetPort: 443 },
             { enableIngress: undefined, enableExternal: undefined, dockerfileExposePorts: undefined, targetPort: undefined }, // no dockerfilePath
             { enableIngress: true, enableExternal: true, dockerfileExposePorts: expectedSamplePorts[2], targetPort: 80 },
-            { enableIngress: undefined, enableExternal: undefined, dockerfileExposePorts: expectedSamplePorts[3], targetPort: undefined }, // alwaysPromptIngress
+            { enableIngress: undefined, enableExternal: undefined, dockerfileExposePorts: expectedSamplePorts[3], targetPort: undefined }, // alwaysPromptIngress=true
             { enableIngress: true, enableExternal: true, dockerfileExposePorts: expectedSamplePorts[4], targetPort: 443 },
             { enableIngress: true, enableExternal: true, dockerfileExposePorts: expectedSamplePorts[5], targetPort: 80 },
             { enableIngress: false, enableExternal: false, dockerfileExposePorts: undefined, targetPort: undefined }, // no expose
@@ -55,18 +46,4 @@ suite('tryConfigureIngressUsingDockerfile', async () => {
             });
         }
     });
-
-    test('tryGetDockerfileExposePorts', async () => {
-        const dockerfileSamplesPath: string = path.join(__dirname, 'dockerfileSamples');
-        const dockerfileSamples = await AzExtFsExtra.readDirectory(dockerfileSamplesPath);
-
-        for (const [i, ds] of dockerfileSamples.entries()) {
-            const portRange: PortRange[] = await tryGetDockerfileExposePorts(ds.fsPath) ?? [];
-
-            for (const [j, pr] of portRange.entries()) {
-                assert.equal(pr.start, expectedSamplePorts[i][j].start);
-                assert.equal(pr.end, expectedSamplePorts[i][j].end);
-            }
-        }
-    });
 });

test/ingress/tryGetDockerfileExposePorts.test.ts

@@ -0,0 +1,32 @@
+import * as assert from "assert";
+import * as path from "path";
+import { AzExtFsExtra, PortRange, tryGetDockerfileExposePorts } from "../../extension.bundle";
+
+/**
+ * Expected port values for the ingress Dockerfile test samples
+ */
+export const expectedSamplePorts: PortRange[][] = [
+    [new PortRange(443), new PortRange(80)],
+    [new PortRange(80), new PortRange(443)],
+    [new PortRange(80), new PortRange(8080, 8090)],
+    [new PortRange(80), new PortRange(8080, 8090)],
+    [new PortRange(443)],
+    [new PortRange(80), new PortRange(443), new PortRange(8080, 8090)],
+    []
+];
+
+suite('tryGetDockerfileExposePorts', async () => {
+    test('Should correctly detect all Dockerfile expose ports', async () => {
+        const dockerfileSamplesPath: string = path.join(__dirname, 'dockerfileSamples');
+        const dockerfileSamples = await AzExtFsExtra.readDirectory(dockerfileSamplesPath);
+
+        for (const [i, ds] of dockerfileSamples.entries()) {
+            const portRange: PortRange[] = await tryGetDockerfileExposePorts(ds.fsPath) ?? [];
+
+            for (const [j, pr] of portRange.entries()) {
+                assert.equal(pr.start, expectedSamplePorts[i][j].start);
+                assert.equal(pr.end, expectedSamplePorts[i][j].end);
+            }
+        }
+    });
+});