openjd-cli 0.4.4__tar.gz → 0.6.0__tar.gz

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: openjd-cli
-Version: 0.4.4
+Version: 0.6.0
 Summary: Provides a command-line interface for working with Open Job Description templates.
 Project-URL: Homepage, https://github.com/OpenJobDescription/openjd-cli
 Project-URL: Source, https://github.com/OpenJobDescription/openjd-cli
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
-Requires-Dist: openjd-model==0.4.*
-Requires-Dist: openjd-sessions==0.8.*
+Requires-Dist: openjd-model==0.7.*
+Requires-Dist: openjd-sessions<0.11,>=0.10.1
 Description-Content-Type: text/markdown
 
 ## Open Job Description - CLI
@@ -50,13 +50,13 @@ This library requires:
 
 ## Versioning
 
-This package's version follows [Semantic Versioning 2.0](https://semver.org/), but is still considered to be in its 
+This package's version follows [Semantic Versioning 2.0](https://semver.org/), but is still considered to be in its
 initial development, thus backwards incompatible versions are denoted by minor version bumps. To help illustrate how
 versions will increment during this initial development stage, they are described below:
 
-1. The MAJOR version is currently 0, indicating initial development. 
-2. The MINOR version is currently incremented when backwards incompatible changes are introduced to the public API. 
-3. The PATCH version is currently incremented when bug fixes or backwards compatible changes are introduced to the public API. 
+1. The MAJOR version is currently 0, indicating initial development.
+2. The MINOR version is currently incremented when backwards incompatible changes are introduced to the public API.
+3. The PATCH version is currently incremented when bug fixes or backwards compatible changes are introduced to the public API.
 
 ## Contributing
 
@@ -92,7 +92,7 @@ Template at '/path/to/job.template.json' passes validation checks!
 
 ### `summary`
 
-Displays summary information about a sample Job or Step, and the Steps and Tasks therein. The user may provide parameters to 
+Displays summary information about a sample Job or Step, and the Steps and Tasks therein. The user may provide parameters to
 customize the Job, as parameters can have an impact on the amount of Steps and Tasks that a job consists of.
 
 #### Arguments
@@ -173,7 +173,7 @@ Session ended successfully
 Job: MyJob
 Step: Step1
 Duration: 1.0 seconds
