Skip to content

Commit c141071

Browse files
authored
Merge pull request #302 from OJFord/fix-300
Fix #300: `min-required` not evaluated for auto-install
2 parents a7fba52 + d4836fc commit c141071

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

lib/tfenv-version-name.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ function tfenv-version-name() {
9595
log 'error' "Version could not be resolved (set by ${TFENV_VERSION_SOURCE} or tfenv use <version>)";
9696
fi;
9797

98+
if [[ "${TFENV_VERSION}" == min-required ]]; then
99+
TFENV_VERSION="$(tfenv-min-required)";
100+
fi;
101+
98102
if [[ ! -d "${TFENV_CONFIG_DIR}/versions/${TFENV_VERSION}" ]]; then
99103
log 'debug' "version '${TFENV_VERSION}' is not installed (set by ${TFENV_VERSION_SOURCE})";
100104
fi;

test/test_use_minrequired.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,23 @@ echo "terraform {
103103

104104
cleanup || log 'error' 'Cleanup failed?!';
105105

106+
107+
log 'info' '### Install min-required with TFENV_AUTO_INSTALL';
108+
109+
minv='1.0.0';
110+
111+
echo "terraform {
112+
required_version = \">=${minv}\"
113+
}" >> min_required.tf;
114+
echo 'min-required' > .terraform-version;
115+
116+
(
117+
TFENV_AUTO_INSTALL=true terraform version;
118+
check_active_version "${minv}";
119+
) || error_and_proceed 'Min required auto-installed version does not match';
120+
121+
cleanup || log 'error' 'Cleanup failed?!';
122+
106123
if [ "${#errors[@]}" -gt 0 ]; then
107124
log 'warn' '===== The following use_minrequired tests failed =====';
108125
for error in "${errors[@]}"; do

0 commit comments

Comments
 (0)