From 01ee503c384bdfce13ee312c563759a4d3546887 Mon Sep 17 00:00:00 2001
From: Ludovico Magnocavallo <ludomagno@google.com>
Date: Thu, 17 Mar 2022 14:41:04 +0100
Subject: [PATCH] allow psa disabling in fast

---
 fast/stages/02-networking-nva/spoke-dev.tf      | 2 +-
 fast/stages/02-networking-nva/spoke-prod.tf     | 2 +-
 fast/stages/02-networking-peering/spoke-dev.tf  | 2 +-
 fast/stages/02-networking-peering/spoke-prod.tf | 2 +-
 fast/stages/02-networking-vpn/spoke-dev.tf      | 2 +-
 fast/stages/02-networking-vpn/spoke-prod.tf     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fast/stages/02-networking-nva/spoke-dev.tf b/fast/stages/02-networking-nva/spoke-dev.tf
index 9a2dc89e7..52c37d81b 100644
--- a/fast/stages/02-networking-nva/spoke-dev.tf
+++ b/fast/stages/02-networking-nva/spoke-dev.tf
@@ -51,7 +51,7 @@ module "dev-spoke-vpc" {
   mtu                             = 1500
   data_folder                     = "${var.data_dir}/subnets/dev"
   delete_default_routes_on_create = true
-  psa_config                      = var.psa_ranges.dev
+  psa_config                      = try(var.psa_ranges.dev, null)
   subnets_l7ilb                   = local.l7ilb_subnets.dev
   # Set explicit routes for googleapis; send everything else to NVAs
   routes = {
diff --git a/fast/stages/02-networking-nva/spoke-prod.tf b/fast/stages/02-networking-nva/spoke-prod.tf
index 538810535..9996bb762 100644
--- a/fast/stages/02-networking-nva/spoke-prod.tf
+++ b/fast/stages/02-networking-nva/spoke-prod.tf
@@ -51,7 +51,7 @@ module "prod-spoke-vpc" {
   mtu                             = 1500
   data_folder                     = "${var.data_dir}/subnets/prod"
   delete_default_routes_on_create = true
-  psa_config                      = var.psa_ranges.prod
+  psa_config                      = try(var.psa_ranges.prod, null)
   subnets_l7ilb                   = local.l7ilb_subnets.prod
   # Set explicit routes for googleapis; send everything else to NVAs
   routes = {
diff --git a/fast/stages/02-networking-peering/spoke-dev.tf b/fast/stages/02-networking-peering/spoke-dev.tf
index b131dd6f2..268f5b703 100644
--- a/fast/stages/02-networking-peering/spoke-dev.tf
+++ b/fast/stages/02-networking-peering/spoke-dev.tf
@@ -51,7 +51,7 @@ module "dev-spoke-vpc" {
   name          = "dev-spoke-0"
   mtu           = 1500
   data_folder   = "${var.data_dir}/subnets/dev"
-  psa_config    = var.psa_ranges.dev
+  psa_config    = try(var.psa_ranges.dev, null)
   subnets_l7ilb = local.l7ilb_subnets.dev
   # set explicit routes for googleapis in case the default route is deleted
   routes = {
diff --git a/fast/stages/02-networking-peering/spoke-prod.tf b/fast/stages/02-networking-peering/spoke-prod.tf
index d3302d568..cf83d2e1e 100644
--- a/fast/stages/02-networking-peering/spoke-prod.tf
+++ b/fast/stages/02-networking-peering/spoke-prod.tf
@@ -51,7 +51,7 @@ module "prod-spoke-vpc" {
   name          = "prod-spoke-0"
   mtu           = 1500
   data_folder   = "${var.data_dir}/subnets/prod"
-  psa_config    = var.psa_ranges.prod
+  psa_config    = try(var.psa_ranges.prod, null)
   subnets_l7ilb = local.l7ilb_subnets.prod
   # set explicit routes for googleapis in case the default route is deleted
   routes = {
diff --git a/fast/stages/02-networking-vpn/spoke-dev.tf b/fast/stages/02-networking-vpn/spoke-dev.tf
index b131dd6f2..268f5b703 100644
--- a/fast/stages/02-networking-vpn/spoke-dev.tf
+++ b/fast/stages/02-networking-vpn/spoke-dev.tf
@@ -51,7 +51,7 @@ module "dev-spoke-vpc" {
   name          = "dev-spoke-0"
   mtu           = 1500
   data_folder   = "${var.data_dir}/subnets/dev"
-  psa_config    = var.psa_ranges.dev
+  psa_config    = try(var.psa_ranges.dev, null)
   subnets_l7ilb = local.l7ilb_subnets.dev
   # set explicit routes for googleapis in case the default route is deleted
   routes = {
diff --git a/fast/stages/02-networking-vpn/spoke-prod.tf b/fast/stages/02-networking-vpn/spoke-prod.tf
index d3302d568..cf83d2e1e 100644
--- a/fast/stages/02-networking-vpn/spoke-prod.tf
+++ b/fast/stages/02-networking-vpn/spoke-prod.tf
@@ -51,7 +51,7 @@ module "prod-spoke-vpc" {
   name          = "prod-spoke-0"
   mtu           = 1500
   data_folder   = "${var.data_dir}/subnets/prod"
-  psa_config    = var.psa_ranges.prod
+  psa_config    = try(var.psa_ranges.prod, null)
   subnets_l7ilb = local.l7ilb_subnets.prod
   # set explicit routes for googleapis in case the default route is deleted
   routes = {