Skip to content

Commit 6a8c6b8

Browse files
authored
Merge pull request #28 from kamatama41/check-version-name
Check version name is correct before install
2 parents ed675ae + 012e879 commit 6a8c6b8

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

libexec/tfenv---version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
set -e
1313
[ -n "$TFENV_DEBUG" ] && set -x
1414

15-
version="0.3.2"
15+
version="0.3.3"
1616
git_revision=""
1717

1818
if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q tfenv; then

libexec/tfenv-install

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ if [ -f ${dst_path}/terraform ];then
3030
exit
3131
fi
3232

33+
if [ -z "$(tfenv-list-remote | grep "${version}")" ];then
34+
echo "'${version}' doesn't exist in remote, please confirm version name."
35+
exit 1
36+
fi
37+
3338
case "$(uname -s)" in
3439
Darwin* )
3540
os="darwin_amd64"

test/test_install_and_use.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717
echo "### Install specific version"
1818
cleanup
1919

20-
v=0.6.16
20+
v=0.7.13
2121
tfenv install ${v}
2222
tfenv use ${v}
2323
if ! check_version ${v}; then
@@ -35,3 +35,13 @@ if ! check_version ${v}; then
3535
echo "Installing .terraform-version ${v}" 1>&2
3636
exit 1
3737
fi
38+
39+
echo "### Install invalid version"
40+
cleanup
41+
42+
v=9.9.9
43+
expected_error_message="'${v}' doesn't exist in remote, please confirm version name."
44+
if [ -z "$(tfenv install ${v} | grep "${expected_error_message}")" ]; then
45+
echo "Installing invalid version ${v}" 1>&2
46+
exit 1
47+
fi

test/test_list.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ source $(dirname $0)/helpers.sh
66
echo "### List local versions"
77
cleanup
88

9-
for v in 0.6.2 0.6.16 0.7.0-rc4 0.7.0 0.8.0-beta2; do
9+
for v in 0.6.16 0.7.0-rc4 0.7.2 0.7.13 0.8.0-beta2; do
1010
tfenv install ${v}
1111
done
1212

1313
result=$(tfenv list)
1414
expected="$(cat << EOS
1515
0.8.0-beta2
16-
0.7.0
16+
0.7.13
17+
0.7.2
1718
0.7.0-rc4
1819
0.6.16
19-
0.6.2
2020
EOS
2121
)"
2222
if [ "${expected}" != "${result}" ]; then

0 commit comments

Comments
 (0)