allow referencing external Features in devcontainer features test command

src/spec-configuration/containerFeaturesConfiguration.ts

@@ -776,7 +776,8 @@ export async function processFeatureIdentifier(output: Log, configPath: string,
 	// We expect all GitHub/registry features to follow the triple slash pattern at this point
 	//  eg: <publisher>/<feature-set>/<feature>
 	if (splitOnSlash.length !== 3 || splitOnSlash.some(x => x === '') || !allowedFeatureIdRegex.test(splitOnSlash[2])) {
-		output.write(`Invalid parse for GitHub Release feature: Follow format '<publisher>/<feature-set>/<feature>, or republish feature to OCI registry.'`, LogLevel.Error);
+		// This is the final fallback. If we end up here, we weren't able to resolve the Feature
+		output.write(`Could not resolve Feature '${userFeature.id}'.  Ensure the Feature is published and accessible from your current environment.`, LogLevel.Error);
 		return undefined;
 	}
 	const owner = splitOnSlash[0];

src/spec-node/featuresCLI/testCommandImpl.ts

@@ -330,13 +330,21 @@ async function generateProjectFromScenario(
 
 	let features = scenarioObject.features;
 	if (!scenarioObject || !features) {
-		fail(`Scenario '${scenarioId}' is missing features!`);
+		fail(`Scenario '${scenarioId}' is missing Features!`);
 		return ''; // Exits in the 'fail()' before this line is reached.
 	}
 
 	// Prefix the local path to the collections directory
 	let updatedFeatures: Record<string, string | boolean | Record<string, string | boolean>> = {};
 	for (const [featureId, featureValue] of Object.entries(features)) {
+		// Do not overwrite Features that are not part of the target collection
+		// The '/' is only valid in a fully qualified Feature ID (eg: '[ghcr].io/devcontainers/features/go')
+		// This lets you use external Features as a part of the test scenario.
+		if (featureId.indexOf('/') !== -1) {
+			updatedFeatures[featureId] = featureValue;
+			continue;
+		}
+
 		// Copy the feature source code to the temp folder
 		const pathToFeatureSource = `${collectionsDirectory}/src/${featureId}`;
 		await cpDirectoryLocal(pathToFeatureSource, `${tmpFolder}/.devcontainer/${featureId}`);

src/test/container-features/example-v2-features-sets/a-installs-after-b/src/a/devcontainer-feature.json

@@ -0,0 +1,7 @@
+{
+    "id": "a",
+    "version": "1.0.0",
+    "installsAfter": [
+        "./b"
+    ]
+}

src/test/container-features/example-v2-features-sets/a-installs-after-b/src/a/install.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+echo "Activating feature 'a'"
+
+touch /usr/local/bin/a
+
+# InstallsAfter Feature B
+
+if [ ! -f /usr/local/bin/b ]; then
+	echo "Feature B not available!"
+	exit 1
+fi

src/test/container-features/example-v2-features-sets/a-installs-after-b/src/b/devcontainer-feature.json

@@ -0,0 +1,4 @@
+{
+    "id": "b",
+    "version": "1.0.0"
+}

src/test/container-features/example-v2-features-sets/a-installs-after-b/src/b/install.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+echo "Activating feature 'b'"
+
+touch /usr/local/bin/b
+

src/test/container-features/example-v2-features-sets/a-installs-after-b/test/a/test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+test -f /usr/local/bin/a

src/test/container-features/example-v2-features-sets/a-installs-after-b/test/b/test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+test -f /usr/local/bin/b

src/test/container-features/example-v2-features-sets/b-installs-after-a/src/a/devcontainer-feature.json

@@ -0,0 +1,4 @@
+{
+    "id": "a",
+    "version": "1.0.0",
+}

src/test/container-features/example-v2-features-sets/b-installs-after-a/src/a/install.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+echo "Activating feature 'a'"
+
+touch /usr/local/bin/a
+

src/test/container-features/example-v2-features-sets/b-installs-after-a/src/b/devcontainer-feature.json

@@ -0,0 +1,7 @@
+{
+    "id": "b",
+    "version": "1.0.0",
+    "installsAfter": [
+        "./a"
+    ]
+}

src/test/container-features/example-v2-features-sets/b-installs-after-a/src/b/install.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+echo "Activating feature 'b'"
+
+touch /usr/local/bin/b
+
+# InstallsAfter Feature A
+if [ ! -f /usr/local/bin/a ]; then
+	echo "Feature A not available!"
+	exit 1
+fi

src/test/container-features/example-v2-features-sets/b-installs-after-a/test/a/test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+test -f /usr/local/bin/a

src/test/container-features/example-v2-features-sets/b-installs-after-a/test/b/test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+test -f /usr/local/bin/b

src/test/container-features/example-v2-features-sets/simple/test/_global/scenarios.json

@@ -9,5 +9,16 @@
 				"favorite": "Magenta"
 			}
 		}
+	},
+	"with_external_feature": {
+		"image": "mcr.microsoft.com/vscode/devcontainers/base:ubuntu",
+		"features": {
+			"hello": {
+				"greeting": "How ya doing"
+			},
+			"ghcr.io/devcontainers/feature-template/color:1": {
+				"favorite": "Silver"
+			}
+		}
 	}
 }

