Enhanced software release retrieval

Updated: - Web::upgradeRelease - Web::getReleases - Github::installRelease Changes: - support for gh - allows to override version place holder using env variable VERSION_PLACEHOLDER
fchastanet · Jan 19, 2025 · c727558 · c727558
1 parent f27f9f9
commit c727558
Show file tree

Hide file tree

Showing 9 changed files with 285 additions and 312 deletions.
diff --git a/bin/doc b/bin/doc
@@ -1544,12 +1544,23 @@ Version::parse() {
 Web::getReleases() {
   local releaseListUrl="$1"
   # Get latest release from GitHub api
-  Retry::parameterized "${RETRY_MAX_RETRY:-5}" "${RETRY_DELAY_BETWEEN_RETRIES:-15}" "Retrieving release versions list ..." curl \
-    -L \
-    --connect-timeout "${CURL_CONNECT_TIMEOUT:-5}" \
-    --fail \
-    --silent \
-    "${releaseListUrl}"
+  if command -v gh &>/dev/null; then
+    Log::displayDebug "Using gh to retrieve release versions list"
+    Retry::parameterized "${RETRY_MAX_RETRY:-5}" \
+      "${RETRY_DELAY_BETWEEN_RETRIES:-15}" \
+      "Retrieving release versions list ..." \
+      gh api "${releaseListUrl#https://github.com}"
+  else
+    Retry::parameterized "${RETRY_MAX_RETRY:-5}" \
+      "${RETRY_DELAY_BETWEEN_RETRIES:-15}" \
+      "Retrieving release versions list ..." \
+      curl \
+      -L \
+      --connect-timeout "${CURL_CONNECT_TIMEOUT:-5}" \
+      --fail \
+      --silent \
+      "${releaseListUrl}"
+  fi
 }
 
 
@@ -1567,6 +1578,7 @@ Web::getReleases() {
 # @env PARSE_VERSION_CALLBACK a callback to parse the version of the existing command
 # @env INSTALL_CALLBACK a callback to install the software downloaded
 # @env CURL_CONNECT_TIMEOUT number of seconds before giving up host connection
+# @env VERSION_PLACEHOLDER a placeholder to replace in downloadReleaseUrl (default: @latestVersion@)
 Web::upgradeRelease() {
   local targetFile="$1"
   local releasesUrl="$2"
@@ -1577,25 +1589,28 @@ Web::upgradeRelease() {
   local filterLastVersionCallback="${FILTER_LAST_VERSION_CALLBACK:-Version::parse}"
   local softVersionCallback="${SOFT_VERSION_CALLBACK:-Version::getCommandVersionFromPlainText}"
   local installCallback="${INSTALL_CALLBACK:-}"
-  local latestVersion
-  latestVersion="$(Web::getReleases "${releasesUrl}" | ${filterLastVersionCallback})" || {
-    Log::displayError "latest version not found on ${releasesUrl}"
-    return 1
-  }
-  Log::displayInfo "Latest version found is ${latestVersion}"
 
   local currentVersion="not existing"
   if [[ -f "${targetFile}" ]]; then
     currentVersion="$(${softVersionCallback} "${targetFile}" "${softVersionArg}" 2>&1 || true)"
   fi
   if [[ -z "${exactVersion}" ]]; then
+    local latestVersion
+    latestVersion="$(Web::getReleases "${releasesUrl}" | ${filterLastVersionCallback})" || {
+      Log::displayError "latest version not found on ${releasesUrl}"
+      return 1
+    }
+    Log::displayInfo "Latest version found is ${latestVersion}"
+
     exactVersion="${latestVersion}"
   fi
-  local url="${downloadReleaseUrl//@latestVersion@/${exactVersion}}"
+  local url="${downloadReleaseUrl//${VERSION_PLACEHOLDER:-@latestVersion@}/${exactVersion}}"
   if [[ -n "${exactVersion}" ]] && ! Github::isReleaseVersionExist "${url}"; then
     Log::displayError "${targetFile} version ${exactVersion} doesn't exist on github"
     return 2
   fi
+  Log::displayDebug "currentVersion: '${currentVersion}'"
+  Log::displayDebug "exactVersion: '${exactVersion}'"
   if [[ "${currentVersion}" = "${exactVersion}" ]]; then
     Log::displayInfo "${targetFile} version ${exactVersion} already installed"
   else

diff --git a/bin/dockerLint b/bin/dockerLint
@@ -1074,12 +1074,23 @@ Version::parse() {
 Web::getReleases() {
   local releaseListUrl="$1"
   # Get latest release from GitHub api
-  Retry::parameterized "${RETRY_MAX_RETRY:-5}" "${RETRY_DELAY_BETWEEN_RETRIES:-15}" "Retrieving release versions list ..." curl \
-    -L \
-    --connect-timeout "${CURL_CONNECT_TIMEOUT:-5}" \
-    --fail \
-    --silent \
-    "${releaseListUrl}"
+  if command -v gh &>/dev/null; then
+    Log::displayDebug "Using gh to retrieve release versions list"
+    Retry::parameterized "${RETRY_MAX_RETRY:-5}" \
+      "${RETRY_DELAY_BETWEEN_RETRIES:-15}" \
+      "Retrieving release versions list ..." \
+      gh api "${releaseListUrl#https://github.com}"
+  else
+    Retry::parameterized "${RETRY_MAX_RETRY:-5}" \
+      "${RETRY_DELAY_BETWEEN_RETRIES:-15}" \
+      "Retrieving release versions list ..." \
+      curl \
+      -L \
+      --connect-timeout "${CURL_CONNECT_TIMEOUT:-5}" \
+      --fail \
+      --silent \
+      "${releaseListUrl}"
+  fi
 }
 
 
@@ -1097,6 +1108,7 @@ Web::getReleases() {
 # @env PARSE_VERSION_CALLBACK a callback to parse the version of the existing command
 # @env INSTALL_CALLBACK a callback to install the software downloaded
 # @env CURL_CONNECT_TIMEOUT number of seconds before giving up host connection
+# @env VERSION_PLACEHOLDER a placeholder to replace in downloadReleaseUrl (default: @latestVersion@)
 Web::upgradeRelease() {
   local targetFile="$1"
   local releasesUrl="$2"
@@ -1107,25 +1119,28 @@ Web::upgradeRelease() {
   local filterLastVersionCallback="${FILTER_LAST_VERSION_CALLBACK:-Version::parse}"
   local softVersionCallback="${SOFT_VERSION_CALLBACK:-Version::getCommandVersionFromPlainText}"
   local installCallback="${INSTALL_CALLBACK:-}"
-  local latestVersion
-  latestVersion="$(Web::getReleases "${releasesUrl}" | ${filterLastVersionCallback})" || {
-    Log::displayError "latest version not found on ${releasesUrl}"
-    return 1
-  }
-  Log::displayInfo "Latest version found is ${latestVersion}"
 
   local currentVersion="not existing"
   if [[ -f "${targetFile}" ]]; then
     currentVersion="$(${softVersionCallback} "${targetFile}" "${softVersionArg}" 2>&1 || true)"
   fi
   if [[ -z "${exactVersion}" ]]; then
+    local latestVersion
+    latestVersion="$(Web::getReleases "${releasesUrl}" | ${filterLastVersionCallback})" || {
+      Log::displayError "latest version not found on ${releasesUrl}"
+      return 1
+    }
+    Log::displayInfo "Latest version found is ${latestVersion}"
+
     exactVersion="${latestVersion}"
   fi
-  local url="${downloadReleaseUrl//@latestVersion@/${exactVersion}}"
+  local url="${downloadReleaseUrl//${VERSION_PLACEHOLDER:-@latestVersion@}/${exactVersion}}"
   if [[ -n "${exactVersion}" ]] && ! Github::isReleaseVersionExist "${url}"; then
     Log::displayError "${targetFile} version ${exactVersion} doesn't exist on github"
     return 2
   fi
+  Log::displayDebug "currentVersion: '${currentVersion}'"
+  Log::displayDebug "exactVersion: '${exactVersion}'"
   if [[ "${currentVersion}" = "${exactVersion}" ]]; then
     Log::displayInfo "${targetFile} version ${exactVersion} already installed"
   else

diff --git a/bin/installFacadeExample b/bin/installFacadeExample
@@ -516,39 +516,39 @@ Log::logFatal() {
 # FUNCTIONS
 
 facade_main_installFacadeExamplesh() {
-FRAMEWORK_ROOT_DIR="$(cd "${CURRENT_DIR}/.." && pwd -P)"
-FRAMEWORK_SRC_DIR="${FRAMEWORK_ROOT_DIR}/src"
-FRAMEWORK_BIN_DIR="${FRAMEWORK_ROOT_DIR}/bin"
-FRAMEWORK_VENDOR_DIR="${FRAMEWORK_ROOT_DIR}/vendor"
-FRAMEWORK_VENDOR_BIN_DIR="${FRAMEWORK_ROOT_DIR}/vendor/bin"
-# REQUIRES
-Env::requireLoad
-Log::requireLoad
-UI::requireTheme
-Compiler::Facade::requireCommandBinDir
-
-# @require Compiler::Facade::requireCommandBinDir
-
-install() {
-  echo "installation in progress"
-}
-
-local action=$1
-shift || true
-case ${action} in
-  install)
-    install "$@"
-    ;;
-  *)
-    if Assert::functionExists defaultFacadeAction; then
-      defaultFacadeAction "$1" "$@"
-    else
-      Log::displayError "invalid action requested: ${action}"
-      exit 1
-    fi
-    ;;
-esac
-exit 0
+  FRAMEWORK_ROOT_DIR="$(cd "${CURRENT_DIR}/.." && pwd -P)"
+  FRAMEWORK_SRC_DIR="${FRAMEWORK_ROOT_DIR}/src"
+  FRAMEWORK_BIN_DIR="${FRAMEWORK_ROOT_DIR}/bin"
+  FRAMEWORK_VENDOR_DIR="${FRAMEWORK_ROOT_DIR}/vendor"
+  FRAMEWORK_VENDOR_BIN_DIR="${FRAMEWORK_ROOT_DIR}/vendor/bin"
+  # REQUIRES
+  Env::requireLoad
+  Log::requireLoad
+  UI::requireTheme
+  Compiler::Facade::requireCommandBinDir
+
+  # @require Compiler::Facade::requireCommandBinDir
+
+  install() {
+    echo "installation in progress"
+  }
+
+  local action=$1
+  shift || true
+  case ${action} in
+    install)
+      install "$@"
+      ;;
+    *)
+      if Assert::functionExists defaultFacadeAction; then
+        defaultFacadeAction "$1" "$@"
+      else
+        Log::displayError "invalid action requested: ${action}"
+        exit 1
+      fi
+      ;;
+  esac
+  exit 0
 }
 
 # if file is sourced avoid calling main function

diff --git a/bin/installRequirements b/bin/installRequirements
@@ -1172,12 +1172,23 @@ Version::parse() {
 Web::getReleases() {
   local releaseListUrl="$1"
   # Get latest release from GitHub api
-  Retry::parameterized "${RETRY_MAX_RETRY:-5}" "${RETRY_DELAY_BETWEEN_RETRIES:-15}" "Retrieving release versions list ..." curl \
-    -L \
-    --connect-timeout "${CURL_CONNECT_TIMEOUT:-5}" \
-    --fail \
-    --silent \
-    "${releaseListUrl}"
+  if command -v gh &>/dev/null; then
+    Log::displayDebug "Using gh to retrieve release versions list"
+    Retry::parameterized "${RETRY_MAX_RETRY:-5}" \
+      "${RETRY_DELAY_BETWEEN_RETRIES:-15}" \
+      "Retrieving release versions list ..." \
+      gh api "${releaseListUrl#https://github.com}"
+  else
+    Retry::parameterized "${RETRY_MAX_RETRY:-5}" \
+      "${RETRY_DELAY_BETWEEN_RETRIES:-15}" \
+      "Retrieving release versions list ..." \
+      curl \
+      -L \
+      --connect-timeout "${CURL_CONNECT_TIMEOUT:-5}" \
+      --fail \
+      --silent \
+      "${releaseListUrl}"
+  fi
 }
 
 
@@ -1195,6 +1206,7 @@ Web::getReleases() {
 # @env PARSE_VERSION_CALLBACK a callback to parse the version of the existing command
 # @env INSTALL_CALLBACK a callback to install the software downloaded
 # @env CURL_CONNECT_TIMEOUT number of seconds before giving up host connection
+# @env VERSION_PLACEHOLDER a placeholder to replace in downloadReleaseUrl (default: @latestVersion@)
 Web::upgradeRelease() {
   local targetFile="$1"
   local releasesUrl="$2"
@@ -1205,25 +1217,28 @@ Web::upgradeRelease() {
   local filterLastVersionCallback="${FILTER_LAST_VERSION_CALLBACK:-Version::parse}"
   local softVersionCallback="${SOFT_VERSION_CALLBACK:-Version::getCommandVersionFromPlainText}"
   local installCallback="${INSTALL_CALLBACK:-}"
-  local latestVersion
-  latestVersion="$(Web::getReleases "${releasesUrl}" | ${filterLastVersionCallback})" || {
-    Log::displayError "latest version not found on ${releasesUrl}"
-    return 1
-  }
-  Log::displayInfo "Latest version found is ${latestVersion}"
 
   local currentVersion="not existing"
   if [[ -f "${targetFile}" ]]; then
     currentVersion="$(${softVersionCallback} "${targetFile}" "${softVersionArg}" 2>&1 || true)"
   fi
   if [[ -z "${exactVersion}" ]]; then
+    local latestVersion
+    latestVersion="$(Web::getReleases "${releasesUrl}" | ${filterLastVersionCallback})" || {
+      Log::displayError "latest version not found on ${releasesUrl}"
+      return 1
+    }
+    Log::displayInfo "Latest version found is ${latestVersion}"
+
     exactVersion="${latestVersion}"
   fi
-  local url="${downloadReleaseUrl//@latestVersion@/${exactVersion}}"
+  local url="${downloadReleaseUrl//${VERSION_PLACEHOLDER:-@latestVersion@}/${exactVersion}}"
   if [[ -n "${exactVersion}" ]] && ! Github::isReleaseVersionExist "${url}"; then
     Log::displayError "${targetFile} version ${exactVersion} doesn't exist on github"
     return 2
   fi
+  Log::displayDebug "currentVersion: '${currentVersion}'"
+  Log::displayDebug "exactVersion: '${exactVersion}'"
   if [[ "${currentVersion}" = "${exactVersion}" ]]; then
     Log::displayInfo "${targetFile} version ${exactVersion} already installed"
   else

diff --git a/src/Filters/firstField.bats b/src/Filters/firstField.bats
@@ -31,7 +31,7 @@ function Filters::firstField::bash { #@test
 }
 
 function Filters::firstField::bigFile { #@test
-  tail -1209 "${BATS_TEST_DIRNAME}/testsData/binary" | {
+  tail -1170 "${BATS_TEST_DIRNAME}/testsData/binary" | {
     run Filters::firstField
     assert_success
     assert_output 'Github::upgradeRelease'