From 4f6b22c24ffd793de0126818801c8c07ca0529ce Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@thijsschreijer.nl>
Date: Mon, 4 Dec 2023 14:28:27 +0100
Subject: [PATCH] fix(versions): resolve EE-versions by the last 2 digits

Enterprise versions have pacth versions both on 3rd and 4th digit
whilst resolving only took 4th into account.
Eg. 3.4.1.x resolved to 3.4.1.1, whilst 3.4.2.0 is actually the latest
---
 CHANGELOG.md                  |  4 ++++
 README.md                     |  2 +-
 assets/ci/pongo_run.helper.sh | 13 +++++++++++--
 assets/set_variables.sh       | 28 ++++++++++++++++++++++------
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32616493..c4d141f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,10 @@
 * Fix: health-checks on Pongo container. Use proper prefix.
   [#456](https://github.com/Kong/kong-pongo/pull/456).
 
+* Fix: version resolving, EE versions have 2 patch versions, now Pongo will resolve
+  them both. So 3.4.1.x now resolves to latest within 3.4, being 3.4.2.0.
+  [#477](https://github.com/Kong/kong-pongo/pull/477).
+
 * Feat: support access to host runner's services.
   [#473](https://github.com/Kong/kong-pongo/pull/473).
 
diff --git a/README.md b/README.md
index 2016ee86..beecda6d 100644
--- a/README.md
+++ b/README.md
@@ -651,7 +651,7 @@ jobs:
         - "2.8.x"
         - "3.5.x"
         - "dev"
-        - "3.5.0.x"
+        - "3.5.x.x"
         #- "dev-ee"    # Kong internal only, requires access to source code
 
     steps:
diff --git a/assets/ci/pongo_run.helper.sh b/assets/ci/pongo_run.helper.sh
index f30df476..331fe4bb 100755
--- a/assets/ci/pongo_run.helper.sh
+++ b/assets/ci/pongo_run.helper.sh
@@ -50,8 +50,17 @@ function versions_to_test {
 
     # step 1) add wilcard to get unique versions by major-minor (ignoring patch)
     if [[ "$VERSION" =~ ^[0-9] ]]; then
-      # numeric version, so not a DEV one; replace last digit with 'x' wildcard
-      VERSION="${VERSION:0:${#VERSION}-1}x"
+      # numeric version, so not a DEV one; replace last digits with 'x' wildcard
+      local segments
+      segments=segments=$(( $(echo "$VERSION" | tr -cd '.' | wc -c) + 1 ))
+      if ((segments == 4)); then
+        # this is a 4 segment version, which means it is an EE version.
+        # For an EE version we need to replace the last 2 digits
+        VERSION="${VERSION:0:${#VERSION}-3}x.x"
+      else
+        # this should then be an OSS version, replace 1 digit
+        VERSION="${VERSION:0:${#VERSION}-1}x"
+      fi
     fi
 
     # step 2) store version if not already in our CLEAN_VERSIONS array
diff --git a/assets/set_variables.sh b/assets/set_variables.sh
index cc82201b..a7ea81b2 100755
--- a/assets/set_variables.sh
+++ b/assets/set_variables.sh
@@ -128,12 +128,28 @@ function resolve_version {
     # resolve trailing "x" to proper version
     local new_version=$KONG_VERSION
     local entry
-    for entry in ${KONG_VERSIONS[*]}; do
-      if [[ "${KONG_VERSION:0:${#KONG_VERSION}-1}" == "${entry:0:${#entry}-1}" ]]; then
-        # keep replacing, last one wins
-        new_version=$entry
-      fi
-    done;
+
+    local segments
+    segments=segments=$(( $(echo "$KONG_VERSION" | tr -cd '.' | wc -c) + 1 ))
+
+    if ((segments == 4)); then
+      # this is a 4 segment version, which means it is an EE version.
+      # For an EE version we need to resolve the last 2 segments
+      for entry in ${KONG_VERSIONS[*]}; do
+        if [[ "${KONG_VERSION:0:${#KONG_VERSION}-3}" == "${entry:0:${#entry}-3}" ]]; then
+          # keep replacing, last one wins
+          new_version=$entry
+        fi
+      done;
+    else
+      # this should then be an OSS version
+      for entry in ${KONG_VERSIONS[*]}; do
+        if [[ "${KONG_VERSION:0:${#KONG_VERSION}-1}" == "${entry:0:${#entry}-1}" ]]; then
+          # keep replacing, last one wins
+          new_version=$entry
+        fi
+      done;
+    fi
     if [[ "$new_version" == "$KONG_VERSION" ]]; then
       warn "Could not resolve Kong version: '$KONG_VERSION'"
     else