-Tasks run: 1
+Chunks run: 1
 
 ```
 
@@ -205,109 +205,16 @@ You can download this package from:
 
 ### Verifying GitHub Releases
 
-You can verify the authenticity of the release artifacts using the `gpg` command line tool.
-
-1) Download the desired release artifacts from the GitHub releases page. Make sure to download the corresponding PGP signature file (ending with `.sig`) as well.
-For example, if you would like to verify your download of the wheel for version `1.2.3`, you should have the following files downloaded:
-    ```
-    openjd_cli-1.2.3-py3-none-any.whl
-    openjd_cli-1.2.3-py3-none-any.whl.sig
-    ```
-
-2) Install the `gpg` command line tool. The installation process varies by operating system. Please refer to the GnuPG website for instructions: https://gnupg.org/download/
-
-3) Save the following contents to a file called `openjobdescription-pgp.asc`:
-    ```
-    -----BEGIN PGP PUBLIC KEY BLOCK-----
-    
-    mQINBGXGjx0BEACdChrQ/nch2aYGJ4fxHNQwlPE42jeHECqTdlc1V/mug+7qN7Pc
-    C4NQk4t68Y72WX/NG49gRfpAxPlSeNt18c3vJ9/sWTukmonWYGK0jQGnDWjuVgFT
-    XtvJAAQBFilQXN8h779Th2lEuD4bQX+mGB7l60Xvh7vIehE3C4Srbp6KJXskPLPo
-    dz/dx7a+GXRiyYCYbGX4JziXSjQZRc0tIaxLn/GDm7VnXpdHcUk3qJitree61oC8
-    agtRHCH5s56E8wt8fXzyStElMkFIZsoLDlLp5lFqT81En9ho/+K6RLBkIj0mC8G7
-    BafpHKlxkrIgNK3pWACL93GE6xihqwkZMCAeqloVvkOTdfAKDHuDSEHwKxHG3cZ1
-    /e1YhtkPMVF+NMeoQavykUGVUT1bRoVNdk6bYsnbUjUI1A+JNf6MqvdRJyckZqEC
-    ylkBekBp/SFpFHvQkRCpfVizm2GSrjdZKgXpm1ZlQJyMRVzc/XPbqdSWhz52r3IC
-    eudwReHDc+6J5rs6tg3NbFfPVfCBMSqHlu1HRewWAllIp1+y6nfL4U3iEsUvZ1Y6
-    IV3defHIP3kNPU14ZWf3G5rvJDZrIRnjoWhDcaVmivmB/cSdDzphL5FovSI8dsPm
-    iU/JZGQb3EvZq+nl4pOiK32hETJ/fgCCzgUA3WqGeFNUNSI9KYZgBe6daQARAQAB
-    tDRPcGVuIEpvYiBEZXNjcmlwdGlvbiA8b3BlbmpvYmRlc2NyaXB0aW9uQGFtYXpv
-    bi5jb20+iQJXBBMBCABBFiEEvBcWYrv5OB7Tl2sZovDwWbzECYcFAmXGjx0DGy8E
-    BQkDwmcABQsJCAcCAiICBhUKCQgLAgMWAgECHgcCF4AACgkQovDwWbzECYcSHRAA
-    itPYx48xnJiT6tfnult9ZGivhcXhrMlvirVYOqEtRrt0l18sjr84K8mV71eqFwMx
-    GS7e4iQP6guqW9biQfMA5/Id8ZjE7jNbF0LUGsY6Ktj+yOlAbTR+x5qr7Svb7oEs
-    TMB/l9HBZ1WtIRzcUk9XYqzvYQr5TT997A63F28u32RchJ+5ECAz4g/p91aWxwVo
-    HIfN10sGzttoukJCzC10CZAVscJB+nnoUbB/o3bPak6GUxBHpMgomb0K5g4Z4fXY
-    4AZ9jKFoLgNcExdwteiUdSEnRorZ5Ny8sP84lwJziD3wuamVUsZ1C/KiQJBGTp5e
-    LUY38J1oIwptw5fqjaAq2GQxEaIknWQ4fr3ZvNYUuGUt5FbHe5U5XF34gC8PK7v7
-    bT/7sVdZZzKFScDLfH5N36M5FrXfTaXsVbfrRoa2j7U0kndyVEZyJsKVAQ8vgwbJ
-    w/w2hKkyQLAg3l5yO5CHLGatsfSIzea4WoOAaroxiNtL9gzVXzqpw6qPEsH9hsws
-    HsPEQWXHmDQvFTNUU14qic1Vc5fyxCBXIAGAPBd20b+219XznJ5uBKUgtvnqcItj
-    nMYe6Btxh+pjrTA15X/p81z6sB7dkL1hPHfawLhCEzJbIPyyBTQYqY00/ap4Rj7t
-    kzSiyzBejniFfAZ6eYBWsej7uXUsVndBF1ggZynPTeE=
-    =iaEm
-    -----END PGP PUBLIC KEY BLOCK-----
-    ```
-
-4) Import the OpenPGP key for Open Job Description by running the following command:
-
-    ```
-    gpg --import --armor openjobdescription-pgp.asc
-    ```
-
-5) Determine whether to trust the OpenPGP key. Some factors to consider when deciding whether or not to trust the above key are:
-
-    - The internet connection you’ve used to obtain the GPG key from this website is secure
-    - The device that you are accessing this website on is secure
-
-    If you have decided to trust the OpenPGP key, then edit the key to trust with `gpg` like the following example:
-    ```
-    $ gpg --edit-key A2F0F059BCC40987
-    gpg (GnuPG) 2.0.22; Copyright (C) 2013 Free Software Foundation, Inc.
-    This is free software: you are free to change and redistribute it.
-    There is NO WARRANTY, to the extent permitted by law.
-    
-    
-    pub  4096R/BCC40987  created: 2024-02-09  expires: 2026-02-08  usage: SCEA
-                         trust: unknown       validity: unknown
-    [ unknown] (1). Open Job Description <openjobdescription@amazon.com>
-    
-    gpg> trust
-    pub  4096R/BCC40987  created: 2024-02-09  expires: 2026-02-08  usage: SCEA
-                         trust: unknown       validity: unknown
-    [ unknown] (1). Open Job Description <openjobdescription@amazon.com>
-    
-    Please decide how far you trust this user to correctly verify other users' keys
-    (by looking at passports, checking fingerprints from different sources, etc.)
-    
-      1 = I don't know or won't say
-      2 = I do NOT trust
-      3 = I trust marginally
-      4 = I trust fully
-      5 = I trust ultimately
-      m = back to the main menu
-    
-    Your decision? 5
-    Do you really want to set this key to ultimate trust? (y/N) y
-    
-    pub  4096R/BCC40987  created: 2024-02-09  expires: 2026-02-08  usage: SCEA
-                         trust: ultimate      validity: unknown
-    [ unknown] (1). Open Job Description <openjobdescription@amazon.com>
-    Please note that the shown key validity is not necessarily correct
-    unless you restart the program.
-    
-    gpg> quit
-    ```
-
-6) Verify the signature of the Open Job Description release via `gpg --verify`. The command for verifying the example files from step 1 would be:
-
-    ```
-    gpg --verify ./openjd_cli-1.2.3-py3-none-any.whl.sig ./openjd_cli-1.2.3-py3-none-any.whl
-    ```
+See [VERIFYING_PGP_SIGNATURE](VERIFYING_PGP_SIGNATURE.md) for more information.
 
 ## Security
 
-See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information.
+We take all security reports seriously. When we receive such reports, we will
+investigate and subsequently address any potential vulnerabilities as quickly
+as possible. If you discover a potential security issue in this project, please
+notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/)
+or directly via email to [AWS Security](aws-security@amazon.com). Please do not
+create a public GitHub issue in this project.
 
 ## License
 

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/README.md

@@ -22,13 +22,13 @@ This library requires:
 
 ## Versioning
 
-This package's version follows [Semantic Versioning 2.0](https://semver.org/), but is still considered to be in its 
+This package's version follows [Semantic Versioning 2.0](https://semver.org/), but is still considered to be in its
 initial development, thus backwards incompatible versions are denoted by minor version bumps. To help illustrate how
 versions will increment during this initial development stage, they are described below:
 
-1. The MAJOR version is currently 0, indicating initial development. 
-2. The MINOR version is currently incremented when backwards incompatible changes are introduced to the public API. 
-3. The PATCH version is currently incremented when bug fixes or backwards compatible changes are introduced to the public API. 
+1. The MAJOR version is currently 0, indicating initial development.
+2. The MINOR version is currently incremented when backwards incompatible changes are introduced to the public API.
+3. The PATCH version is currently incremented when bug fixes or backwards compatible changes are introduced to the public API.
 
 ## Contributing
 
@@ -64,7 +64,7 @@ Template at '/path/to/job.template.json' passes validation checks!
 
 ### `summary`
 
-Displays summary information about a sample Job or Step, and the Steps and Tasks therein. The user may provide parameters to 
+Displays summary information about a sample Job or Step, and the Steps and Tasks therein. The user may provide parameters to
 customize the Job, as parameters can have an impact on the amount of Steps and Tasks that a job consists of.
 
 #### Arguments
@@ -145,7 +145,7 @@ Session ended successfully
 Job: MyJob
 Step: Step1
 Duration: 1.0 seconds
-Tasks run: 1
+Chunks run: 1
 
 ```
 
