From 0bbe715ad887f72e8138fa2cb230be95c9c81f48 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 12 Nov 2024 12:55:29 -0700
Subject: [PATCH] Fix MacOS grep -E pattern to allow for no '.x' versions

---
 .github/workflows/test-linux.yml |  3 ++-
 .github/workflows/test-macos.yml |  3 ++-
 bootstrap-salt.sh                |  4 ++--
 tests/conftest.py                | 11 -----------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 8213054..e602583 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -67,6 +67,7 @@ jobs:
           # It is used to install via bootstrap and in the test
           # The version is in the instance name
           # sed 1st - becomes space, 2nd - becomes dot
+          ## DGM needs cleanup
           echo "matrix instance ,${{ matrix.instance }},"
           vt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
           vt_parms2=$(echo "$vt_parms" | sed 's/-/./')
@@ -77,13 +78,13 @@ jobs:
       - name: Bootstrap Salt
         run: |
           # sed 1st - becomes space, 2nd - becomes dot
+          ## DGM needs cleanup
           echo "matrix instance ,${{ matrix.instance }},"
           bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
           bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
           bt_arg1=$(echo "$bt_parms2" | awk -F ' ' '{print $1}')
           bt_arg2=$(echo "$bt_parms2" | awk -F ' ' '{print $2}')
           echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
-          ## sudo sh -x ./bootstrap-salt.sh "$bt_parms2"
           sudo sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
 
       - name: Test Bootstrap
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 88f6d7a..7aa78c7 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -57,6 +57,7 @@ jobs:
           # It is used to install via bootstrap and in the test
           # The version is in the instance name
           # sed 1st - becomes space, 2nd - becomes dot
+          ## DGM needs cleanup
           echo "matrix instance ,${{ matrix.instance }},"
           vt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
           vt_parms2=$(echo "$vt_parms" | sed 's/-/./')
@@ -67,13 +68,13 @@ jobs:
       - name: Bootstrap Salt
         run: |
           # sed 1st - becomes space, 2nd - becomes dot
+          ## DGM needs cleanup
           echo "matrix instance ,${{ matrix.instance }},"
           bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
           bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
           bt_arg1=$(echo "$bt_parms2" | awk -F ' ' '{print $1}')
           bt_arg2=$(echo "$bt_parms2" | awk -F ' ' '{print $2}')
           echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
-          ## sudo sh -x ./bootstrap-salt.sh "$bt_parms2"
           sudo sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
 
       - name: Test Bootstrap
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d5a47e3..1946058 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -665,7 +665,7 @@ elif [ "$ITYPE" = "stable" ]; then
             _ONEDIR_REV="$1"
             ITYPE="onedir"
             shift
-        elif [ "$(echo "$1" | grep -E '^([3-9][0-5]{2}[5-9](\.[0-9]*)?)')" != "" ]; then
+        elif [ "$(echo "$1" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
             STABLE_REV="$1"
             ONEDIR_REV="$1"
             _ONEDIR_REV="$1"
@@ -7453,7 +7453,7 @@ __macosx_get_packagesite_onedir() {
     SALT_MACOS_PKGDIR_URL="https://${_REPO_URL}/${_ONEDIR_TYPE}/macos"
     if [ "$(echo "$_ONEDIR_REV" | grep -E '^(latest)$')" != "" ]; then
       __macosx_get_packagesite_onedir_latest
-    elif [ "$(echo "$_ONEDIR_REV" | grep -E '^([3-9][0-9]{3}(\.[0-9]*))')" != "" ]; then
+    elif [ "$(echo "$_ONEDIR_REV" | grep -E '^([3-9][0-9]{3}(\.[0-9]*)?)')" != "" ]; then
       _PKG_VERSION=$_ONEDIR_REV
     else
       __macosx_get_packagesite_onedir_latest
diff --git a/tests/conftest.py b/tests/conftest.py
index 2186d06..5d5702c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -18,12 +18,6 @@ def target_python_version():
 def target_salt_version():
 
     target_salt = os.environ.get("SaltVersion", "")
-
-    print(
-        f"DGM conftest target_salt_version, target_salt '{target_salt}', os.environ '{os.environ}'",
-        flush=True,
-    )
-
     html_response = requests.get(API_URL)
     content = json.loads(html_response.text)
     folders = content["children"]
@@ -37,11 +31,6 @@ def target_salt_version():
             versions[maj_version] = version
             versions["latest"] = version
 
-    print(
-        f"DGM conftest target_salt_version, target_salt '{target_salt}', versions '{versions}'",
-        flush=True,
-    )
-
     if target_salt.startswith("v"):
         target_salt = target_salt[1:]
     if target_salt not in versions: