Merge branch 'joselcaguilar-bug/agw-private-subnet-cidr-optional'

aztfmod · Aug 11, 2022 · ea0363d · ea0363d
2 parents edb6459 + dbbe1f6
commit ea0363d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:1.2.5-2207.2909
+      image: aztfmod/rover:1.2.5-2208.0208
       user: vscode
 
       labels:

diff --git a/.github/workflows/standalone-regressor-tf100.yaml b/.github/workflows/standalone-regressor-tf100.yaml
@@ -55,7 +55,7 @@ jobs:
       matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}}
 
     container:
-      image: aztfmod/rover:1.2.5-2207.2909
+      image: aztfmod/rover:1.2.5-2208.0208
       options: --user 0
 
     steps:
@@ -165,7 +165,7 @@ jobs:
     needs: [testcases]
 
     container:
-      image: aztfmod/rover:1.2.5-2207.2909
+      image: aztfmod/rover:1.2.5-2208.0208
       options: --user 0
 
     steps:

diff --git a/.github/workflows/standalone-tf100.yaml b/.github/workflows/standalone-tf100.yaml
@@ -51,7 +51,7 @@ jobs:
       matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}}
 
     container:
-      image: aztfmod/rover:1.2.5-2207.2909
+      image: aztfmod/rover:1.2.5-2208.0208
       options: --user 0
 
     steps:
@@ -136,7 +136,7 @@ jobs:
     needs: [testcases]
 
     container:
-      image: aztfmod/rover:1.2.5-2207.2909
+      image: aztfmod/rover:1.2.5-2208.0208
       options: --user 0
 
     steps:

diff --git a/examples/app_gateway/103-public-only/application.tfvars b/examples/app_gateway/103-public-only/application.tfvars
@@ -4,6 +4,15 @@ application_gateway_applications = {
     application_gateway_key = "agw1"
     name                    = "demoapp1"
 
+    listeners = {
+      public = {
+        name                           = "demo-app1-80-public"
+        front_end_ip_configuration_key = "public"
+        front_end_port_key             = "80"
+        host_name                      = "cafdemo.com"
+      }
+    }
+
     request_routing_rules = {
       default = {
         rule_type = "Basic"

diff --git a/modules/networking/application_gateway/locals.networking.tf b/modules/networking/application_gateway/locals.networking.tf
@@ -28,14 +28,14 @@ locals {
       )
     }
     private = {
-      subnet_id = coalesce(
+      subnet_id = try(coalesce(
         try(local.private_vnet.subnets[var.settings.front_end_ip_configurations.private.subnet_key].id, null),
         try(var.settings.front_end_ip_configurations.private.subnet_id, null)
-      )
-      cidr = coalesce(
+      ), null)
+      cidr = try(coalesce(
         try(local.private_vnet.subnets[var.settings.front_end_ip_configurations.private.subnet_key].cidr, null),
         try(var.settings.front_end_ip_configurations.private.subnet_cidr, null)
-      )
+      ), null)
     }
     public = {
       subnet_id = try(
@@ -44,17 +44,17 @@ locals {
         null
       )
 
-      ip_address_id = coalesce(
+      ip_address_id = try(coalesce(
         try(var.public_ip_addresses[var.client_config.landingzone_key][var.settings.front_end_ip_configurations.public.public_ip_key].id, var.public_ip_addresses[var.settings.front_end_ip_configurations.public.lz_key][var.settings.front_end_ip_configurations.public.public_ip_key].id, null),
         try(var.settings.front_end_ip_configurations.public.public_ip_id, null)
-      )
+      ), null)
     }
   }
 
-  private_cidr = coalesce(
+  private_cidr = try(coalesce(
     try(local.ip_configuration.private.cidr[var.settings.front_end_ip_configurations.private.subnet_cidr_index], null),
     try(var.settings.front_end_ip_configurations.private.subnet_cidr, null)
-  )
+  ), null)
   private_ip_address = try(cidrhost(local.private_cidr, var.settings.front_end_ip_configurations.private.private_ip_offset), null)
 
 }
diff --git a/rover_on_ssh_host.yml b/rover_on_ssh_host.yml
@@ -11,7 +11,7 @@
 version: '3.7'
 services:
   rover:
-    image: aztfmod/rover:1.2.5-2207.2909
+    image: aztfmod/rover:1.2.5-2208.0208
 
     user: vscode