src/test/container-features/example-v2-features-sets/simple/test/_global/with_external_feature.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "correct color" color | grep "Silver"
+check "correct greeting" hello | grep "How ya doing"
+
+# Report result
+reportResults

src/test/container-features/featuresCLICommands.test.ts

@@ -41,7 +41,8 @@ describe('CLI features subcommands', async function () {
 ✅ Passed:      'color'
 ✅ Passed:      'specific_color_scenario'
 ✅ Passed:      'hello'
-✅ Passed:      'custom_options'`;
+✅ Passed:      'custom_options'
+✅ Passed:      'with_external_feature'`;
 		const hasExpectedTestReport = result.stdout.includes(expectedTestReport);
 		assert.isTrue(hasExpectedTestReport);
 
@@ -95,7 +96,8 @@ describe('CLI features subcommands', async function () {
 		assert.isDefined(result);
 
 		const expectedTestReport = `  ================== TEST REPORT ==================
-✅ Passed:      'custom_options'`;
+✅ Passed:      'custom_options'
+✅ Passed:      'with_external_feature'`;
 		const hasExpectedTestReport = result.stdout.includes(expectedTestReport);
 		assert.isTrue(hasExpectedTestReport);
 
@@ -124,6 +126,52 @@ describe('CLI features subcommands', async function () {
 		assert.isDefined(result.error);
 	});
 
+	// Feature A will crash in its install.sh if B has not already run.
+	it('features test subcommand installsAfter B -> A', async function () {
+		const collectionFolder = `${__dirname}/example-v2-features-sets/a-installs-after-b`;
+		let success = false;
+		let result: ExecResult | undefined = undefined;
+		try {
+			result = await shellExec(`${cli} features test --log-level trace ${collectionFolder}`);
+			success = true;
+
+		} catch (error) {
+			assert.fail('features test sub-command should not throw');
+		}
+
+		assert.isTrue(success);
+		assert.isDefined(result);
+
+		const expectedTestReport = `  ================== TEST REPORT ==================
+✅ Passed:      'a'
+✅ Passed:      'b'`;
+		const hasExpectedTestReport = result.stdout.includes(expectedTestReport);
+		assert.isTrue(hasExpectedTestReport);
+	});
+
+	// Feature B will crash in its install.sh if A has not already run.
+	it('features test subcommand installsAfter A -> B', async function () {
+		const collectionFolder = `${__dirname}/example-v2-features-sets/b-installs-after-a`;
+		let success = false;
+		let result: ExecResult | undefined = undefined;
+		try {
+			result = await shellExec(`${cli} features test --log-level trace ${collectionFolder}`);
+			success = true;
+
+		} catch (error) {
+			assert.fail('features test sub-command should not throw');
+		}
+
+		assert.isTrue(success);
+		assert.isDefined(result);
+
+		const expectedTestReport = `  ================== TEST REPORT ==================
+✅ Passed:      'a'
+✅ Passed:      'b'`;
+		const hasExpectedTestReport = result.stdout.includes(expectedTestReport);
+		assert.isTrue(hasExpectedTestReport);
+	});
+
 	// -- Packaging
 
 	it('features package subcommand by collection', async function () {