Validate, and normalize, the passed Salt Versions.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

.github/actions/setup-salt-version/action.yml

@@ -12,6 +12,10 @@ inputs:
       The Salt version to set prior to running tests or building packages.
       If not set, it is discover at run time, like, for example, capturing
       the output of running `python3 salt/version.py`
+  validate-version:
+    type: boolean
+    default: false
+    description: Validate the passed version.
 outputs:
   salt-version:
     value: ${{ steps.setup-salt-version.outputs.salt-version }}
@@ -32,4 +36,4 @@ runs:
         if [ "${{ inputs.cwd }}" != "" ]; then
           cd "${{ inputs.cwd }}"
         fi
-        tools pkg set-salt-version ${{ inputs.salt-version }}
+        tools pkg set-salt-version ${{ inputs.validate-version == 'true' && '--validate-version' || '' }} ${{ inputs.salt-version }}

.github/workflows/ci.yml

@@ -120,6 +120,7 @@ jobs:
         uses: ./.github/actions/setup-salt-version
         with:
           salt-version: ""
+          validate-version: true
 
       - name: Write Changed Files To A Local File
         run:

.github/workflows/nightly.yml

@@ -118,6 +118,7 @@ jobs:
         uses: ./.github/actions/setup-salt-version
         with:
           salt-version: ""
+          validate-version: true
 
       - name: Write Changed Files To A Local File
         run:

.github/workflows/scheduled.yml

@@ -118,6 +118,7 @@ jobs:
         uses: ./.github/actions/setup-salt-version
         with:
           salt-version: ""
+          validate-version: true
 
       - name: Write Changed Files To A Local File
         run:

.github/workflows/templates/layout.yml.j2

@@ -143,6 +143,7 @@ jobs:
         uses: ./.github/actions/setup-salt-version
         with:
           salt-version: "<{ prepare_workflow_salt_version_input }>"
+          validate-version: true
 
       - name: Write Changed Files To A Local File
         run:

tools/pkg.py

@@ -98,9 +98,17 @@ class Recompress:
         "overwrite": {
             "help": "Overwrite 'salt/_version.txt' if it already exists",
         },
+        "validate_version": {
+            "help": "Validate, and normalize, the passed Salt Version",
+        },
     },
 )
-def set_salt_version(ctx: Context, salt_version: str, overwrite: bool = False):
+def set_salt_version(
+    ctx: Context,
+    salt_version: str,
+    overwrite: bool = False,
+    validate_version: bool = False,
+):
     """
     Write the Salt version to 'salt/_version.txt'
     """
@@ -121,6 +129,29 @@ def set_salt_version(ctx: Context, salt_version: str, overwrite: bool = False):
         ret = ctx.run(shutil.which("python3"), "salt/version.py", capture=True)
         salt_version = ret.stdout.strip().decode()
         ctx.info(f"Discovered Salt version: {salt_version!r}")
+    elif validate_version:
+        ctx.info(f"Validating and normalizing the salt version {salt_version!r}...")
+        with ctx.virtualenv(
+            name="set-salt-version",
+            requirements_files=[REPO_ROOT / "requirements" / "base.txt"],
+        ) as venv:
+            code = f"""
+            import sys
+            import salt.version
+            parsed_version = salt.version.SaltStackVersion.parse("{salt_version}")
+            if parsed_version.name is None:
+                # When we run out of names, or we stop supporting version names
+                # we'll need to remove this version check.
+                print("'{{}}' is not a valid Salt Version.".format(parsed_version), file=sys.stderr, flush=True)
+                sys.exit(1)
+            sys.stdout.write(str(parsed_version))
+            sys.stdout.flush()
+            """
+            ret = venv.run_code(code, capture=True, check=False)
+            if ret.returncode:
+                ctx.error(ret.stderr.decode())
+                ctx.exit(ctx.returncode)
+            salt_version = ret.stdout.strip().decode()
 
     if not REPO_ROOT.joinpath("salt").is_dir():
         ctx.error(