@@ -177,109 +177,16 @@ You can download this package from:
 
 ### Verifying GitHub Releases
 
-You can verify the authenticity of the release artifacts using the `gpg` command line tool.
-
-1) Download the desired release artifacts from the GitHub releases page. Make sure to download the corresponding PGP signature file (ending with `.sig`) as well.
-For example, if you would like to verify your download of the wheel for version `1.2.3`, you should have the following files downloaded:
-    ```
-    openjd_cli-1.2.3-py3-none-any.whl
-    openjd_cli-1.2.3-py3-none-any.whl.sig
-    ```
-
-2) Install the `gpg` command line tool. The installation process varies by operating system. Please refer to the GnuPG website for instructions: https://gnupg.org/download/
-
-3) Save the following contents to a file called `openjobdescription-pgp.asc`:
-    ```
-    -----BEGIN PGP PUBLIC KEY BLOCK-----
-    
-    mQINBGXGjx0BEACdChrQ/nch2aYGJ4fxHNQwlPE42jeHECqTdlc1V/mug+7qN7Pc
-    C4NQk4t68Y72WX/NG49gRfpAxPlSeNt18c3vJ9/sWTukmonWYGK0jQGnDWjuVgFT
-    XtvJAAQBFilQXN8h779Th2lEuD4bQX+mGB7l60Xvh7vIehE3C4Srbp6KJXskPLPo
-    dz/dx7a+GXRiyYCYbGX4JziXSjQZRc0tIaxLn/GDm7VnXpdHcUk3qJitree61oC8
-    agtRHCH5s56E8wt8fXzyStElMkFIZsoLDlLp5lFqT81En9ho/+K6RLBkIj0mC8G7
-    BafpHKlxkrIgNK3pWACL93GE6xihqwkZMCAeqloVvkOTdfAKDHuDSEHwKxHG3cZ1
-    /e1YhtkPMVF+NMeoQavykUGVUT1bRoVNdk6bYsnbUjUI1A+JNf6MqvdRJyckZqEC
-    ylkBekBp/SFpFHvQkRCpfVizm2GSrjdZKgXpm1ZlQJyMRVzc/XPbqdSWhz52r3IC
-    eudwReHDc+6J5rs6tg3NbFfPVfCBMSqHlu1HRewWAllIp1+y6nfL4U3iEsUvZ1Y6
-    IV3defHIP3kNPU14ZWf3G5rvJDZrIRnjoWhDcaVmivmB/cSdDzphL5FovSI8dsPm
-    iU/JZGQb3EvZq+nl4pOiK32hETJ/fgCCzgUA3WqGeFNUNSI9KYZgBe6daQARAQAB
-    tDRPcGVuIEpvYiBEZXNjcmlwdGlvbiA8b3BlbmpvYmRlc2NyaXB0aW9uQGFtYXpv
-    bi5jb20+iQJXBBMBCABBFiEEvBcWYrv5OB7Tl2sZovDwWbzECYcFAmXGjx0DGy8E
-    BQkDwmcABQsJCAcCAiICBhUKCQgLAgMWAgECHgcCF4AACgkQovDwWbzECYcSHRAA
-    itPYx48xnJiT6tfnult9ZGivhcXhrMlvirVYOqEtRrt0l18sjr84K8mV71eqFwMx
-    GS7e4iQP6guqW9biQfMA5/Id8ZjE7jNbF0LUGsY6Ktj+yOlAbTR+x5qr7Svb7oEs
-    TMB/l9HBZ1WtIRzcUk9XYqzvYQr5TT997A63F28u32RchJ+5ECAz4g/p91aWxwVo
-    HIfN10sGzttoukJCzC10CZAVscJB+nnoUbB/o3bPak6GUxBHpMgomb0K5g4Z4fXY
-    4AZ9jKFoLgNcExdwteiUdSEnRorZ5Ny8sP84lwJziD3wuamVUsZ1C/KiQJBGTp5e
-    LUY38J1oIwptw5fqjaAq2GQxEaIknWQ4fr3ZvNYUuGUt5FbHe5U5XF34gC8PK7v7
-    bT/7sVdZZzKFScDLfH5N36M5FrXfTaXsVbfrRoa2j7U0kndyVEZyJsKVAQ8vgwbJ
-    w/w2hKkyQLAg3l5yO5CHLGatsfSIzea4WoOAaroxiNtL9gzVXzqpw6qPEsH9hsws
-    HsPEQWXHmDQvFTNUU14qic1Vc5fyxCBXIAGAPBd20b+219XznJ5uBKUgtvnqcItj
-    nMYe6Btxh+pjrTA15X/p81z6sB7dkL1hPHfawLhCEzJbIPyyBTQYqY00/ap4Rj7t
-    kzSiyzBejniFfAZ6eYBWsej7uXUsVndBF1ggZynPTeE=
-    =iaEm
-    -----END PGP PUBLIC KEY BLOCK-----
-    ```
-
-4) Import the OpenPGP key for Open Job Description by running the following command:
-
-    ```
-    gpg --import --armor openjobdescription-pgp.asc
-    ```
-
-5) Determine whether to trust the OpenPGP key. Some factors to consider when deciding whether or not to trust the above key are:
-
-    - The internet connection you’ve used to obtain the GPG key from this website is secure
-    - The device that you are accessing this website on is secure
-
-    If you have decided to trust the OpenPGP key, then edit the key to trust with `gpg` like the following example:
-    ```
-    $ gpg --edit-key A2F0F059BCC40987
-    gpg (GnuPG) 2.0.22; Copyright (C) 2013 Free Software Foundation, Inc.
-    This is free software: you are free to change and redistribute it.
-    There is NO WARRANTY, to the extent permitted by law.
-    
-    
-    pub  4096R/BCC40987  created: 2024-02-09  expires: 2026-02-08  usage: SCEA
-                         trust: unknown       validity: unknown
-    [ unknown] (1). Open Job Description <openjobdescription@amazon.com>
-    
-    gpg> trust
-    pub  4096R/BCC40987  created: 2024-02-09  expires: 2026-02-08  usage: SCEA
-                         trust: unknown       validity: unknown
-    [ unknown] (1). Open Job Description <openjobdescription@amazon.com>
-    
-    Please decide how far you trust this user to correctly verify other users' keys
-    (by looking at passports, checking fingerprints from different sources, etc.)
-    
-      1 = I don't know or won't say
-      2 = I do NOT trust
-      3 = I trust marginally
-      4 = I trust fully
-      5 = I trust ultimately
-      m = back to the main menu
-    
-    Your decision? 5
-    Do you really want to set this key to ultimate trust? (y/N) y
-    
-    pub  4096R/BCC40987  created: 2024-02-09  expires: 2026-02-08  usage: SCEA
-                         trust: ultimate      validity: unknown
-    [ unknown] (1). Open Job Description <openjobdescription@amazon.com>
-    Please note that the shown key validity is not necessarily correct
-    unless you restart the program.
-    
-    gpg> quit
-    ```
-
-6) Verify the signature of the Open Job Description release via `gpg --verify`. The command for verifying the example files from step 1 would be:
-
-    ```
-    gpg --verify ./openjd_cli-1.2.3-py3-none-any.whl.sig ./openjd_cli-1.2.3-py3-none-any.whl
-    ```
+See [VERIFYING_PGP_SIGNATURE](VERIFYING_PGP_SIGNATURE.md) for more information.
 
 ## Security
 
