Merge branch 'main' into tamirkamara/2451-rp-porter-show

CHANGELOG.md

@@ -24,6 +24,7 @@ ENHANCEMENTS:
 BUG FIXES:
 
 * API health check is also returned by accessing the root path at / ([#2469](https://github.com/microsoft/AzureTRE/pull/2469))
+* Temporary disable AppInsight's private endpoint in base workspace ([#2543](https://github.com/microsoft/AzureTRE/pull/2543))
 * Resource Processor execution optimization (`porter show`) for long-standing services ([#2542](https://github.com/microsoft/AzureTRE/pull/2542))
 
 ## 0.4.2 (August 23, 2022)

templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl

@@ -2,6 +2,9 @@ FROM debian:buster-slim
 
 ARG BUNDLE_DIR
 
+# Disable Terraform checkpoint
+ENV CHECKPOINT_DISABLE=1
+
 # This is a template Dockerfile for the bundle's invocation image
 # You can customize it to use different base images, install tools and copy configuration files.
 #
@@ -22,4 +25,5 @@ COPY . $BUNDLE_DIR
 # 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

templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml

@@ -1,6 +1,6 @@
 ---
 name: tre-service-guacamole-windowsvm
-version: 0.4.5
+version: 0.4.6
 description: "An Azure TRE User Resource Template for Guacamole (Windows 10)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
@@ -86,7 +86,7 @@ outputs:
 mixins:
   - exec
   - terraform:
-      clientVersion: 1.2.6
+      clientVersion: 1.2.8
   - az
 
 install:

templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/main.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.20.0"
+      version = "=3.21.1"
     }
     random = {
       source  = "hashicorp/random"

templates/workspaces/base/Dockerfile.tmpl

@@ -8,6 +8,9 @@ RUN apt-get update && \
     apt-get install -y jq="1.5+dfsg-2+b1" --no-install-recommends && \
     apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
+# Disable Terraform checkpoint
+ENV CHECKPOINT_DISABLE=1
+
 # This is a template Dockerfile for the bundle's invocation image
 # You can customize it to use different base images, install tools and copy configuration files.
 #
@@ -28,4 +31,5 @@ COPY . $BUNDLE_DIR
 # 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

templates/workspaces/base/porter.yaml

@@ -1,6 +1,6 @@
 ---
 name: tre-workspace-base
-version: 0.3.26
+version: 0.3.27
 description: "A base Azure TRE workspace"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
@@ -134,7 +134,7 @@ outputs:
 mixins:
   - exec
   - terraform:
-      clientVersion: 1.2.7
+      clientVersion: 1.2.8
   - az
 
 install:

templates/workspaces/base/terraform/azure-monitor/azure-monitor.tf

@@ -79,6 +79,7 @@ resource "azurerm_monitor_private_link_scoped_service" "ampls_app_insights" {
 }
 
 resource "azurerm_private_endpoint" "azure_monitor_private_endpoint" {
+  count               = 0 # Remove with https://github.com/microsoft/AzureTRE/issues/2357
   name                = "pe-ampls-${var.tre_id}-ws-${local.short_workspace_id}"
   resource_group_name = var.resource_group_name
   location            = var.location