Merge pull request #378 from Azure/AK-asev3

add Asev3 support and fix backwards comp issue in remote tfstate with try()
Azure · Jun 2, 2022 · 29ed19d · 29ed19d
2 parents 2126c57 + 044aac5
commit 29ed19d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/aztfmod b/aztfmod
diff --git a/caf_solution/local.remote.tf b/caf_solution/local.remote.tf
@@ -29,6 +29,9 @@ locals {
     app_service_environments = {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].app_service_environments, {}))
     }
+    app_service_environments_v3 = {
+      for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].app_service_environments_v3, {}))
+    }
     app_service_plans = {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].app_service_plans, {}))
     }

diff --git a/caf_solution/local.webapp.tf b/caf_solution/local.webapp.tf
@@ -3,6 +3,7 @@ locals {
     var.webapp,
     {
       app_service_environments     = var.app_service_environments
+      app_service_environments_v3  = var.app_service_environments_v3
       app_service_plans            = var.app_service_plans
       app_services                 = var.app_services
       azurerm_application_insights = var.azurerm_application_insights

diff --git a/caf_solution/main.tf b/caf_solution/main.tf
@@ -97,7 +97,7 @@ locals {
       }
     )
     ,
-    data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.tfstates
+    try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.tfstates, {})
   )
 
 

diff --git a/caf_solution/variables.webapp.tf b/caf_solution/variables.webapp.tf
@@ -12,6 +12,9 @@ variable "webapp" {
 variable "app_service_environments" {
   default = {}
 }
+variable "app_service_environments_v3" {
+  default = {}
+}
 variable "app_service_plans" {
   default = {}
 }

diff --git a/templates/asvm/orion/deploy_template.sh b/templates/asvm/orion/deploy_template.sh
diff --git a/templates/platform/deploy_platform.sh b/templates/platform/deploy_platform.sh