From 46f820e7ba90bd90d74844d03cc3b1bcfa8bd8dd Mon Sep 17 00:00:00 2001 From: James Chapman Date: Tue, 3 Feb 2026 17:47:00 +0000 Subject: [PATCH 01/13] update terraform-azurerm-environment-configuration to 0.7.0 --- core/terraform/airlock/main.tf | 2 +- core/terraform/network/network.tf | 2 +- core/terraform/resource_processor/vmss_porter/main.tf | 2 +- core/version.txt | 2 +- templates/shared_services/certs/porter.yaml | 2 +- templates/shared_services/certs/terraform/main.tf | 2 +- templates/shared_services/cyclecloud/porter.yaml | 2 +- templates/shared_services/cyclecloud/terraform/main.tf | 2 +- templates/shared_services/databricks-auth/porter.yaml | 2 +- .../shared_services/databricks-auth/terraform/providers.tf | 2 +- templates/shared_services/gitea/porter.yaml | 2 +- templates/shared_services/gitea/terraform/main.tf | 2 +- templates/workspace_services/azureml/porter.yaml | 2 +- templates/workspace_services/azureml/terraform/providers.tf | 2 +- templates/workspace_services/azuresql/porter.yaml | 2 +- templates/workspace_services/azuresql/terraform/main.tf | 2 +- templates/workspace_services/databricks/porter.yaml | 2 +- templates/workspace_services/databricks/terraform/providers.tf | 2 +- templates/workspace_services/gitea/porter.yaml | 2 +- templates/workspace_services/gitea/terraform/main.tf | 2 +- templates/workspace_services/guacamole/porter.yaml | 2 +- templates/workspace_services/guacamole/terraform/providers.tf | 2 +- templates/workspace_services/health-services/porter.yaml | 2 +- .../workspace_services/health-services/terraform/providers.tf | 2 +- templates/workspace_services/mysql/porter.yaml | 2 +- templates/workspace_services/mysql/terraform/main.tf | 2 +- templates/workspace_services/ohdsi/porter.yaml | 2 +- templates/workspace_services/ohdsi/terraform/providers.tf | 2 +- templates/workspace_services/openai/porter.yaml | 2 +- templates/workspace_services/openai/terraform/main.tf | 2 +- templates/workspaces/airlock-import-review/porter.yaml | 2 +- .../terraform/import_review_resources.terraform | 2 +- templates/workspaces/base/porter.yaml | 2 +- templates/workspaces/base/terraform/airlock/providers.tf | 2 +- templates/workspaces/base/terraform/network/network.tf | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/core/terraform/airlock/main.tf b/core/terraform/airlock/main.tf index 6dcc6f8cf0..236f2c7615 100644 --- a/core/terraform/airlock/main.tf +++ b/core/terraform/airlock/main.tf @@ -17,6 +17,6 @@ terraform { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/core/terraform/network/network.tf b/core/terraform/network/network.tf index 9e85be11ea..d7d3a513f1 100644 --- a/core/terraform/network/network.tf +++ b/core/terraform/network/network.tf @@ -157,6 +157,6 @@ resource "azurerm_ip_group" "airlock_processor" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/core/terraform/resource_processor/vmss_porter/main.tf b/core/terraform/resource_processor/vmss_porter/main.tf index b84e52abbb..249aaf0099 100644 --- a/core/terraform/resource_processor/vmss_porter/main.tf +++ b/core/terraform/resource_processor/vmss_porter/main.tf @@ -246,6 +246,6 @@ resource "azurerm_private_endpoint" "mgmtblobpe" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/core/version.txt b/core/version.txt index 24d361527f..ca7cbc127e 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.16.12" +__version__ = "0.16.13" diff --git a/templates/shared_services/certs/porter.yaml b/templates/shared_services/certs/porter.yaml index 2c88cbecfa..7d01fd7630 100755 --- a/templates/shared_services/certs/porter.yaml +++ b/templates/shared_services/certs/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-certs -version: 0.7.9 +version: 0.7.10 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/certs/terraform/main.tf b/templates/shared_services/certs/terraform/main.tf index d72ae5f9ed..caae99c4a7 100644 --- a/templates/shared_services/certs/terraform/main.tf +++ b/templates/shared_services/certs/terraform/main.tf @@ -29,6 +29,6 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/shared_services/cyclecloud/porter.yaml b/templates/shared_services/cyclecloud/porter.yaml index 7e019421a4..df454e012a 100644 --- a/templates/shared_services/cyclecloud/porter.yaml +++ b/templates/shared_services/cyclecloud/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-cyclecloud -version: 0.7.4 +version: 0.7.5 description: "An Azure TRE Shared Service Template for Azure Cyclecloud" registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/shared_services/cyclecloud/terraform/main.tf b/templates/shared_services/cyclecloud/terraform/main.tf index e937377ea1..26eefe1e32 100644 --- a/templates/shared_services/cyclecloud/terraform/main.tf +++ b/templates/shared_services/cyclecloud/terraform/main.tf @@ -32,7 +32,7 @@ provider "azurerm" { storage_use_azuread = true } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/shared_services/databricks-auth/porter.yaml b/templates/shared_services/databricks-auth/porter.yaml index fc7ae06217..f7d34be8cc 100644 --- a/templates/shared_services/databricks-auth/porter.yaml +++ b/templates/shared_services/databricks-auth/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-databricks-private-auth -version: 0.1.13 +version: 0.1.14 description: "An Azure TRE shared service for Azure Databricks authentication." registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/shared_services/databricks-auth/terraform/providers.tf b/templates/shared_services/databricks-auth/terraform/providers.tf index d034f8e2c9..1d1e996ce9 100644 --- a/templates/shared_services/databricks-auth/terraform/providers.tf +++ b/templates/shared_services/databricks-auth/terraform/providers.tf @@ -39,6 +39,6 @@ provider "databricks" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/shared_services/gitea/porter.yaml b/templates/shared_services/gitea/porter.yaml index 1fdf3374fb..f9a76a7565 100644 --- a/templates/shared_services/gitea/porter.yaml +++ b/templates/shared_services/gitea/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-gitea -version: 1.2.1 +version: 1.2.2 description: "A Gitea shared service" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/shared_services/gitea/terraform/main.tf b/templates/shared_services/gitea/terraform/main.tf index c25f306743..8757629613 100644 --- a/templates/shared_services/gitea/terraform/main.tf +++ b/templates/shared_services/gitea/terraform/main.tf @@ -41,6 +41,6 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/azureml/porter.yaml b/templates/workspace_services/azureml/porter.yaml index ee98b376ba..d4dd7164de 100644 --- a/templates/workspace_services/azureml/porter.yaml +++ b/templates/workspace_services/azureml/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-azureml -version: 1.1.2 +version: 1.1.3 description: "An Azure TRE service for Azure Machine Learning" registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/workspace_services/azureml/terraform/providers.tf b/templates/workspace_services/azureml/terraform/providers.tf index c707b99b5d..4be62ddabb 100644 --- a/templates/workspace_services/azureml/terraform/providers.tf +++ b/templates/workspace_services/azureml/terraform/providers.tf @@ -38,6 +38,6 @@ provider "azurerm" { provider "azapi" {} module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.3.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/azuresql/porter.yaml b/templates/workspace_services/azuresql/porter.yaml index a385fd5355..7e72065bba 100644 --- a/templates/workspace_services/azuresql/porter.yaml +++ b/templates/workspace_services/azuresql/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-azuresql -version: 1.0.16 +version: 1.0.17 description: "An Azure SQL workspace service" registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/workspace_services/azuresql/terraform/main.tf b/templates/workspace_services/azuresql/terraform/main.tf index eb92d567f5..ccb826ab26 100644 --- a/templates/workspace_services/azuresql/terraform/main.tf +++ b/templates/workspace_services/azuresql/terraform/main.tf @@ -33,7 +33,7 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.5.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/databricks/porter.yaml b/templates/workspace_services/databricks/porter.yaml index 8fdffa2db8..e3222da2f5 100644 --- a/templates/workspace_services/databricks/porter.yaml +++ b/templates/workspace_services/databricks/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-databricks -version: 1.0.14 +version: 1.0.15 description: "An Azure TRE service for Azure Databricks." registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/workspace_services/databricks/terraform/providers.tf b/templates/workspace_services/databricks/terraform/providers.tf index c0f74c4d48..a3b37338bc 100644 --- a/templates/workspace_services/databricks/terraform/providers.tf +++ b/templates/workspace_services/databricks/terraform/providers.tf @@ -60,6 +60,6 @@ provider "dns" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/gitea/porter.yaml b/templates/workspace_services/gitea/porter.yaml index 6a4df69b0f..f9044eb34e 100644 --- a/templates/workspace_services/gitea/porter.yaml +++ b/templates/workspace_services/gitea/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-gitea -version: 1.3.2 +version: 1.3.3 description: "A Gitea workspace service" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/gitea/terraform/main.tf b/templates/workspace_services/gitea/terraform/main.tf index 891398341a..6615a7282a 100644 --- a/templates/workspace_services/gitea/terraform/main.tf +++ b/templates/workspace_services/gitea/terraform/main.tf @@ -41,6 +41,6 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml index f2c17dcb31..b2ce9174b4 100644 --- a/templates/workspace_services/guacamole/porter.yaml +++ b/templates/workspace_services/guacamole/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-guacamole -version: 0.14.1 +version: 0.14.2 description: "An Azure TRE service for Guacamole" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/terraform/providers.tf b/templates/workspace_services/guacamole/terraform/providers.tf index 16df3181a2..79510bd764 100644 --- a/templates/workspace_services/guacamole/terraform/providers.tf +++ b/templates/workspace_services/guacamole/terraform/providers.tf @@ -40,6 +40,6 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/health-services/porter.yaml b/templates/workspace_services/health-services/porter.yaml index e68c73e9f3..97d1be09d5 100644 --- a/templates/workspace_services/health-services/porter.yaml +++ b/templates/workspace_services/health-services/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-health -version: 0.2.13 +version: 0.2.14 description: "An Azure Data Health Services workspace service" registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/workspace_services/health-services/terraform/providers.tf b/templates/workspace_services/health-services/terraform/providers.tf index a009aca748..196c971ec6 100644 --- a/templates/workspace_services/health-services/terraform/providers.tf +++ b/templates/workspace_services/health-services/terraform/providers.tf @@ -33,6 +33,6 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/mysql/porter.yaml b/templates/workspace_services/mysql/porter.yaml index 760daf1f22..6fcc7268ca 100644 --- a/templates/workspace_services/mysql/porter.yaml +++ b/templates/workspace_services/mysql/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-mysql -version: 1.0.10 +version: 1.0.11 description: "A MySQL workspace service" registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/workspace_services/mysql/terraform/main.tf b/templates/workspace_services/mysql/terraform/main.tf index 450be424cd..d5761a8686 100644 --- a/templates/workspace_services/mysql/terraform/main.tf +++ b/templates/workspace_services/mysql/terraform/main.tf @@ -33,7 +33,7 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/ohdsi/porter.yaml b/templates/workspace_services/ohdsi/porter.yaml index 64789cd14e..a2cf1f71d6 100644 --- a/templates/workspace_services/ohdsi/porter.yaml +++ b/templates/workspace_services/ohdsi/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-ohdsi -version: 0.3.5 +version: 0.3.6 description: "An OHDSI workspace service" registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/workspace_services/ohdsi/terraform/providers.tf b/templates/workspace_services/ohdsi/terraform/providers.tf index 5661f5296e..e2f5f98498 100644 --- a/templates/workspace_services/ohdsi/terraform/providers.tf +++ b/templates/workspace_services/ohdsi/terraform/providers.tf @@ -36,6 +36,6 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.3.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspace_services/openai/porter.yaml b/templates/workspace_services/openai/porter.yaml index 7c566619d8..4ad4efc6b9 100644 --- a/templates/workspace_services/openai/porter.yaml +++ b/templates/workspace_services/openai/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-openai -version: 1.0.7 +version: 1.0.8 description: "An OpenAI workspace service" registry: azuretre dockerfile: Dockerfile.tmpl diff --git a/templates/workspace_services/openai/terraform/main.tf b/templates/workspace_services/openai/terraform/main.tf index 1de2b80dfe..39c0a0c2fa 100644 --- a/templates/workspace_services/openai/terraform/main.tf +++ b/templates/workspace_services/openai/terraform/main.tf @@ -29,7 +29,7 @@ provider "azurerm" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.6.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspaces/airlock-import-review/porter.yaml b/templates/workspaces/airlock-import-review/porter.yaml index bcd0e0b8b4..9b1981dac0 100644 --- a/templates/workspaces/airlock-import-review/porter.yaml +++ b/templates/workspaces/airlock-import-review/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-airlock-import-review -version: 0.14.7 +version: 0.14.8 description: "A workspace to do Airlock Data Import Reviews for Azure TRE" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform b/templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform index 9726ece20f..3fbfb6e2bc 100644 --- a/templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform +++ b/templates/workspaces/airlock-import-review/terraform/import_review_resources.terraform @@ -8,7 +8,7 @@ locals { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspaces/base/porter.yaml b/templates/workspaces/base/porter.yaml index c970a581d9..a71c799ebe 100644 --- a/templates/workspaces/base/porter.yaml +++ b/templates/workspaces/base/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-base -version: 2.8.1 +version: 2.8.2 description: "A base Azure TRE workspace" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspaces/base/terraform/airlock/providers.tf b/templates/workspaces/base/terraform/airlock/providers.tf index efae766056..2f4bb2ad08 100644 --- a/templates/workspaces/base/terraform/airlock/providers.tf +++ b/templates/workspaces/base/terraform/airlock/providers.tf @@ -18,6 +18,6 @@ terraform { module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.2.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/templates/workspaces/base/terraform/network/network.tf b/templates/workspaces/base/terraform/network/network.tf index f743a2aac8..4633f6ddf3 100644 --- a/templates/workspaces/base/terraform/network/network.tf +++ b/templates/workspaces/base/terraform/network/network.tf @@ -126,7 +126,7 @@ resource "azurerm_subnet_route_table_association" "rt_webapps_subnet_association } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.6.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } From 41a81cb5aa26cdcf3f29698d875e7aabeee31074 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Wed, 4 Feb 2026 09:25:07 +0000 Subject: [PATCH 02/13] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f70e5d2759..5783f02342 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ ENHANCEMENTS: * Update SuperLinter to version 8.3.2 ([#4815](https://github.com/microsoft/AzureTRE/issues/4815)) * Add porter build cache in CI ([#4827](https://github.com/microsoft/AzureTRE/issues/4827)) * Migrate GitHub Actions workflows to use ubuntu-slim runners for improved efficiency and reduced cost ([#4831](https://github.com/microsoft/AzureTRE/pull/4831)) +* Update terraform-azurerm-environment-configuration to v0.7.0. ([#4841](https://github.com/microsoft/AzureTRE/pull/4841)) BUG FIXES: * Replace deprecated `--username` flag with `--client-id` in `az login --identity` commands across all Porter bundles ([#4817](https://github.com/microsoft/AzureTRE/issues/4817)) From 24eba591f031f7a7c819e2d7699e64540ab52e4c Mon Sep 17 00:00:00 2001 From: James Chapman Date: Wed, 4 Feb 2026 09:31:30 +0000 Subject: [PATCH 03/13] attempt to fix linting error --- .github/linters/.tflint_core.hcl | 2 +- .github/linters/.tflint_shared_services.hcl | 2 +- .github/linters/.tflint_user_resources.hcl | 2 +- .github/linters/.tflint_workspaces.hcl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/linters/.tflint_core.hcl b/.github/linters/.tflint_core.hcl index db65997bc7..fb153226c1 100644 --- a/.github/linters/.tflint_core.hcl +++ b/.github/linters/.tflint_core.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "all" + call_module_type = "local" force = false } diff --git a/.github/linters/.tflint_shared_services.hcl b/.github/linters/.tflint_shared_services.hcl index af1b7de5de..359068c665 100644 --- a/.github/linters/.tflint_shared_services.hcl +++ b/.github/linters/.tflint_shared_services.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "all" + call_module_type = "local" force = false } diff --git a/.github/linters/.tflint_user_resources.hcl b/.github/linters/.tflint_user_resources.hcl index 64316a249b..4a706168fe 100644 --- a/.github/linters/.tflint_user_resources.hcl +++ b/.github/linters/.tflint_user_resources.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "all" + call_module_type = "local" force = false } diff --git a/.github/linters/.tflint_workspaces.hcl b/.github/linters/.tflint_workspaces.hcl index ddcd381282..97a827cd4f 100644 --- a/.github/linters/.tflint_workspaces.hcl +++ b/.github/linters/.tflint_workspaces.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "all" + call_module_type = "local" force = false } From 053fe2dbb6ca8b1066efc23ffa37a470849e4f1b Mon Sep 17 00:00:00 2001 From: James Chapman Date: Wed, 4 Feb 2026 11:51:16 +0000 Subject: [PATCH 04/13] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5783f02342..811d39f9c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ ENHANCEMENTS: * Update SuperLinter to version 8.3.2 ([#4815](https://github.com/microsoft/AzureTRE/issues/4815)) * Add porter build cache in CI ([#4827](https://github.com/microsoft/AzureTRE/issues/4827)) * Migrate GitHub Actions workflows to use ubuntu-slim runners for improved efficiency and reduced cost ([#4831](https://github.com/microsoft/AzureTRE/pull/4831)) -* Update terraform-azurerm-environment-configuration to v0.7.0. ([#4841](https://github.com/microsoft/AzureTRE/pull/4841)) +* Update terraform-azurerm-environment-configuration to v0.7.0 ([#4841](https://github.com/microsoft/AzureTRE/pull/4841)) BUG FIXES: * Replace deprecated `--username` flag with `--client-id` in `az login --identity` commands across all Porter bundles ([#4817](https://github.com/microsoft/AzureTRE/issues/4817)) From 9ed3edd22fc89abbccd20513124687be9de17be2 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Wed, 4 Feb 2026 13:08:55 +0000 Subject: [PATCH 05/13] revert tflint --- .github/linters/.tflint_shared_services.hcl | 2 +- .github/linters/.tflint_user_resources.hcl | 2 +- .github/linters/.tflint_workspace_services.hcl | 2 +- .github/linters/.tflint_workspaces.hcl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/linters/.tflint_shared_services.hcl b/.github/linters/.tflint_shared_services.hcl index 359068c665..af1b7de5de 100644 --- a/.github/linters/.tflint_shared_services.hcl +++ b/.github/linters/.tflint_shared_services.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "local" + call_module_type = "all" force = false } diff --git a/.github/linters/.tflint_user_resources.hcl b/.github/linters/.tflint_user_resources.hcl index 4a706168fe..64316a249b 100644 --- a/.github/linters/.tflint_user_resources.hcl +++ b/.github/linters/.tflint_user_resources.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "local" + call_module_type = "all" force = false } diff --git a/.github/linters/.tflint_workspace_services.hcl b/.github/linters/.tflint_workspace_services.hcl index b5d1c5b7bd..c926123ed1 100644 --- a/.github/linters/.tflint_workspace_services.hcl +++ b/.github/linters/.tflint_workspace_services.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "local" + call_module_type = "all" force = false } diff --git a/.github/linters/.tflint_workspaces.hcl b/.github/linters/.tflint_workspaces.hcl index 97a827cd4f..ddcd381282 100644 --- a/.github/linters/.tflint_workspaces.hcl +++ b/.github/linters/.tflint_workspaces.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "local" + call_module_type = "all" force = false } From 51ee0d4ea2fb4f593efc3b7a6a5baf59ab30ae30 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Wed, 4 Feb 2026 13:09:45 +0000 Subject: [PATCH 06/13] tflint update --- .github/linters/.tflint_core.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/.tflint_core.hcl b/.github/linters/.tflint_core.hcl index fb153226c1..db65997bc7 100644 --- a/.github/linters/.tflint_core.hcl +++ b/.github/linters/.tflint_core.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "local" + call_module_type = "all" force = false } From ff342bff05a2967bc22a70a2f300862d54459054 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Wed, 4 Feb 2026 13:10:25 +0000 Subject: [PATCH 07/13] revert tflint --- .github/linters/.tflint_workspace_services.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/linters/.tflint_workspace_services.hcl b/.github/linters/.tflint_workspace_services.hcl index c926123ed1..b5d1c5b7bd 100644 --- a/.github/linters/.tflint_workspace_services.hcl +++ b/.github/linters/.tflint_workspace_services.hcl @@ -1,7 +1,7 @@ # This is used for TRE tags validation only. config { - call_module_type = "all" + call_module_type = "local" force = false } From 4effe761e2d7b3c65f3979137fe645066bf7acce Mon Sep 17 00:00:00 2001 From: James Chapman Date: Wed, 4 Feb 2026 13:18:47 +0000 Subject: [PATCH 08/13] remove duplicate TOPIC_SUBSCRIPTION_NAME in core/terraform/airlock/airlock_processor.tf --- core/terraform/airlock/airlock_processor.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/core/terraform/airlock/airlock_processor.tf b/core/terraform/airlock/airlock_processor.tf index 48fbde6bc6..981e81bb13 100644 --- a/core/terraform/airlock/airlock_processor.tf +++ b/core/terraform/airlock/airlock_processor.tf @@ -96,7 +96,6 @@ resource "azurerm_linux_function_app" "airlock_function_app" { "WEBSITE_CONTENTOVERVNET" = 1 "STORAGE_ENDPOINT_SUFFIX" = module.terraform_azurerm_environment_configuration.storage_suffix - "TOPIC_SUBSCRIPTION_NAME" = azurerm_servicebus_subscription.airlock_processor.name "AzureWebJobsStorage__clientId" = azurerm_user_assigned_identity.airlock_id.client_id "AzureWebJobsStorage__credential" = "managedidentity" From 40e6c7201e636aacf4a2c0d1cb92b91bc2b9b802 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Wed, 4 Feb 2026 13:30:46 +0000 Subject: [PATCH 09/13] Move lint fixes to another branch --- core/terraform/airlock/airlock_processor.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/core/terraform/airlock/airlock_processor.tf b/core/terraform/airlock/airlock_processor.tf index 981e81bb13..48fbde6bc6 100644 --- a/core/terraform/airlock/airlock_processor.tf +++ b/core/terraform/airlock/airlock_processor.tf @@ -96,6 +96,7 @@ resource "azurerm_linux_function_app" "airlock_function_app" { "WEBSITE_CONTENTOVERVNET" = 1 "STORAGE_ENDPOINT_SUFFIX" = module.terraform_azurerm_environment_configuration.storage_suffix + "TOPIC_SUBSCRIPTION_NAME" = azurerm_servicebus_subscription.airlock_processor.name "AzureWebJobsStorage__clientId" = azurerm_user_assigned_identity.airlock_id.client_id "AzureWebJobsStorage__credential" = "managedidentity" From b02b1f6b22114baacfd145a982da49561030a2d3 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Fri, 6 Feb 2026 09:37:15 +0000 Subject: [PATCH 10/13] update version --- templates/workspace_services/mysql/porter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspace_services/mysql/porter.yaml b/templates/workspace_services/mysql/porter.yaml index 375cd09bb8..80ce54d0a8 100644 --- a/templates/workspace_services/mysql/porter.yaml +++ b/templates/workspace_services/mysql/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-mysql -version: 1.0.11 +version: 1.0.12 description: "A MySQL workspace service" registry: azuretre dockerfile: Dockerfile.tmpl From f46d6727f0ff6bda933f81e0d8fcc98bc95e2578 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Fri, 6 Feb 2026 09:38:53 +0000 Subject: [PATCH 11/13] update core --- core/terraform/main.tf | 2 +- core/version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/terraform/main.tf b/core/terraform/main.tf index ab8545e7b1..b2f9a6f225 100644 --- a/core/terraform/main.tf +++ b/core/terraform/main.tf @@ -230,6 +230,6 @@ module "resource_processor_vmss_porter" { } module "terraform_azurerm_environment_configuration" { - source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.6.0" + source = "git::https://github.com/microsoft/terraform-azurerm-environment-configuration.git?ref=0.7.0" arm_environment = var.arm_environment } diff --git a/core/version.txt b/core/version.txt index ca7cbc127e..b27f61bc3c 100644 --- a/core/version.txt +++ b/core/version.txt @@ -1 +1 @@ -__version__ = "0.16.13" +__version__ = "0.16.14" From a48c7b9a3bcf690a466f98e3ebf680ff0525f6b1 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Fri, 6 Feb 2026 09:46:19 +0000 Subject: [PATCH 12/13] fix missing lint plugin source --- .github/linters/.tflint_workspaces.hcl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/linters/.tflint_workspaces.hcl b/.github/linters/.tflint_workspaces.hcl index bfb0c85e20..86862b463b 100644 --- a/.github/linters/.tflint_workspaces.hcl +++ b/.github/linters/.tflint_workspaces.hcl @@ -7,6 +7,8 @@ config { plugin "azurerm" { enabled = true + version = "0.30.0" + source = "github.com/terraform-linters/tflint-ruleset-azurerm" } rule "azurerm_resource_missing_tags" { From 3740f69b6607c03ff9f13c08495fd389637b9305 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Fri, 6 Feb 2026 10:05:48 +0000 Subject: [PATCH 13/13] update changelog --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 278e7ab3d8..bf898b8fda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * _No changes yet_ ENHANCEMENTS: -* _No changes yet_ +* Update terraform-azurerm-environment-configuration to v0.7.0 ([#4841](https://github.com/microsoft/AzureTRE/pull/4841)) BUG FIXES: * _No changes yet_ @@ -28,7 +28,6 @@ ENHANCEMENTS: * Update SuperLinter to version 8.3.2 ([#4815](https://github.com/microsoft/AzureTRE/issues/4815)) * Add porter build cache in CI ([#4827](https://github.com/microsoft/AzureTRE/issues/4827)) * Migrate GitHub Actions workflows to use ubuntu-slim runners for improved efficiency and reduced cost ([#4831](https://github.com/microsoft/AzureTRE/pull/4831)) -* Update terraform-azurerm-environment-configuration to v0.7.0 ([#4841](https://github.com/microsoft/AzureTRE/pull/4841)) BUG FIXES: * Replace deprecated `--username` flag with `--client-id` in `az login --identity` commands across all Porter bundles ([#4817](https://github.com/microsoft/AzureTRE/issues/4817))