-See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information.
+We take all security reports seriously. When we receive such reports, we will
+investigate and subsequently address any potential vulnerabilities as quickly
+as possible. If you discover a potential security issue in this project, please
+notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/)
+or directly via email to [AWS Security](aws-security@amazon.com). Please do not
+create a public GitHub issue in this project.
 
 ## License
 

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/hatch.toml

@@ -21,7 +21,7 @@ lint = [
 ]
 
 [[envs.all.matrix]]
-python = ["3.9", "3.10", "3.11"]
+python = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
 [envs.codebuild.scripts]
 build = "hatch build"

openjd_cli-0.4.4/openjd/cli/_run/_local_session/__init__.py → openjd_cli-0.6.0/openjd/__main__.py

@@ -1 +1,6 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+from .cli._create_argparser import main
+
+
+main()

openjd_cli-0.6.0/openjd/cli/__init__.py

@@ -0,0 +1,5 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+from ._create_argparser import main
+
+__all__ = ["main"]

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/openjd/cli/_check/__init__.py

@@ -1,7 +1,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 from .._common import add_common_arguments, CommonArgument, SubparserGroup
-from ._check_command import do_check
+from ._check_command import add_check_arguments, do_check
 
 
 def populate_argparser(subcommands: SubparserGroup) -> None:
