1839: Adding provider upgrades and correcting Terraform syntax

DFE-Digital · Aug 21, 2024 · 41561cd · 41561cd
1 parent 24c797b
commit 41561cd
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 41 deletions.
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git a/terraform/app.tf b/terraform/app.tf
@@ -173,6 +173,7 @@ resource "azurerm_service_plan" "service-plan" {
   }
 }
 
+#All ip_restriction properties need to be included due to the bug raised here: https://github.com/hashicorp/terraform-provider-azurerm/issues/17189
 resource "azurerm_linux_web_app" "auth-server-app" {
   name                = local.auth_server_app_name
   location            = data.azurerm_resource_group.group.location
@@ -188,21 +189,23 @@ resource "azurerm_linux_web_app" "auth-server-app" {
     http2_enabled       = true
     minimum_tls_version = "1.2"
     health_check_path   = "/health"
-    #All ip_restriction properties need to be included due to the bug raised here: https://github.com/hashicorp/terraform-provider-azurerm/issues/17189
-    ip_restriction = [{
+
+    ip_restriction {
       name     = "FrontDoor"
       action   = "Allow"
       priority = 1
-      headers = [{
+
+      headers {
         x_azure_fdid      = [local.infrastructure_secrets.FRONTDOOR_ID]
         x_fd_health_probe = []
         x_forwarded_for   = []
         x_forwarded_host  = []
-      }]
+      }
+
       service_tag               = "AzureFrontDoor.Backend"
       ip_address                = null
       virtual_network_subnet_id = null
-    }]
+    }
   }
 
   sticky_settings {

diff --git a/terraform/modules/container-app/main.tf b/terraform/modules/container-app/main.tf
@@ -1,7 +1,7 @@
 locals {
   generated_yaml_path = abspath("${path.module}/.terraform/temp/container-app-${sha1(var.app_definition_yaml)}.yml")
 
-  app_name = yamldecode(var.app_definition_yaml).name
+  app_name       = yamldecode(var.app_definition_yaml).name
   resource_group = yamldecode(var.app_definition_yaml).resourcegroup
 }
 

diff --git a/terraform/terraform.tf b/terraform/terraform.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.17.0"
+      version = "~> 3.116.0"
     }
 
     azapi = {
@@ -18,7 +18,7 @@ terraform {
 
     statuscake = {
       source  = "StatusCakeDev/statuscake"
-      version = "2.1.0"
+      version = "2.2.2"
     }
   }
 }