Upgrade Terraform Mixing to 1.0.0-rc.1 (#2677)

* terraform init in core/ops shouldn't use -upgrade * update terraform in devcontainer * always refresh * tflint * update changelog * Remove doker env variables * update changelog * align bundles with new terraform mixin * update changelog
microsoft · Oct 2, 2022 · 1433311 · 1433311
1 parent 4d25270
commit 1433311
Show file tree

Hide file tree

Showing 44 changed files with 26 additions and 163 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ ENHANCEMENTS:
 * Airlock requests with status "blocked_by_scan" have the reason for being blocked by the malware scanner in the status_message field ([#2666](https://github.com/microsoft/AzureTRE/pull/2666))
 * Move admin-vm from core to a shared service ([#2624](https://github.com/microsoft/AzureTRE/pull/2624))
 * Remove obsolete docker environment variables ([#2675](https://github.com/microsoft/AzureTRE/pull/2675))
+* Using Porter's Terrform mixin 1.0.0-rc.1 where mirror in done internally ([#2677](https://github.com/microsoft/AzureTRE/pull/2677))
 
 BUG FIXES:
 

diff --git a/resource_processor/_version.py b/resource_processor/_version.py
@@ -1 +1 @@
-__version__ = "0.4.7"
+__version__ = "0.4.8"
diff --git a/resource_processor/scripts/porter.sh b/resource_processor/scripts/porter.sh
@@ -11,7 +11,7 @@ chmod +x "${PORTER_HOME}/porter"
 ln -s "${PORTER_HOME}/porter" "${PORTER_HOME}/runtimes/porter-runtime"
 
 "${PORTER_HOME}/porter" mixin install exec --version "${PORTER_PKG_PERMALINK}"
-"${PORTER_HOME}/porter" mixin install terraform --version "${PORTER_PKG_PERMALINK}"
+"${PORTER_HOME}/porter" mixin install terraform --version "${PORTER_TERRAFORM_MIXIN_PKG_PERMALINK}"
 "${PORTER_HOME}/porter" mixin install az --version "${PORTER_PKG_PERMALINK}"
 "${PORTER_HOME}/porter" plugin install azure --version "${PORTER_PKG_PERMALINK}"
 "${PORTER_HOME}/porter" mixin install docker --version "${PORTER_PKG_PERMALINK}"
diff --git a/resource_processor/vmss_porter/Dockerfile b/resource_processor/vmss_porter/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.8-slim-buster
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install Azure CLI
-ARG AZURE_CLI_VERSION=2.39.0-1~buster
+ARG AZURE_CLI_VERSION=2.40.0-1~buster
 COPY scripts/azure-cli.sh /tmp/
 RUN export AZURE_CLI_VERSION=${AZURE_CLI_VERSION} \
     && /tmp/azure-cli.sh
@@ -12,11 +12,13 @@ RUN export AZURE_CLI_VERSION=${AZURE_CLI_VERSION} \
 ARG PORTER_MIRROR=https://cdn.porter.sh
 ARG PORTER_PERMALINK=v0.38.13
 ARG PORTER_PKG_PERMALINK=latest
+ARG PORTER_TERRAFORM_MIXIN_PKG_PERMALINK="v1.0.0-rc.1"
 ARG PORTER_HOME=/root/.porter/
 COPY scripts/porter.sh /tmp/
 RUN export PORTER_MIRROR=${PORTER_MIRROR} \
     PORTER_PERMALINK=${PORTER_PERMALINK} \
     PORTER_PKG_PERMALINK=${PORTER_PKG_PERMALINK} \
+    PORTER_TERRAFORM_MIXIN_PKG_PERMALINK=${PORTER_TERRAFORM_MIXIN_PKG_PERMALINK} \
     PORTER_HOME=${PORTER_HOME} \
     && /tmp/porter.sh
 

diff --git a/templates/shared_services/admin-vm/Dockerfile.tmpl b/templates/shared_services/admin-vm/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/shared_services/admin-vm/porter.yaml b/templates/shared_services/admin-vm/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-shared-service-admin-vm
-version: 0.1.0
+version: 0.2.0
 description: "An admin vm shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/shared_services/airlock_notifier/Dockerfile.tmpl b/templates/shared_services/airlock_notifier/Dockerfile.tmpl
@@ -24,12 +24,5 @@ RUN apt-get update \
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
 
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
-
 WORKDIR $BUNDLE_DIR/app
 RUN zip -r /cnab/app/LogicApp.zip .
diff --git a/templates/shared_services/airlock_notifier/porter.yaml b/templates/shared_services/airlock_notifier/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-shared-service-airlock-notifier
-version: 0.1.2
+version: 0.2.0
 description: "A shared service notifying on Airlock Operations"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

diff --git a/templates/shared_services/certs/Dockerfile.tmpl b/templates/shared_services/certs/Dockerfile.tmpl
@@ -38,10 +38,3 @@ RUN apt-get update \
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/shared_services/certs/porter.yaml b/templates/shared_services/certs/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-shared-service-certs
-version: 0.1.4
+version: 0.2.0
 description: "An Azure TRE shared service to generate certificates for a specified internal domain using Letsencrypt"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

diff --git a/templates/shared_services/cyclecloud/Dockerfile.tmpl b/templates/shared_services/cyclecloud/Dockerfile.tmpl
@@ -24,10 +24,3 @@ RUN apt-get update \
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/shared_services/cyclecloud/porter.yaml b/templates/shared_services/cyclecloud/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-shared-service-cyclecloud
-version: 0.2.7
+version: 0.3.0
 description: "An Azure TRE Shared Service Template for Azure Cyclecloud"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

diff --git a/templates/shared_services/firewall/Dockerfile.tmpl b/templates/shared_services/firewall/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/shared_services/firewall/porter.yaml b/templates/shared_services/firewall/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-shared-service-firewall
-version: 0.5.0
+version: 0.6.0
 description: "An Azure TRE Firewall shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/shared_services/gitea/Dockerfile.tmpl b/templates/shared_services/gitea/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/shared_services/gitea/porter.yaml b/templates/shared_services/gitea/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-shared-service-gitea
-version: 0.3.14
+version: 0.4.0
 description: "A Gitea shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl b/templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl
@@ -19,10 +19,3 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/shared_services/sonatype-nexus-vm/porter.yaml b/templates/shared_services/sonatype-nexus-vm/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-shared-service-sonatype-nexus
-version: 2.1.7
+version: 2.2.0
 description: "A Sonatype Nexus shared service"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

diff --git a/templates/workspace_services/azureml/Dockerfile.tmpl b/templates/workspace_services/azureml/Dockerfile.tmpl
@@ -31,10 +31,3 @@ ARG BUNDLE_DIR
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspace_services/azureml/porter.yaml b/templates/workspace_services/azureml/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-service-azureml
-version: 0.4.12
+version: 0.5.0
 description: "An Azure TRE service for Azure Machine Learning"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

diff --git a/templates/workspace_services/azureml/user_resources/aml_compute/Dockerfile.tmpl b/templates/workspace_services/azureml/user_resources/aml_compute/Dockerfile.tmpl
@@ -6,10 +6,4 @@ COPY . $BUNDLE_DIR
 
 # PORTER_MIXINS
 
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && terraform providers mirror /usr/local/share/terraform/plugins
-
 WORKDIR $BUNDLE_DIR
diff --git a/templates/workspace_services/azureml/user_resources/aml_compute/porter.yaml b/templates/workspace_services/azureml/user_resources/aml_compute/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-user-resource-aml-compute-instance
-version: 0.3.2
+version: 0.4.0
 description: "Azure Machine Learning Compute Instance"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

diff --git a/templates/workspace_services/gitea/Dockerfile.tmpl b/templates/workspace_services/gitea/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspace_services/gitea/porter.yaml b/templates/workspace_services/gitea/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-workspace-service-gitea
-version: 0.4.0
+version: 0.5.0
 description: "A Gitea workspace service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/workspace_services/guacamole/Dockerfile.tmpl b/templates/workspace_services/guacamole/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-service-guacamole
-version: 0.4.6
+version: 0.5.0
 description: "An Azure TRE service for Guacamole"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/...rkspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl b/...rkspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl
@@ -32,10 +32,3 @@ COPY . $BUNDLE_DIR
 
 # Apply patch with the difference from the base workspace
 RUN patch -p0 < $BUNDLE_DIR/windowsvm.diff
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/...s/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/porter.yaml b/...s/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-service-guacamole-import-reviewvm
-version: 0.0.3
+version: 0.1.0
 description: "An Azure TRE User Resource Template for reviewing Airlock import requests"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/...lates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl b/...lates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-service-guacamole-linuxvm
-version: 0.4.16
+version: 0.5.0
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/...tes/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl b/...tes/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-service-guacamole-windowsvm
-version: 0.4.14
+version: 0.5.0
 description: "An Azure TRE User Resource Template for Guacamole (Windows 10)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/workspace_services/innereye/Dockerfile.tmpl b/templates/workspace_services/innereye/Dockerfile.tmpl
@@ -38,10 +38,3 @@ ARG BUNDLE_DIR
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspace_services/innereye/porter.yaml b/templates/workspace_services/innereye/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-service-innereye
-version: 0.3.5
+version: 0.4.0
 description: "An Azure TRE service for InnerEye Deep Learning"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

diff --git a/templates/workspace_services/mlflow/Dockerfile.tmpl b/templates/workspace_services/mlflow/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspace_services/mlflow/porter.yaml b/templates/workspace_services/mlflow/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-service-mlflow
-version: 0.3.8
+version: 0.4.0
 description: "An Azure TRE service for MLflow machine learning lifecycle"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/workspace_services/mysql/Dockerfile.tmpl b/templates/workspace_services/mysql/Dockerfile.tmpl
@@ -17,10 +17,3 @@ ARG BUNDLE_DIR
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspace_services/mysql/porter.yaml b/templates/workspace_services/mysql/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-workspace-service-mysql
-version: 0.1.2
+version: 0.2.0
 description: "A MySQL workspace service"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

diff --git a/templates/workspaces/airlock-import-review/Dockerfile.tmpl b/templates/workspaces/airlock-import-review/Dockerfile.tmpl
@@ -34,10 +34,3 @@ COPY . $BUNDLE_DIR
 
 # Apply patch with the difference from the base workspace
 RUN patch -p0 < $BUNDLE_DIR/workspace_base.diff
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins
diff --git a/templates/workspaces/airlock-import-review/porter.yaml b/templates/workspaces/airlock-import-review/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-workspace-airlock-import-review
-version: 0.3.30
+version: 0.4.0
 description: "A workspace to do Airlock Data Import Reviews for Azure TRE"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/workspaces/base/Dockerfile.tmpl b/templates/workspaces/base/Dockerfile.tmpl
@@ -23,10 +23,3 @@ RUN apt-get update && \
 
 # Use the BUNDLE_DIR build argument to copy files into the bundle
 COPY . $BUNDLE_DIR
-
-# Mirror plugins to prevent network access at runtime
-# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
-WORKDIR $BUNDLE_DIR/terraform
-RUN terraform init -backend=false \
-  && rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
-  && terraform providers mirror /usr/local/share/terraform/plugins