Update to v0.29.0

.devcontainer/devcontainer.json

@@ -18,7 +18,7 @@
       "DOCKER_GROUP_ID": "${localEnv:DOCKER_GROUP_ID}",
       "INTERACTIVE": "true",
       "UPSTREAM_REPO": "microsoft/AzureTRE",
-      "UPSTREAM_REPO_VERSION": "v0.28.0",
+      "UPSTREAM_REPO_VERSION": "v0.29.0",
       "GITHUB_TOKEN": ""
     }
   },

.github/actions/devcontainer_run_command/action.yml

@@ -27,12 +27,21 @@ inputs:
   AAD_TENANT_ID:
     description: "The Tenant Id where the App is registered and the Test User is registered for the E2E Tests."
     required: false
+  TEST_APP_ID:
+    description: "The Test Application Id used to interact with the API."
+    required: false
   TEST_ACCOUNT_CLIENT_ID:
     description: "The Test Automation Account Client Id used to interact with the API."
     required: false
   TEST_ACCOUNT_CLIENT_SECRET:
     description: "The Test Automation Account Client Secret used to interact with the API."
     required: false
+  TEST_WORKSPACE_APP_ID:
+    description: "The Test Workspace application Id used to interact with the API."
+    required: false
+  TEST_WORKSPACE_APP_SECRET:
+    description: "The Test Workspace application secret used to interact with the API."
+    required: false
   TRE_ID:
     description: "The TRE Id."
     required: false
@@ -107,6 +116,9 @@ inputs:
     description: "The AppService plan sku used by tests"
     required: false
     default: ""
+  RESOURCE_PROCESSOR_VMSS_SKU:
+    description: "The SKU of the resource processor VMSS."
+    required: false
   RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE:
     description: "The number of resource processor processes to create for parallel operations"
     required: false
@@ -181,7 +193,7 @@ runs:
         echo "AZURE_ENVIRONMENT=$azure_env" >> $GITHUB_ENV
 
     - name: Azure Login
-      uses: azure/login@v2
+      uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
       if: contains(inputs.COMMAND, 'make bootstrap') != true
       with:
         client-id: ${{ inputs.AZURE_CLIENT_ID }}
@@ -198,14 +210,14 @@ runs:
     - name: Construct TRE_URL
       shell: bash
       run: |
-        source .github/scripts/construct_tre_url.sh
+        source devops/scripts/construct_tre_url.sh
         tre_url=$(construct_tre_url "${{ inputs.TRE_ID }}" "${{ inputs.LOCATION }}" "${{ env.AZURE_ENVIRONMENT }}")
         echo "TRE_URL=$tre_url" >> $GITHUB_ENV
 
     - name: Construct ARM_ENVIRONMENT
       shell: bash
       run: |
-        source .github/scripts/convert_azure_env_to_arm_env.sh
+        source devops/scripts/convert_azure_env_to_arm_env.sh
         arm_environment=$(convert_azure_env_to_arm_env "${{ env.AZURE_ENVIRONMENT }}")
         echo "ARM_ENVIRONMENT=$arm_environment" >> $GITHUB_ENV
 
@@ -275,6 +287,9 @@ runs:
           -e TRE_ID="${{ inputs.TRE_ID }}" \
           -e TF_VAR_tre_id="${{ inputs.TRE_ID }}" \
           -e TRE_URL="${{ env.TRE_URL }}" \
+          -e TEST_WORKSPACE_APP_ID="${{ inputs.TEST_WORKSPACE_APP_ID }}" \
+          -e TEST_WORKSPACE_APP_SECRET="${{ inputs.TEST_WORKSPACE_APP_SECRET }}" \
+          -e TEST_APP_ID="${{ inputs.TEST_APP_ID }}" \
           -e TEST_ACCOUNT_CLIENT_ID="${{ inputs.TEST_ACCOUNT_CLIENT_ID }}" \
           -e TEST_ACCOUNT_CLIENT_SECRET="${{ inputs.TEST_ACCOUNT_CLIENT_SECRET }}" \
           -e IS_API_SECURED=${{ inputs.IS_API_SECURED }} \
@@ -291,6 +306,8 @@ runs:
             && inputs.RP_BUNDLE_VALUES) || '{}' }}' \
           -e UI_SITE_NAME="${{ inputs.UI_SITE_NAME }}" \
           -e UI_FOOTER_TEXT="${{ inputs.UI_FOOTER_TEXT }}" \
+          -e TF_VAR_resource_processor_vmss_sku="${{ (inputs.RESOURCE_PROCESSOR_VMSS_SKU != ''
+            && inputs.RESOURCE_PROCESSOR_VMSS_SKU) || 'Standard_B2s' }}" \
           -e TF_VAR_resource_processor_number_processes_per_instance="${{ (inputs.RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE != ''
             && inputs.RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE) || 5 }}" \
           -e FIREWALL_SKU=${{ inputs.FIREWALL_SKU != '' && inputs.FIREWALL_SKU || 'Standard' }} \

.github/linters/.tflint.hcl

@@ -1,10 +1,12 @@
 config {
-  module = true
+  call_module_type = "local"
   force = false
 }
 
 plugin "azurerm" {
     enabled = true
+    version = "0.30.0"
+    source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
 }
 
 rule "terraform_unused_declarations" {
@@ -30,3 +32,11 @@ rule "terraform_naming_convention" {
 rule "terraform_standard_module_structure" {
   enabled = true
 }
+
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "azurerm_resources_missing_prevent_destroy" {
+  enabled = false
+}

.github/linters/.tflint_core.hcl

@@ -1,19 +1,25 @@
 # This is used for TRE tags validation only.
 
 config {
-  module = true
+  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
+}

.github/linters/.tflint_shared_services.hcl

@@ -1,15 +1,25 @@
 # This is used for TRE tags validation only.
 
 config {
-  module = true
+  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
+}

.github/linters/.tflint_user_resources.hcl

@@ -1,15 +1,25 @@
 # This is used for TRE tags validation only.
 
 config {
-  module = true
+  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
+}

.github/linters/.tflint_workspace_services.hcl

@@ -1,15 +1,25 @@
 # This is used for TRE tags validation only.
 
 config {
-  module = true
+  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"]
 }
+
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "azurerm_resources_missing_prevent_destroy" {
+  enabled = false
+}

.github/linters/.tflint_workspaces.hcl

@@ -1,19 +1,25 @@
 # This is used for TRE tags validation only.
 
 config {
-  module = true
+  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", "tre_workspace_id"]
 }
+
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "azurerm_resources_missing_prevent_destroy" {
+  enabled = false
+}