Merge pull request #238 from tfutils/support-v-prefix

Strip v prefix from any requested version string

Author: Zordrak

libexec/tfenv-resolve-version

@@ -99,6 +99,12 @@ fi;
 
 log 'debug' "Version Requested: ${version_requested}";
 
+# Accept a v-prefixed version, but strip the v.
+if [[ "${version_requested}" =~ ^v.*$ ]]; then
+  log 'debug' "Version Requested is prefixed with a v. Stripping the v."
+  version_requested="${version_requested#v*}";
+fi;
+
 if [[ "${version_requested}" =~ ^min-required$ ]]; then
   log 'info' 'Detecting minimum required version...';
   min_required="$(tfenv-min-required)" \

libexec/tfenv-use

@@ -77,6 +77,7 @@ fi
 
 log debug "Resolving version with: tfenv-resolve-version ${requested_arg}";
 declare resolved="$(tfenv-resolve-version ${requested_arg})";
+log debug "Resolved to: ${resolved}";
 
 declare version="${resolved%%\:*}";
 declare regex="${resolved##*\:}";

libexec/tfenv-version-name

@@ -105,6 +105,12 @@ if [[ "${TFENV_VERSION}" =~ ^latest.*$ ]]; then
 
 else
   log 'debug' 'TFENV_VERSION does not use "latest" keyword';
+
+  # Accept a v-prefixed version, but strip the v.
+  if [[ "${TFENV_VERSION}" =~ ^v.*$ ]]; then
+    log 'debug' "Version Requested is prefixed with a v. Stripping the v."
+    TFENV_VERSION="${TFENV_VERSION#v*}";
+  fi;
 fi;
 
 [ -z "${TFENV_VERSION}" ] \

test/test_install_and_use.sh

@@ -94,6 +94,7 @@ tests__desc=(
   '0.11.15-oci'
   'latest version matching regex'
   'specific version'
+  'specific version with v prefix'
 );
 
 tests__kv=(
@@ -105,17 +106,19 @@ tests__kv=(
   "$(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.7.13,0.7.13'
+  '0.14.6,v0.14.6'
 );
 
 tests_count=${#tests__desc[@]};
 
-declare desc kv k v;
+declare desc kv k v test_num;
 
-for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
+for ((test_iter=0; test_iter<${tests_count}; ++test_iter )) ; do
   cleanup || log 'error' 'Cleanup failed?!';
-  desc=${tests__desc[${test_num}]};
-  kv="${tests__kv[${test_num}]}";
+  test_num=$((test_iter + 1)); 
+  desc=${tests__desc[${test_iter}]};
+  kv="${tests__kv[${test_iter}]}";
   v="${kv%,*}";
   k="${kv##*,}";
   log 'info' "## Param Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} )";
@@ -124,10 +127,11 @@ for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
     || error_and_proceed "## Param Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} ) failed";
 done;
 
-for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
+for ((test_iter=0; test_iter<${tests_count}; ++test_iter )) ; do
   cleanup || log 'error' 'Cleanup failed?!';
-  desc=${tests__desc[${test_num}]};
-  kv="${tests__kv[${test_num}]}";
+  test_num=$((test_iter + 1)); 
+  desc=${tests__desc[${test_iter}]};
+  kv="${tests__kv[${test_iter}]}";
   v="${kv%,*}";
   k="${kv##*,}";
   log 'info' "## ./.terraform-version Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} )";
@@ -138,10 +142,11 @@ for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
     || error_and_proceed "## ./.terraform-version Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} ) failed";
 done;
 
-for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
+for ((test_iter=0; test_iter<${tests_count}; ++test_iter )) ; do
   cleanup || log 'error' 'Cleanup failed?!';
-  desc=${tests__desc[${test_num}]};
-  kv="${tests__kv[${test_num}]}";
+  test_num=$((test_iter + 1)); 
+  desc=${tests__desc[${test_iter}]};
+  kv="${tests__kv[${test_iter}]}";
   v="${kv%,*}";
   k="${kv##*,}";
   log 'info' "## TFENV_TERRAFORM_VERSION Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} )";
@@ -201,15 +206,16 @@ neg_tests__desc=(
 
 neg_tests__kv=(
   '9.9.9'
-  "latest:word"
+  'latest:word'
 );
 
 neg_tests_count=${#neg_tests__desc[@]};
 
-for ((test_num=0; test_num<${neg_tests_count}; ++test_num )) ; do
+for ((test_iter=0; test_iter<${neg_tests_count}; ++test_iter )) ; do
   cleanup || log 'error' 'Cleanup failed?!';
-  desc=${neg_tests__desc[${test_num}]}
-  k="${neg_tests__kv[${test_num}]}";
+  test_num=$((test_iter + 1));
+  desc=${neg_tests__desc[${test_iter}]}
+  k="${neg_tests__kv[${test_iter}]}";
   expected_error_message="No versions matching '${k}' found in remote";
   log 'info' "##  Invalid Version Test ${test_num}/${neg_tests_count}: ${desc} ( ${k} )";
   [ -z "$(tfenv install "${k}" 2>&1 | grep "${expected_error_message}")" ] \

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 0.9.11; do
+for v in 0.7.2 0.7.13 0.9.1 0.9.2 v0.9.11 0.14.6; do
   log 'info' "## Installing version ${v} to construct list";
   tfenv install "${v}" \
     && log 'debug' "Install of version ${v} succeeded" \
@@ -65,12 +65,13 @@ tfenv list \
   && log 'debug' "List succeeded with no default set" \
   || error_and_proceed "List failed with no default set";
 
-tfenv use 0.9.11;
+tfenv use 0.14.6;
 
 log 'info' '## Comparing "tfenv list" with default set';
 result="$(tfenv list)";
 expected="$(cat << EOS
-* 0.9.11 (set by $(tfenv version-file))
+* 0.14.6 (set by $(tfenv version-file))
+  0.9.11
   0.9.2
   0.9.1
   0.7.13

test/test_uninstall.sh

@@ -67,13 +67,15 @@ tests__keywords=(
   '0.11.15-oci'
   'latest'
   'latest:^0.8'
+  'v0.14.6'
 );
 
 tests__versions=(
   '0.9.1'
   '0.11.15-oci'
   "$(tfenv list-remote | head -n1)"
   "$(tfenv list-remote | grep -e "^0.8" | head -n1)"
+  '0.14.6'
 );
 
 tests_count=${#tests__keywords[@]};