terraform_typed_variables turn on

.github/linters/.tflint.hcl

@@ -12,7 +12,7 @@ rule "terraform_unused_declarations" {
 }
 
 rule "terraform_typed_variables" {
-  enabled = false
+  enabled = true
 }
 
 rule "terraform_required_providers" {

.github/linters/.tflint_shared_services.hcl

@@ -9,10 +9,6 @@ plugin "azurerm" {
     enabled = true
 }
 
-rule "terraform_typed_variables" {
-  enabled = false
-}
-
 rule "azurerm_resource_missing_tags" {
   enabled = true
   tags = ["tre_id", "tre_shared_service_id"]

.github/linters/.tflint_user_resources.hcl

@@ -9,10 +9,6 @@ plugin "azurerm" {
     enabled = true
 }
 
-rule "terraform_typed_variables" {
-  enabled = false
-}
-
 rule "azurerm_resource_missing_tags" {
   enabled = true
   tags = ["tre_id", "tre_workspace_id", "tre_workspace_service_id", "tre_user_resource_id"]

.github/linters/.tflint_workspace_services.hcl

@@ -9,10 +9,6 @@ plugin "azurerm" {
     enabled = true
 }
 
-rule "terraform_typed_variables" {
-  enabled = false
-}
-
 rule "azurerm_resource_missing_tags" {
   enabled = true
   tags = ["tre_id", "tre_workspace_id", "tre_workspace_service_id"]

core/terraform/airlock/variables.tf

@@ -1,11 +1,27 @@
-variable "tre_id" {}
-variable "location" {}
-variable "resource_group_name" {}
-variable "airlock_storage_subnet_id" {}
-variable "airlock_events_subnet_id" {}
-variable "enable_local_debugging" {}
-variable "myip" {}
-variable "api_principal_id" {}
+variable "tre_id" {
+  type = string
+}
+variable "location" {
+  type = string
+}
+variable "resource_group_name" {
+  type = string
+}
+variable "airlock_storage_subnet_id" {
+  type = string
+}
+variable "airlock_events_subnet_id" {
+  type = string
+}
+variable "enable_local_debugging" {
+  type = bool
+}
+variable "myip" {
+  type = string
+}
+variable "api_principal_id" {
+  type = string
+}
 
 variable "docker_registry_server" {
   type        = string
@@ -33,22 +49,45 @@ variable "airlock_app_service_plan_sku" {
   default = "P1v3"
 }
 
-variable "airlock_processor_subnet_id" {}
+variable "airlock_processor_subnet_id" {
+  type = string
+}
 
-variable "applicationinsights_connection_string" {}
-variable "airlock_servicebus" {}
-variable "tre_core_tags" {}
+variable "applicationinsights_connection_string" {
+  type = string
+}
+variable "airlock_servicebus" {
+  type = object({
+    id                                = string
+    default_primary_connection_string = string
+  })
+}
+variable "tre_core_tags" {
+  type = map(string)
+}
 
 variable "enable_malware_scanning" {
   type        = bool
   description = "If False, Airlock requests will skip the malware scanning stage"
 }
 
-variable "arm_environment" {}
+variable "arm_environment" {
+  type = string
+}
 
-variable "log_analytics_workspace_id" {}
+variable "log_analytics_workspace_id" {
+  type = string
+}
 
-variable "blob_core_dns_zone_id" {}
-variable "file_core_dns_zone_id" {}
-variable "queue_core_dns_zone_id" {}
-variable "table_core_dns_zone_id" {}
+variable "blob_core_dns_zone_id" {
+  type = string
+}
+variable "file_core_dns_zone_id" {
+  type = string
+}
+variable "queue_core_dns_zone_id" {
+  type = string
+}
+variable "table_core_dns_zone_id" {
+  type = string
+}

core/terraform/appgateway/variables.tf

@@ -1,10 +1,28 @@
 
-variable "tre_id" {}
-variable "location" {}
-variable "resource_group_name" {}
-variable "app_gw_subnet" {}
-variable "shared_subnet" {}
-variable "api_fqdn" {}
-variable "keyvault_id" {}
-variable "static_web_dns_zone_id" {}
-variable "log_analytics_workspace_id" {}
+variable "tre_id" {
+  type = string
+}
+variable "location" {
+  type = string
+}
+variable "resource_group_name" {
+  type = string
+}
+variable "app_gw_subnet" {
+  type = string
+}
+variable "shared_subnet" {
+  type = string
+}
+variable "api_fqdn" {
+  type = string
+}
+variable "keyvault_id" {
+  type = string
+}
+variable "static_web_dns_zone_id" {
+  type = string
+}
+variable "log_analytics_workspace_id" {
+  type = string
+}

core/terraform/azure-monitor/variables.tf

@@ -1,11 +1,33 @@
-variable "tre_id" {}
-variable "location" {}
-variable "resource_group_name" {}
-variable "shared_subnet_id" {}
-variable "azure_monitor_dns_zone_id" {}
-variable "azure_monitor_oms_opinsights_dns_zone_id" {}
-variable "azure_monitor_ods_opinsights_dns_zone_id" {}
-variable "azure_monitor_agentsvc_dns_zone_id" {}
-variable "blob_core_dns_zone_id" {}
-variable "tre_core_tags" {}
-variable "enable_local_debugging" {}
+variable "tre_id" {
+  type = string
+}
+variable "location" {
+  type = string
+}
+variable "resource_group_name" {
+  type = string
+}
+variable "shared_subnet_id" {
+  type = string
+}
+variable "azure_monitor_dns_zone_id" {
+  type = string
+}
+variable "azure_monitor_oms_opinsights_dns_zone_id" {
+  type = string
+}
+variable "azure_monitor_ods_opinsights_dns_zone_id" {
+  type = string
+}
+variable "azure_monitor_agentsvc_dns_zone_id" {
+  type = string
+}
+variable "blob_core_dns_zone_id" {
+  type = string
+}
+variable "tre_core_tags" {
+  type = map(string)
+}
+variable "enable_local_debugging" {
+  type = bool
+}

core/terraform/network/variables.tf

@@ -1,5 +1,15 @@
-variable "tre_id" {}
-variable "location" {}
-variable "resource_group_name" {}
-variable "core_address_space" {}
-variable "arm_environment" {}
+variable "tre_id" {
+  type = string
+}
+variable "location" {
+  type = string
+}
+variable "resource_group_name" {
+  type = string
+}
+variable "core_address_space" {
+  type = string
+}
+variable "arm_environment" {
+  type = string
+}

core/terraform/resource_processor/vmss_porter/variables.tf

@@ -1,24 +1,66 @@
-variable "tre_id" {}
-variable "location" {}
-variable "acr_id" {}
-variable "resource_group_name" {}
-variable "resource_processor_subnet_id" {}
-variable "resource_processor_vmss_porter_image_repository" {}
-variable "docker_registry_server" {}
-variable "service_bus_namespace_id" {}
-variable "service_bus_namespace_fqdn" {}
-variable "service_bus_resource_request_queue" {}
-variable "service_bus_deployment_status_update_queue" {}
-variable "mgmt_storage_account_name" {}
-variable "mgmt_resource_group_name" {}
-variable "terraform_state_container_name" {}
-variable "app_insights_connection_string" {}
-variable "key_vault_name" {}
-variable "key_vault_url" {}
-variable "key_vault_id" {}
-variable "resource_processor_number_processes_per_instance" {}
-variable "resource_processor_vmss_sku" {}
-variable "arm_environment" {}
+variable "tre_id" {
+  type = string
+}
+variable "location" {
+  type = string
+}
+variable "acr_id" {
+  type = string
+}
+variable "resource_group_name" {
+  type = string
+}
+variable "resource_processor_subnet_id" {
+  type = string
+}
+variable "resource_processor_vmss_porter_image_repository" {
+  type = string
+}
+variable "docker_registry_server" {
+  type = string
+}
+variable "service_bus_namespace_id" {
+  type = string
+}
+variable "service_bus_namespace_fqdn" {
+  type = string
+}
+variable "service_bus_resource_request_queue" {
+  type = string
+}
+variable "service_bus_deployment_status_update_queue" {
+  type = string
+}
+variable "mgmt_storage_account_name" {
+  type = string
+}
+variable "mgmt_resource_group_name" {
+  type = string
+}
+variable "terraform_state_container_name" {
+  type = string
+}
+variable "app_insights_connection_string" {
+  type = string
+}
+variable "key_vault_name" {
+  type = string
+}
+variable "key_vault_url" {
+  type = string
+}
+variable "key_vault_id" {
+  type = string
+}
+variable "resource_processor_number_processes_per_instance" {
+  type = string
+}
+variable "resource_processor_vmss_sku" {
+  type = string
+}
+variable "arm_environment" {
+  type = string
+}
 variable "subscription_id" {
   description = "The subscription id to create the resource processor permission/role. If not supplied will use the TF context."
   type        = string

core/version.txt

@@ -1 +1 @@
-__version__ = "0.8.4"
+__version__ = "0.8.5"

templates/shared_services/cyclecloud/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-cyclecloud
-version: 0.5.1
+version: 0.5.2
 description: "An Azure TRE Shared Service Template for Azure Cyclecloud"
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/shared_services/cyclecloud/terraform/variables.tf

@@ -1,3 +1,9 @@
-variable "tre_id" {}
-variable "tre_resource_id" {}
-variable "arm_environment" {}
+variable "tre_id" {
+  type = string
+}
+variable "tre_resource_id" {
+  type = string
+}
+variable "arm_environment" {
+  type = string
+}

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.2
+version: 0.1.3
 description: "An Azure TRE shared service for Azure Databricks authentication."
 registry: azuretre
 dockerfile: Dockerfile.tmpl

templates/shared_services/databricks-auth/terraform/variables.tf

@@ -8,4 +8,6 @@ variable "tre_resource_id" {
   description = "Unique TRE Resource ID"
 }
 
-variable "arm_environment" {}
+variable "arm_environment" {
+  type = string
+}

templates/shared_services/gitea/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-gitea
-version: 0.6.2
+version: 0.6.3
 description: "A Gitea shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

templates/shared_services/gitea/terraform/variables.tf

@@ -30,4 +30,6 @@ variable "acr_name" {
   description = "Name of Azure Container Registry"
 }
 
-variable "arm_environment" {}
+variable "arm_environment" {
+  type = string
+}

templates/workspace_services/azureml/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-azureml
-version: 0.8.7
+version: 0.8.8
 description: "An Azure TRE service for Azure Machine Learning"
 registry: azuretre
 dockerfile: Dockerfile.tmpl