@@ -12,7 +12,7 @@ def populate_argparser(subcommands: SubparserGroup) -> None:
         description="Given an Open Job Description template file, parse the file and run validation checks against it to ensure that it is correctly formed.",
     )
 
-    # `check` has no unique arguments;
     # add all arguments through `add_common_arguments`
     add_common_arguments(check_parser, {CommonArgument.PATH})
+    add_check_arguments(check_parser)
     check_parser.set_defaults(func=do_check)

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/openjd/cli/_check/_check_command.py

@@ -1,6 +1,6 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-from argparse import Namespace
+from argparse import ArgumentParser, Namespace
 from openjd.model import (
     DecodeValidationError,
     TemplateSpecificationVersion,
@@ -8,13 +8,25 @@ from openjd.model import (
     decode_environment_template,
 )
 
-from .._common import read_template, OpenJDCliResult, print_cli_result
+from .._common import (
+    add_extensions_argument,
+    read_template,
+    OpenJDCliResult,
+    print_cli_result,
+    process_extensions_argument,
+)
+
+
+def add_check_arguments(run_parser: ArgumentParser):
+    add_extensions_argument(run_parser)
 
 
 @print_cli_result
 def do_check(args: Namespace) -> OpenJDCliResult:
     """Open a provided template file and check its schema for errors."""
 
+    extensions = process_extensions_argument(args.extensions)
+
     try:
         # Raises: RuntimeError
         template_object = read_template(args.path)
@@ -27,7 +39,7 @@ def do_check(args: Namespace) -> OpenJDCliResult:
 
         # Raises: DecodeValidationError
         if TemplateSpecificationVersion.is_job_template(template_version):
-            decode_job_template(template=template_object)
+            decode_job_template(template=template_object, supported_extensions=extensions)
         elif TemplateSpecificationVersion.is_environment_template(template_version):
             decode_environment_template(template=template_object)
         else:

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/openjd/cli/_common/__init__.py

@@ -9,6 +9,7 @@ import json
 import yaml
 import os
 
+from ._extensions import add_extensions_argument, process_extensions_argument
 from ._job_from_template import (
     job_from_template,
     get_job_params,
@@ -23,9 +24,11 @@ from ._validation_utils import (
 from openjd.model import DecodeValidationError, Job
 
 __all__ = [
+    "add_extensions_argument",
     "get_doc_type",
     "get_job_params",
     "get_params_from_file",
+    "process_extensions_argument",
     "read_template",
     "read_job_template",
     "read_environment_template",
@@ -109,10 +112,10 @@ class SubparserGroup:
         return self.group.add_parser(name, **kwargs)
 
 
-def generate_job(args: Namespace) -> Job:
+def generate_job(args: Namespace, *, supported_extensions: list[str]) -> Job:
     try:
         # Raises: RuntimeError, DecodeValidationError
-        template = read_job_template(args.path)
+        template = read_job_template(args.path, supported_extensions=supported_extensions)
         # Raises: RuntimeError
         return job_from_template(
             template,

openjd_cli-0.6.0/openjd/cli/_common/_extensions.py

@@ -0,0 +1,34 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+from argparse import ArgumentParser
+from typing import Optional
+
+# This is the list of Open Job Description extensions with implemented support
+SUPPORTED_EXTENSIONS = ["TASK_CHUNKING"]
+
+
+def add_extensions_argument(run_parser: ArgumentParser):
+    run_parser.add_argument(
+        "--extensions",
+        help=f"A comma-separated list of Open Job Description extension names to enable. Defaults to all that are implemented: {','.join(SUPPORTED_EXTENSIONS)}",
+    )
+
+
+def process_extensions_argument(extensions: Optional[str]) -> list[str]:
+    """Process the comma-separated extensions argument and return a list of supported extensions."""
+
+    # If the option is not provided, default to all the supported extensions.
+    if extensions is None:
+        return SUPPORTED_EXTENSIONS
+
+    extensions_list = [
+        extension.strip().upper() for extension in extensions.split(",") if extension.strip() != ""
+    ]
+
+    unsupported_extensions = set(extensions_list) - set(SUPPORTED_EXTENSIONS)
+    if unsupported_extensions:
+        raise ValueError(
+            f"Unsupported Open Job Description extension(s): {', '.join(sorted(unsupported_extensions))}"
+        )
+
+    return extensions_list

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/openjd/cli/_common/_validation_utils.py

@@ -53,7 +53,7 @@ def read_template(template_file: Path) -> dict[str, Any]:
     return template_object
 
 
-def read_job_template(template_file: Path) -> JobTemplate:
+def read_job_template(template_file: Path, *, supported_extensions: list[str]) -> JobTemplate:
     """Open a JSON or YAML-formatted file and attempt to parse it into a JobTemplate object.
     Raises a RuntimeError if the file doesn't exist or can't be opened, and raises a
     DecodeValidationError if its contents can't be parsed into a valid JobTemplate.
@@ -62,7 +62,9 @@ def read_job_template(template_file: Path) -> JobTemplate:
     template_object = read_template(template_file)
 
     # Raises: DecodeValidationError
-    template = decode_job_template(template=template_object)
+    template = decode_job_template(
+        template=template_object, supported_extensions=supported_extensions
+    )
 
     return template
 

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/openjd/cli/_create_argparser.py

@@ -1,6 +1,9 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 from argparse import ArgumentParser
+import sys
+import traceback
+from typing import Optional
 
 from ._common import SubparserGroup
 
@@ -28,3 +31,21 @@ def create_argparser() -> ArgumentParser:
     populate_run_subparser(subcommands)
     populate_schema_subparser(subcommands)
     return parser
+
+
+def main(arg_list: Optional[list[str]] = None) -> None:
+    """Main function for invoking the CLI"""
+    parser = create_argparser()
+
+    if arg_list is None:
+        arg_list = sys.argv[1:]
+
+    args = parser.parse_args(arg_list)
+    try:
+        # Raises:
+        #  SystemExit - on failure
+        args.func(args)
+    except Exception as exc:
+        print(f"ERROR: {str(exc)}", file=sys.stderr)
+        traceback.print_exc()
+        sys.exit(1)

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/openjd/cli/_run/__init__.py

@@ -8,7 +8,7 @@ def populate_argparser(subcommands: SubparserGroup) -> None:
     """Adds the `run` command and all of its arguments to the given parser."""
     run_parser = subcommands.add(
         "run",
-        description="Takes a Job Template and Step name, then runs Tasks from that Step.",
+        description="Takes a Job Template and runs the entire job or a selected Step from the job.",
         usage="openjd run JOB_TEMPLATE_PATH [arguments]",
     )
     add_common_arguments(run_parser, {CommonArgument.PATH, CommonArgument.JOB_PARAMS})

{openjd_cli-0.4.4 → openjd_cli-0.6.0}/openjd/cli/_run/_local_session/_actions.py

@@ -1,10 +1,27 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
+from enum import Enum
+
 from openjd.model import Step, TaskParameterSet
 from openjd.model.v2023_09 import Environment
 from openjd.sessions import Session
 
 
+class EnvironmentType(str, Enum):
+    """
+    The three different types of environment types that can be entered/exited in a session.
+    """
+
+    EXTERNAL = "EXTERNAL"
+    JOB = "JOB"
+    STEP = "STEP"
+    ALL = "ALL"
+
+    def matches(self, other: "EnvironmentType") -> bool:
+        """Environment types match if they are equal, or one of them is ALL."""
+        return self == other or self == EnvironmentType.ALL or other == EnvironmentType.ALL
+
+
 class SessionAction:
     _session: Session
     duration: float
@@ -56,13 +73,17 @@ class EnterEnvironmentAction(SessionAction):
 
 class ExitEnvironmentAction(SessionAction):
     _id: str
+    _keep_session_running: bool
 
-    def __init__(self, session: Session, id: str):
+    def __init__(self, session: Session, id: str, keep_session_running: bool):
         super(ExitEnvironmentAction, self).__init__(session)
         self._id = id
+        self._keep_session_running = keep_session_running
 
     def run(self):
-        self._session.exit_environment(identifier=self._id)
+        self._session.exit_environment(
+            identifier=self._id, keep_session_running=self._keep_session_running
+        )
 
     def __str__(self):
         return f"Exit Environment '{self._id}'"

openjd_cli-0.6.0/openjd/cli/_run/_local_session/_logs.py

@@ -0,0 +1,80 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+from dataclasses import dataclass
+from logging import Handler, LogRecord
+from datetime import datetime, timezone
+from enum import Enum
+
+
+class LoggingTimestampFormat(str, Enum):
+    """
+    Different formats for the timestamp of each log entry
+    """
+
+    RELATIVE = "relative"
+    LOCAL = "local"
+    UTC = "utc"
+
+
+@dataclass
+class LogEntry:
+    """
+    Log information from a sample Session to return in a CLI result.
+    """
+
+    timestamp: str
+    message: str
+
+    def __str__(self) -> str:
+        return f"{self.timestamp}\t{self.message}"
+
+
+class LocalSessionLogHandler(Handler):
+    """
+    A custom Handler that formats and records logs in a dataclass.
+    Used to print logs to `stdout` in real time while also storing
+    them in memory.
+
+    It prints a timestamp that is relative to the session start.
+    """
+
+    messages: list[LogEntry] = []
+    _should_print: bool
+    _session_start_timestamp: datetime
+    _timestamp_format: LoggingTimestampFormat
+
+    def __init__(
+        self,
+        should_print: bool,
+        session_start_timestamp: datetime,
+        timestamp_format: LoggingTimestampFormat,
+    ):
+        super(LocalSessionLogHandler, self).__init__()
+        self._should_print = should_print
+        self._session_start_timestamp = session_start_timestamp
+        self._timestamp_format = timestamp_format
+
+    def handle(self, record: LogRecord) -> bool:
+        if self._timestamp_format == LoggingTimestampFormat.RELATIVE:
+            timestamp = str(
+                datetime.fromtimestamp(record.created, timezone.utc) - self._session_start_timestamp
+            )
+        elif self._timestamp_format == LoggingTimestampFormat.LOCAL:
+            timestamp = str(
+                datetime.fromtimestamp(record.created, timezone.utc).astimezone().isoformat()
+            )
+        else:
+            timestamp = str(datetime.fromtimestamp(record.created, timezone.utc).isoformat())
+
+        record.created = datetime.fromtimestamp(record.created, timezone.utc).timestamp()
+        new_record = LogEntry(
+            timestamp=timestamp,
+            message=record.getMessage(),
+        )
+        self.messages.append(new_record)
+
+        if self._should_print:
+            print(new_record)
+
+        # No filters are applied to the message, so always return True
+        return True