tfutils · samuel-phan · Jun 15, 2023 · Oct 1, 2023 · Oct 4, 2023 · Oct 5, 2023
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ $ brew install tfenv
 ```
 
 Install via Arch User Repository (AUR)
-   
+
 ```console
 $ yay --sync tfenv
 ```
@@ -220,6 +220,54 @@ functionality will be restored.
 $ TFENV_REVERSE_REMOTE=1 tfenv list-remote
 ```
 
+##### `TFENV_SORT_VERSIONS_REMOTE`
+
+Integer (Default: 0)
+
+When using a custom remote, such as Artifactory, instead of the Hashicorp servers,
+the list of terraform versions returned by the curl of the remote directory may be inverted
+and sorted alphabetically, and not in a version-aware sort.
+
+For example, you will have something like this:
+
+```
+1.0.0
+1.0.10
+1.0.11
+1.0.1
+1.0.2
+1.0.3
+1.0.4
+1.0.5
+1.0.6
+1.0.7
+1.0.8
+1.0.9
+```
+
+instead of:
+
+```
+1.0.0
+1.0.1
+1.0.2
+1.0.3
+1.0.4
+1.0.5
+1.0.6
+1.0.7
+1.0.8
+1.0.9
+1.0.10
+1.0.11
+```
+
+To use `sort --version-sort` over all the list of versions, set this environment variable:
+
+```console
+$ TFENV_SORT_VERSIONS_REMOTE=1 tfenv list-remote
+```
+
 ##### `TFENV_CONFIG_DIR`
 
 Path (Default: `$TFENV_ROOT`)

diff --git a/libexec/tfenv-list-remote b/libexec/tfenv-list-remote
@@ -73,8 +73,20 @@ remote_versions="$(curlw -sSf "${TFENV_REMOTE}/terraform/")" \
 
 #log 'debug' "Remote versions available: ${remote_versions}"; # Even in debug mode this is too verbose
 
+# Remove Artifactory version
+remote_versions="$(grep -v -E "Artifactory/[0-9]+\.[0-9]+\.[0-9]+" <<< "${remote_versions}")"
+
+# Grep the versions
+remote_versions="$(grep -o -E "[0-9]+\.[0-9]+\.[0-9]+(-(rc|beta|alpha|oci)-?[0-9]*)?" <<< "${remote_versions}" | uniq)"
+
+# Sort versions
+if [[ "${TFENV_SORT_VERSIONS_REMOTE:-0}" -eq 1 ]]; then
+  remote_versions="$(sort --version-sort <<< "${remote_versions}")"
+fi
+
+# Reverse versions
 if [[ "${TFENV_REVERSE_REMOTE:-0}" -eq 1 ]]; then
-  grep -o -E "[0-9]+\.[0-9]+\.[0-9]+(-(rc|beta|alpha|oci)-?[0-9]*)?" <<<"${remote_versions}" | uniq | awk '{a[i++]=$0} END {for (j=i-1; j>=0;) print a[j--] }';
-else
-  grep -o -E "[0-9]+\.[0-9]+\.[0-9]+(-(rc|beta|alpha|oci)-?[0-9]*)?" <<<"${remote_versions}" | uniq;
+  remote_versions="$(awk '{a[i++]=$0} END {for (j=i-1; j>=0;) print a[j--] }' <<< "${remote_versions}")"
 fi;
+
+cat <<< "${remote_versions}"
diff --git a/test/test_install_and_use.sh b/test/test_install_and_use.sh
@@ -105,8 +105,8 @@ tests__kv=(
   "$(tfenv list-remote | grep 'rc' | head -n 1),latest:rc"
   "$(tfenv list-remote | grep '^0\.11\.' | head -n 1),latest:^0.11."
   '0.11.15-oci,0.11.15-oci'
-  '0.8.8,latest:^0.8'
-  '0.7.13,0.7.13'
+  '0.11.15,latest:^0.11'
+  '0.11.9,0.11.9'
   '0.14.6,v0.14.6'
 );
 

diff --git a/test/test_list.sh b/test/test_list.sh
@@ -53,7 +53,7 @@ declare -a errors=();
 log 'info' '### List local versions';
 cleanup || log 'error' "Cleanup failed?!";
 
-for v in 0.7.2 0.7.13 0.9.1 0.9.2 v0.9.11 0.14.6; do
+for v in 0.11.9 0.11.11 v0.11.13 0.14.6; do
   log 'info' "## Installing version ${v} to construct list";
   tfenv install "${v}" \
     && log 'debug' "Install of version ${v} succeeded" \
@@ -71,11 +71,9 @@ log 'info' '## Comparing "tfenv list" with default set';
 result="$(tfenv list)";
 expected="$(cat << EOS
 * 0.14.6 (set by $(tfenv version-file))
-  0.9.11
-  0.9.2
-  0.9.1
-  0.7.13
-  0.7.2
+  0.11.13
+  0.11.11
+  0.11.9
 EOS
 )";
 

diff --git a/test/test_symlink.sh b/test/test_symlink.sh
@@ -60,14 +60,14 @@ ln -s "${PWD}"/bin/* "${TFENV_BIN_DIR}";
 
 cleanup || log 'error' 'Cleanup failed?!';
 
-log 'info' '## Installing 0.8.2';
-${TFENV_BIN_DIR}/tfenv install 0.8.2 || error_and_proceed 'Install failed';
+log 'info' '## Installing 0.11.14';
+${TFENV_BIN_DIR}/tfenv install 0.11.14 || error_and_proceed 'Install failed';
 
-log 'info' '## Using 0.8.2';
-${TFENV_BIN_DIR}/tfenv use 0.8.2 || error_and_proceed 'Use failed';
+log 'info' '## Using 0.11.14';
+${TFENV_BIN_DIR}/tfenv use 0.11.14 || error_and_proceed 'Use failed';
 
-log 'info' '## Check-Version for 0.8.2';
-check_active_version 0.8.2 || error_and_proceed 'Version check failed';
+log 'info' '## Check-Version for 0.11.14';
+check_active_version 0.11.14 || error_and_proceed 'Version check failed';
 
 if [ "${#errors[@]}" -gt 0 ]; then
   log 'warn' '===== The following symlink tests failed =====';

diff --git a/test/test_uninstall.sh b/test/test_uninstall.sh
@@ -63,18 +63,18 @@ log 'info' '### Test Suite: Uninstall Local Versions';
 cleanup || log 'error' 'Cleanup failed?!';
 
 tests__keywords=(
-  '0.9.1'
+  '0.11.10'
   '0.11.15-oci'
   'latest'
-  'latest:^0.8'
+  'latest:^0.11'
   'v0.14.6'
 );
 
 tests__versions=(
-  '0.9.1'
+  '0.11.10'
   '0.11.15-oci'
   "$(tfenv list-remote | head -n1)"
-  "$(tfenv list-remote | grep -e "^0.8" | head -n1)"
+  "$(tfenv list-remote | grep -e "^0.11" | head -n1)"
   '0.14.6'
 );
 

diff --git a/test/test_use_minrequired.sh b/test/test_use_minrequired.sh
@@ -55,7 +55,7 @@ cleanup || log 'error' 'Cleanup failed?!';
 
 log 'info' '### Install min-required normal version (#.#.#)';
 
-minv='0.8.0';
+minv='0.11.9';
 
 echo "terraform {
   required_version = \">=${minv}\"