From 2646f7bcd88a9efbe29c73ce29fb3700941ddcca Mon Sep 17 00:00:00 2001
From: Lorenzo Caggioni <lorenzo.caggioni@gmail.com>
Date: Mon, 14 Feb 2022 10:47:09 +0100
Subject: [PATCH] Rever router asn config

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

diff --git a/fast/stages/02-networking-vpn/landing.tf b/fast/stages/02-networking-vpn/landing.tf
index 9c5e8c6f2..e2b6c45a0 100644
--- a/fast/stages/02-networking-vpn/landing.tf
+++ b/fast/stages/02-networking-vpn/landing.tf
@@ -89,5 +89,5 @@ module "landing-nat-ew1" {
   router_create  = true
   router_name    = "prod-nat-ew1"
   router_network = module.landing-vpc.name
-  router_asn     = 65530
+  router_asn     = 4200001024
 }
diff --git a/fast/stages/02-networking-vpn/spoke-dev.tf b/fast/stages/02-networking-vpn/spoke-dev.tf
index 6fc3931de..4a3f0f25c 100644
--- a/fast/stages/02-networking-vpn/spoke-dev.tf
+++ b/fast/stages/02-networking-vpn/spoke-dev.tf
@@ -27,7 +27,6 @@ module "dev-spoke-project" {
     disable_dependent_services = false
   }
   services = [
-    "container.googleapis.com",
     "compute.googleapis.com",
     "dns.googleapis.com",
     "iap.googleapis.com",
@@ -93,7 +92,7 @@ module "dev-spoke-cloudnat" {
   name           = "dev-nat-${local.region_trigram[each.value]}"
   router_create  = true
   router_network = module.dev-spoke-vpc.name
-  router_asn     = 65530
+  router_asn     = 4200001024
   logging_filter = "ERRORS_ONLY"
 }
 
@@ -113,7 +112,6 @@ resource "google_project_iam_binding" "dev_spoke_project_iam_delegated" {
   project = module.dev-spoke-project.project_id
   role    = "roles/resourcemanager.projectIamAdmin"
   members = [
-    var.data_platform_sa.dev,
     var.project_factory_sa.dev
   ]
   condition {
diff --git a/fast/stages/02-networking-vpn/spoke-prod.tf b/fast/stages/02-networking-vpn/spoke-prod.tf
index fb28b26dc..3be90c2e2 100644
--- a/fast/stages/02-networking-vpn/spoke-prod.tf
+++ b/fast/stages/02-networking-vpn/spoke-prod.tf
@@ -92,7 +92,7 @@ module "prod-spoke-cloudnat" {
   name           = "prod-nat-${local.region_trigram[each.value]}"
   router_create  = true
   router_network = module.prod-spoke-vpc.name
-  router_asn     = 65530
+  router_asn     = 4200001024
   logging_filter = "ERRORS_ONLY"
 }
 
@@ -112,7 +112,6 @@ resource "google_project_iam_binding" "prod_spoke_project_iam_delegated" {
   project = module.prod-spoke-project.project_id
   role    = "roles/resourcemanager.projectIamAdmin"
   members = [
-    var.data_platform_sa.prod,
     var.project_factory_sa.prod
   ]
   condition {