feat: Implement FEATURE_BUNDLE_1 RFC 0004

mwiebe · mwiebe · commit c36da06c9704 · 2026-02-03T22:45:05.000Z
Signed-off-by: Mark &lt;399551+mwiebe@users.noreply.github.com&gt;
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,8 +29,8 @@ classifiers = [
   "Intended Audience :: End Users/Desktop"
 ]
 dependencies = [
-  "openjd-sessions >= 0.10.3,< 0.11",
-  "openjd-model >= 0.8,< 0.9"
+  "openjd-sessions >= 0.10.7,< 0.11",
+  "openjd-model >= 0.9,< 0.10"
 ]
 
 [project.urls]
diff --git a/src/openjd/cli/_common/_extensions.py b/src/openjd/cli/_common/_extensions.py
@@ -4,7 +4,7 @@
 from typing import Optional
 
 # This is the list of Open Job Description extensions with implemented support
-SUPPORTED_EXTENSIONS = ["TASK_CHUNKING", "REDACTED_ENV_VARS"]
+SUPPORTED_EXTENSIONS = ["TASK_CHUNKING", "REDACTED_ENV_VARS", "FEATURE_BUNDLE_1"]
 
 
 def add_extensions_argument(run_parser: ArgumentParser):
diff --git a/test/openjd/cli/templates/feature_bundle_1_bash.yaml b/test/openjd/cli/templates/feature_bundle_1_bash.yaml
@@ -0,0 +1,9 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 Bash Syntax Sugar
+extensions:
+  - FEATURE_BUNDLE_1
+steps:
+  - name: BashStep
+    bash:
+      script: |
+        echo "Hello from Bash!"
diff --git a/test/openjd/cli/templates/feature_bundle_1_cmd.yaml b/test/openjd/cli/templates/feature_bundle_1_cmd.yaml
@@ -0,0 +1,9 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 Cmd Syntax Sugar
+extensions:
+  - FEATURE_BUNDLE_1
+steps:
+  - name: CmdStep
+    cmd:
+      script: |
+        echo Hello from Cmd!
diff --git a/test/openjd/cli/templates/feature_bundle_1_eol_auto.yaml b/test/openjd/cli/templates/feature_bundle_1_eol_auto.yaml
@@ -0,0 +1,17 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 EndOfLine AUTO
+extensions:
+  - FEATURE_BUNDLE_1
+steps:
+  - name: EOLStep
+    script:
+      embeddedFiles:
+        - name: TestFile
+          type: TEXT
+          filename: test_eol.txt
+          data: "line1\nline2\nline3"
+          endOfLine: AUTO
+      actions:
+        onRun:
+          command: bash
+          args: ["-c", "cat '{{Task.File.TestFile}}' | od -c -w100"]
diff --git a/test/openjd/cli/templates/feature_bundle_1_eol_crlf.yaml b/test/openjd/cli/templates/feature_bundle_1_eol_crlf.yaml
@@ -0,0 +1,17 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 EndOfLine CRLF
+extensions:
+  - FEATURE_BUNDLE_1
+steps:
+  - name: EOLStep
+    script:
+      embeddedFiles:
+        - name: TestFile
+          type: TEXT
+          filename: test_eol.txt
+          data: "line1\nline2\nline3"
+          endOfLine: CRLF
+      actions:
+        onRun:
+          command: bash
+          args: ["-c", "cat '{{Task.File.TestFile}}' | od -c -w100"]
diff --git a/test/openjd/cli/templates/feature_bundle_1_eol_lf.yaml b/test/openjd/cli/templates/feature_bundle_1_eol_lf.yaml
@@ -0,0 +1,17 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 EndOfLine LF
+extensions:
+  - FEATURE_BUNDLE_1
+steps:
+  - name: EOLStep
+    script:
+      embeddedFiles:
+        - name: TestFile
+          type: TEXT
+          filename: test_eol.txt
+          data: "line1\nline2\nline3"
+          endOfLine: LF
+      actions:
+        onRun:
+          command: bash
+          args: ["-c", "cat '{{Task.File.TestFile}}' | od -c -w100"]
diff --git a/test/openjd/cli/templates/feature_bundle_1_long_name.yaml b/test/openjd/cli/templates/feature_bundle_1_long_name.yaml
@@ -0,0 +1,11 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 Extended Step Name
+extensions:
+  - FEATURE_BUNDLE_1
+steps:
+  - name: ThisIsAVeryLongStepNameThatExceedsTheSixtyFourCharacterLimitButIsAllowedWithFeatureBundle1Extension
+    script:
+      actions:
+        onRun:
+          command: bash
+          args: ["-c", "echo 'Long step name works!'"]
diff --git a/test/openjd/cli/templates/feature_bundle_1_powershell.yaml b/test/openjd/cli/templates/feature_bundle_1_powershell.yaml
@@ -0,0 +1,9 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 PowerShell Syntax Sugar
+extensions:
+  - FEATURE_BUNDLE_1
+steps:
+  - name: PowerShellStep
+    powershell:
+      script: |
+        Write-Host "Hello from PowerShell!"
diff --git a/test/openjd/cli/templates/feature_bundle_1_python.yaml b/test/openjd/cli/templates/feature_bundle_1_python.yaml
@@ -0,0 +1,9 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 Python Syntax Sugar
+extensions:
+  - FEATURE_BUNDLE_1
+steps:
+  - name: PythonStep
+    python:
+      script: |
+        print("Hello from Python!")
diff --git a/test/openjd/cli/templates/feature_bundle_1_timeout.yaml b/test/openjd/cli/templates/feature_bundle_1_timeout.yaml
@@ -0,0 +1,16 @@
+specificationVersion: jobtemplate-2023-09
+name: FB1 Format String Timeout
+extensions:
+  - FEATURE_BUNDLE_1
+parameterDefinitions:
+  - name: Timeout
+    type: INT
+    default: 5
+steps:
+  - name: TimeoutStep
+    script:
+      actions:
+        onRun:
+          command: bash
+          args: ["-c", "echo Running with timeout {{Param.Timeout}}s; sleep 1"]
+          timeout: "{{Param.Timeout}}"
diff --git a/test/openjd/cli/test_feature_bundle_1.py b/test/openjd/cli/test_feature_bundle_1.py
@@ -0,0 +1,91 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+"""Tests for FEATURE_BUNDLE_1 extension support in the CLI."""
+
+import os
+from pathlib import Path
+
+import pytest
+
+from . import run_openjd_cli_main
+
+TEMPLATES_DIR = Path(__file__).parent / "templates"
+
+
+class TestFeatureBundle1:
+    """Tests for FEATURE_BUNDLE_1 extension features."""
+
+    def test_python_syntax_sugar(self, capsys) -> None:
+        """Test that Python syntax sugar works."""
+        template = TEMPLATES_DIR / "feature_bundle_1_python.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        assert "Hello from Python!" in outerr.out
+
+    def test_bash_syntax_sugar(self, capsys) -> None:
+        """Test that Bash syntax sugar works."""
+        template = TEMPLATES_DIR / "feature_bundle_1_bash.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        assert "Hello from Bash!" in outerr.out
+
+    @pytest.mark.skipif(os.name != "nt", reason="PowerShell only available on Windows")
+    def test_powershell_syntax_sugar(self, capsys) -> None:
+        """Test that PowerShell syntax sugar works."""
+        template = TEMPLATES_DIR / "feature_bundle_1_powershell.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        assert "Hello from PowerShell!" in outerr.out
+
+    @pytest.mark.skipif(os.name != "nt", reason="cmd only available on Windows")
+    def test_cmd_syntax_sugar(self, capsys) -> None:
+        """Test that cmd syntax sugar works."""
+        template = TEMPLATES_DIR / "feature_bundle_1_cmd.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        assert "Hello from Cmd!" in outerr.out
+
+    def test_format_string_timeout(self, capsys) -> None:
+        """Test that format string timeout is resolved."""
+        template = TEMPLATES_DIR / "feature_bundle_1_timeout.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        assert "Running with timeout 5s" in outerr.out
+
+    def test_extended_step_name(self, capsys) -> None:
+        """Test that extended step names (>64 chars) work with extension."""
+        template = TEMPLATES_DIR / "feature_bundle_1_long_name.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        assert "Long step name works!" in outerr.out
+
+    def test_end_of_line_lf(self, capsys) -> None:
+        """Test that endOfLine: LF produces LF-only line endings."""
+        template = TEMPLATES_DIR / "feature_bundle_1_eol_lf.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        # od -c output should show \n without \r
+        assert r"l   i   n   e   1  \n   l   i   n   e   2  \n   l   i   n   e   3" in outerr.out
+
+    def test_end_of_line_crlf(self, capsys) -> None:
+        """Test that endOfLine: CRLF produces CRLF line endings."""
+        template = TEMPLATES_DIR / "feature_bundle_1_eol_crlf.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        # od -c output should show \r\n
+        assert (
+            r"l   i   n   e   1  \r  \n   l   i   n   e   2  \r  \n   l   i   n   e   3"
+            in outerr.out
+        )
+
+    def test_end_of_line_auto(self, capsys) -> None:
+        """Test that endOfLine: AUTO produces platform-native line endings."""
+        template = TEMPLATES_DIR / "feature_bundle_1_eol_auto.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["run", str(template)], expected_exit_code=0)
+        if os.name == "nt":
+            assert (
+                r"l   i   n   e   1  \r  \n   l   i   n   e   2  \r  \n   l   i   n   e   3"
+                in outerr.out
+            )
+        else:
+            assert (
+                r"l   i   n   e   1  \n   l   i   n   e   2  \n   l   i   n   e   3" in outerr.out
+            )
+
+    def test_check_validates_extension(self, capsys) -> None:
+        """Test that check command validates templates with extension."""
+        template = TEMPLATES_DIR / "feature_bundle_1_python.yaml"
+        outerr = run_openjd_cli_main(capsys, args=["check", str(template)], expected_exit_code=0)
+        assert "passes validation checks" in outerr.out

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ classifiers = [`
`29`	`29`	`"Intended Audience :: End Users/Desktop"`
`30`	`30`	`]`
`31`	`31`	`dependencies = [`
`32`		`- "openjd-sessions >= 0.10.3,< 0.11",`
`33`		`- "openjd-model >= 0.8,< 0.9"`
	`32`	`+ "openjd-sessions >= 0.10.7,< 0.11",`
	`33`	`+ "openjd-model >= 0.9,< 0.10"`
`34`	`34`	`]`
`35`	`35`
`36`	`36`	`[project.urls]`