Super linter pipeline fixes and fixes to mysql template and airlock_processor.tf (#4847)

JC-wk · web-flow · commit 9bf7561994fe · 2026-02-05T16:41:39.000Z
diff --git a/.github/linters/.tflint_core.hcl b/.github/linters/.tflint_core.hcl
@@ -1,19 +1,25 @@
 # This is used for TRE tags validation only.
 
 config {
-  call_module_type = "all"
+  call_module_type = "local"
   force = false
 }
 
 plugin "azurerm" {
     enabled = true
-}
-
-rule "terraform_typed_variables" {
-  enabled = false
+    version = "0.30.0"
+    source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
 }
 
 rule "azurerm_resource_missing_tags" {
   enabled = true
   tags = ["tre_id"]
 }
+
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "azurerm_resources_missing_prevent_destroy" {
+  enabled = false
+}
diff --git a/.github/linters/.tflint_shared_services.hcl b/.github/linters/.tflint_shared_services.hcl
@@ -1,15 +1,25 @@
 # This is used for TRE tags validation only.
 
 config {
-  call_module_type = "all"
+  call_module_type = "local"
   force = false
 }
 
 plugin "azurerm" {
     enabled = true
+    version = "0.30.0"
+    source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
 }
 
 rule "azurerm_resource_missing_tags" {
   enabled = true
   tags = ["tre_id", "tre_shared_service_id"]
 }
+
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "azurerm_resources_missing_prevent_destroy" {
+  enabled = false
+}
diff --git a/.github/linters/.tflint_user_resources.hcl b/.github/linters/.tflint_user_resources.hcl
@@ -1,15 +1,25 @@
 # This is used for TRE tags validation only.
 
 config {
-  call_module_type = "all"
+  call_module_type = "local"
   force = false
 }
 
 plugin "azurerm" {
     enabled = true
+    version = "0.30.0"
+    source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
 }
 
 rule "azurerm_resource_missing_tags" {
   enabled = true
   tags = ["tre_id", "tre_workspace_id", "tre_workspace_service_id", "tre_user_resource_id"]
 }
+
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "azurerm_resources_missing_prevent_destroy" {
+  enabled = false
+}
diff --git a/.github/linters/.tflint_workspace_services.hcl b/.github/linters/.tflint_workspace_services.hcl
@@ -7,13 +7,19 @@ config {
 
 plugin "azurerm" {
     enabled = true
+    version = "0.30.0"
+    source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
 }
 
 rule "azurerm_resource_missing_tags" {
   enabled = true
   tags = ["tre_id", "tre_workspace_id", "tre_workspace_service_id"]
 }
 
+rule "terraform_required_version" {
+  enabled = false
+}
+
 rule "azurerm_resources_missing_prevent_destroy" {
   enabled = false
 }
diff --git a/.github/linters/.tflint_workspaces.hcl b/.github/linters/.tflint_workspaces.hcl
@@ -1,19 +1,23 @@
 # This is used for TRE tags validation only.
 
 config {
-  call_module_type = "all"
+  call_module_type = "local"
   force = false
 }
 
 plugin "azurerm" {
     enabled = true
 }
 
-rule "terraform_typed_variables" {
-  enabled = false
-}
-
 rule "azurerm_resource_missing_tags" {
   enabled = true
   tags = ["tre_id", "tre_workspace_id"]
 }
+
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "azurerm_resources_missing_prevent_destroy" {
+  enabled = false
+}
diff --git a/.github/workflows/build_validation_develop.yml b/.github/workflows/build_validation_develop.yml
@@ -142,7 +142,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_TERRAFORM_TFLINT: true
           TERRAFORM_TFLINT_CONFIG_FILE: .tflint_workspace_services.hcl
-          FILTER_REGEX_INCLUDE: "./templates/workspaces/.*"
+          FILTER_REGEX_INCLUDE: "./templates/workspace_services/.*"
           FILTER_REGEX_EXCLUDE: ".*user_resource.*"
 
       - name: User Resources Tags
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,8 @@ BUG FIXES:
 * Fix type mismatch error where `{{ resource.parent.my_boolean_property }}` was returning string instead of the correct type ([#4813](https://github.com/microsoft/AzureTRE/issues/4813))
 * Delete npm package lock file ([#4810](https://github.com/microsoft/AzureTRE/issues/4810))
 * Switch from yarn to npm ([#4837](https://github.com/microsoft/AzureTRE/issues/4837))
+* Fix Mysql template ignored storage_mb ([#4846](https://github.com/microsoft/AzureTRE/issues/4846))
+* Fix duplicate `TOPIC_SUBSCRIPTION_NAME` in `core/terraform/airlock/airlock_processor.tf` ([#4847](https://github.com/microsoft/AzureTRE/pull/4847))
 
 COMPONENTS:
 
diff --git 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"
 
diff --git a/core/version.txt b/core/version.txt
@@ -1 +1 @@
-__version__ = "0.16.12"
+__version__ = "0.16.13"
diff --git 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
@@ -50,7 +50,7 @@ parameters:
     default: "B | 4GB 2vCores"
   - name: storage_mb
     type: integer
-    default: 5120
+    default: 20480
   - name: db_name
     type: string
     default: tredb
diff --git a/templates/workspace_services/mysql/template_schema.json b/templates/workspace_services/mysql/template_schema.json
@@ -24,7 +24,9 @@
       "type": "number",
       "title": "Max storage allowed for a server",
       "description": "Max storage allowed for a server",
-      "default": 5120
+      "default": 20480,
+      "minimum": 20480,
+      "maximum": 16777216
     },
     "db_name": {
       "$id": "#/properties/db_name",
diff --git a/templates/workspace_services/mysql/terraform/locals.tf b/templates/workspace_services/mysql/terraform/locals.tf
@@ -5,6 +5,7 @@ locals {
   service_resource_name_suffix   = "${var.tre_id}-ws-${local.short_workspace_id}-svc-${local.short_service_id}"
   keyvault_name                  = lower("kv-${substr(local.workspace_resource_name_suffix, -20, -1)}")
   core_resource_group_name       = "rg-${var.tre_id}"
+  max_storage_gb                 = ceil(var.storage_mb / 1024)
   sql_sku = {
     "B | 4GB 2vCores"   = { value = "B_Standard_B2s" },
     "GP | 8GB 2vCores"  = { value = "GP_Standard_D2ds_v4" },
diff --git a/templates/workspace_services/mysql/terraform/mysql.tf b/templates/workspace_services/mysql/terraform/mysql.tf
@@ -18,6 +18,10 @@ resource "azurerm_mysql_flexible_server" "mysql" {
   geo_redundant_backup_enabled = false
   tags                         = local.workspace_service_tags
 
+  storage {
+    size_gb = local.max_storage_gb
+  }
+
   lifecycle { ignore_changes = [tags, zone] }
 }
 
diff --git a/templates/workspace_services/mysql/terraform/variables.tf b/templates/workspace_services/mysql/terraform/variables.tf
@@ -16,7 +16,7 @@ variable "db_name" {
 variable "storage_mb" {
   type = number
   validation {
-    condition     = var.storage_mb > 5119 && var.storage_mb < 1048577
+    condition     = var.storage_mb > 20479 && var.storage_mb < 16777217
     error_message = "The storage value is out of range."
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,19 @@ config {`
`7`	`7`
`8`	`8`	`plugin "azurerm" {`
`9`	`9`	`enabled = true`
	`10`	`+ version = "0.30.0"`
	`11`	`+ source = "github.com/terraform-linters/tflint-ruleset-azurerm"`
`10`	`12`	`}`
`11`	`13`
`12`	`14`	`rule "azurerm_resource_missing_tags" {`
`13`	`15`	`enabled = true`
`14`	`16`	`tags = ["tre_id", "tre_workspace_id", "tre_workspace_service_id"]`
`15`	`17`	`}`
`16`	`18`
	`19`	`+rule "terraform_required_version" {`
	`20`	`+ enabled = false`
	`21`	`+}`
	`22`	`+`
`17`	`23`	`rule "azurerm_resources_missing_prevent_destroy" {`
`18`	`24`	`enabled = false`
`19`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "0.16.12"`
	`1`	`+__version__ = "0.16.13"`