feat(container): replace tfenv with tenv for avm image - bump versions

container/Dockerfile.avm

@@ -3,17 +3,17 @@ ARG CONFTEST_VERSION=0.60.0
 ARG HOME_DIR=/home/runtimeuser
 ARG TERRAFORM_VERSION=1.12.1
 ARG TFLINT_VERSION=v0.58.0
+ARG TENV_VERSION=v4.7.21
 ENV AVM_IN_CONTAINER=1
 ENV AVM_MOD_PATH=/src
-ENV PATH=$PATH:${HOME_DIR}/tfenv/bin
+ENV PATH=$PATH
 ENV TF_CLI_CONFIG_FILE=${HOME_DIR}/.terraformrc
-ENV TFENV_AUTO_INSTALL=true
+ENV TENV_AUTO_INSTALL=true
 ENV TFENV_TERRAFORM_VERSION=${TERRAFORM_VERSION}
 ENV TFLINT_PLUGIN_DIR=${HOME_DIR}/tflint
 ENV TFLINTENV_DEFAULT_VERSION=${TFLINT_VERSION}
 ENV TFLINTENV_HOME_DIR=${HOME_DIR}/tflintenv
 COPY --from=builder /go/bin /usr/local/bin
-COPY --from=builder /src/tfenv ${HOME_DIR}/tfenv
 # The below is set by Buildx for cross-platform builds
 ARG TARGETARCH
 RUN tdnf install -y ca-certificates azure-cli docker-cli gawk git jq less make powershell tar unzip wget which zip && \
@@ -26,11 +26,14 @@ RUN tdnf install -y ca-certificates azure-cli docker-cli gawk git jq less make p
   cp /root/.gitconfig ${HOME_DIR}/.gitconfig && \
   mkdir ${HOME_DIR}/tflintenv && \
   chmod -R a+rwX ${HOME_DIR} && \
-  chmod a+x ${HOME_DIR}/tfenv/bin/* && \
-  rm -r /tmp/* && \
   cd /root && \
   mkdir /src && \
-  chmod a+rwX /src
+  chmod a+rwX /src && \
+  echo "Install tenv..." && \
+  curl -sL https://github.com/tofuutils/tenv/releases/download/${TENV_VERSION}/tenv_${TENV_VERSION}_${TARGETARCH}.rpm -o /root/tenv.rpm && \
+  rpm -i /root/tenv.rpm && \
+  rm /root/tenv.rpm && \
+  rm -r /tmp/*
 COPY .terraformrc ${HOME_DIR}/.terraformrc
 ENV HOME=${HOME_DIR}
 ENV SHELL=/bin/bash

container/Dockerfile.azterraform

@@ -18,7 +18,13 @@ RUN export CGO_ENABLED=1 && \
   cd /src && \
   git clone https://github.com/mvdan/gofumpt.git && \
   cd gofumpt && \
-  go build ${GOBUILDARGS} -o /go/bin/gofumpt .
+  go build ${GOBUILDARGS} -o /go/bin/gofumpt . && \
+  cd /src && \
+  echo "Fetch tfenv" && \
+  git clone https://github.com/tfutils/tfenv.git && \
+  cd /src/tfenv && \
+  git checkout $TFENV && \
+  rm -rf .git
 
 #FROM mcr.microsoft.com/azurelinux/base/python:3.12 as runner
 FROM mcr.microsoft.com/azure-cli:cbl-mariner2.0 AS runner
@@ -63,8 +69,8 @@ RUN mkdir ${HOME_DIR}
 COPY .terraformrc ${HOME_DIR}/.terraformrc
 COPY --from=builder /go/bin /usr/local/go/bin
 COPY --from=azterraform_builder /go/bin /usr/local/bin
-COPY --from=builder /src/tfenv ${HOME_DIR}/tfenv
 COPY --from=azterraform_builder /src/pkenv ${HOME_DIR}/pkenv
+COPY --from=azterraform_builder /src/tfenv ${HOME_DIR}/tfenv
 RUN cp /root/.gitconfig ${HOME_DIR}/.gitconfig && \
   mkdir ${HOME_DIR}/tflintenv && \
   chmod -Rv a+rwX ${HOME_DIR} && \

container/Dockerfile.build

@@ -87,12 +87,4 @@ RUN mkdir /src && \
   git clone https://github.com/lonegunmanb/terrafmt.git && \
   cd terrafmt && \
   go build ${GOBUILDARGS} -o /go/bin/terrafmt . && \
-  cd /src && \
-  echo "Fetch tfenv" && \
-  git clone https://github.com/tfutils/tfenv.git && \
-  cd /src/tfenv && \
-  git checkout $TFENV && \
-  rm -rf .git && \
-  cd /src && \
-  rm -rf .git && \
   chmod a+x /go/bin/*

container/version.env

@@ -6,9 +6,10 @@ HCLEDIT_VERSION=0.2.17
 HCLMERGE_VERSION=2dff14bd831a6f696d6572f03a5a61a11e4e3d66
 MAPOTF_VERSION=d0f91fd924efb6e67f14de9f4177ae6a365cceb5
 PACKER_VERSION=1.11.1
-PORCH_VERSION=0.2.0
+PORCH_VERSION=0.2.1
 PREVIOUS_TAG_VERSION=ebb715659f6b2eea736e47fcc0eb87e9f71866d4
 TERRAFORM_DOCS_VERSION=v0.20.0
 TERRAFORM_VERSION=1.12.2
+TENV_VERSION=v4.7.21
 TFENV=v3.0.0
 TFLINT_VERSION=v0.58.0

managed-files/root/.devcontainer/devcontainer.json

@@ -14,7 +14,7 @@
   "mounts": [
     "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
   ],
-  "onCreateCommand": "terraform || true",
+  "onCreateCommand": "terraform version",
   "customizations": {
     "vscode": {
       "settings": {

tests/terraform-azure-avm-res-mock/.devcontainer/devcontainer.json

@@ -14,7 +14,7 @@
   "mounts": [
     "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
   ],
-  "onCreateCommand": "terraform || true",
+  "onCreateCommand": "terraform version",
   "customizations": {
     "vscode": {
       "settings": {

tests/terraform-azurerm-avm-res-mock/.devcontainer/devcontainer.json

@@ -14,7 +14,7 @@
   "mounts": [
     "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
   ],
-  "onCreateCommand": "terraform || true",
+  "onCreateCommand": "terraform version",
   "customizations": {
     "vscode": {
       "settings": {