feat: Bump to latest CFF v28.0.0

apigee · Dec 5, 2023 · d34508d · d34508d
1 parent 9c899be
commit d34508d
Show file tree

Hide file tree

Showing 50 changed files with 168 additions and 144 deletions.
diff --git a/modules/apigee-x-bridge-mig/README.md b/modules/apigee-x-bridge-mig/README.md
@@ -11,8 +11,8 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_bridge-mig"></a> [bridge-mig](#module\_bridge-mig) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig | v26.0.0 |
-| <a name="module_bridge-template"></a> [bridge-template](#module\_bridge-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v26.0.0 |
+| <a name="module_bridge-mig"></a> [bridge-mig](#module\_bridge-mig) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig | v28.0.0 |
+| <a name="module_bridge-template"></a> [bridge-template](#module\_bridge-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v28.0.0 |
 
 ## Resources
 

diff --git a/modules/apigee-x-bridge-mig/main.tf b/modules/apigee-x-bridge-mig/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 module "bridge-template" {
-  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v26.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v28.0.0"
   project_id    = var.project_id
   name          = local.bridge_name
   zone          = "${var.region}-b"
@@ -44,12 +44,14 @@ module "bridge-template" {
     ENDPOINT           = var.endpoint_ip
     startup-script-url = "gs://apigee-5g-saas/apigee-envoy-proxy-release/latest/conf/startup-script.sh"
   }
-  service_account_create = true
-  service_account_scopes = ["cloud-platform"]
+  service_account = {
+    auto_create = true
+    scopes      = ["cloud-platform"]
+  }
 }
 
 module "bridge-mig" {
-  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v26.0.0"
+  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v28.0.0"
   project_id        = var.project_id
   location          = var.region
   name              = local.bridge_name

diff --git a/modules/apigee-x-core/README.md b/modules/apigee-x-core/README.md
@@ -61,9 +61,9 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_apigee"></a> [apigee](#module\_apigee) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/apigee | v26.0.0 |
-| <a name="module_kms-inst-disk"></a> [kms-inst-disk](#module\_kms-inst-disk) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms | v26.0.0 |
-| <a name="module_kms-org-db"></a> [kms-org-db](#module\_kms-org-db) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms | v26.0.0 |
+| <a name="module_apigee"></a> [apigee](#module\_apigee) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/apigee | v28.0.0 |
+| <a name="module_kms-inst-disk"></a> [kms-inst-disk](#module\_kms-inst-disk) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms | v28.0.0 |
+| <a name="module_kms-org-db"></a> [kms-org-db](#module\_kms-org-db) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms | v28.0.0 |
 
 ## Resources
 

diff --git a/modules/apigee-x-core/main.tf b/modules/apigee-x-core/main.tf
@@ -32,7 +32,7 @@ resource "google_project_service_identity" "apigee_sa" {
 }
 
 module "kms-org-db" {
-  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v26.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v28.0.0"
   project_id = var.project_id
   iam = {
     "roles/cloudkms.cryptoKeyEncrypterDecrypter" = ["serviceAccount:${google_project_service_identity.apigee_sa.email}"]
@@ -49,7 +49,7 @@ module "kms-org-db" {
 
 module "kms-inst-disk" {
   for_each   = var.apigee_instances
-  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v26.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v28.0.0"
   project_id = var.project_id
   iam = {
     "roles/cloudkms.cryptoKeyEncrypterDecrypter" = ["serviceAccount:${google_project_service_identity.apigee_sa.email}"]
@@ -68,7 +68,7 @@ module "kms-inst-disk" {
 }
 
 module "apigee" {
-  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/apigee?ref=v26.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/apigee?ref=v28.0.0"
   project_id = var.project_id
   organization = {
     display_name            = var.org_display_name

diff --git a/modules/apigee-x-mtls-mig/README.md b/modules/apigee-x-mtls-mig/README.md
@@ -27,11 +27,11 @@ route_config:
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_apigee-mtls-proxy-mig"></a> [apigee-mtls-proxy-mig](#module\_apigee-mtls-proxy-mig) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig | v26.0.0 |
-| <a name="module_apigee-mtls-proxy-template"></a> [apigee-mtls-proxy-template](#module\_apigee-mtls-proxy-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v26.0.0 |
-| <a name="module_config-bucket"></a> [config-bucket](#module\_config-bucket) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs | v26.0.0 |
-| <a name="module_mtls-proxy-sa"></a> [mtls-proxy-sa](#module\_mtls-proxy-sa) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account | v26.0.0 |
-| <a name="module_nat"></a> [nat](#module\_nat) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-cloudnat | v26.0.0 |
+| <a name="module_apigee-mtls-proxy-mig"></a> [apigee-mtls-proxy-mig](#module\_apigee-mtls-proxy-mig) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig | v28.0.0 |
+| <a name="module_apigee-mtls-proxy-template"></a> [apigee-mtls-proxy-template](#module\_apigee-mtls-proxy-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v28.0.0 |
+| <a name="module_config-bucket"></a> [config-bucket](#module\_config-bucket) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs | v28.0.0 |
+| <a name="module_mtls-proxy-sa"></a> [mtls-proxy-sa](#module\_mtls-proxy-sa) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account | v28.0.0 |
+| <a name="module_nat"></a> [nat](#module\_nat) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-cloudnat | v28.0.0 |
 
 ## Resources
 

diff --git a/modules/apigee-x-mtls-mig/main.tf b/modules/apigee-x-mtls-mig/main.tf
@@ -19,13 +19,13 @@ resource "random_id" "bucket" {
 }
 
 module "mtls-proxy-sa" {
-  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account?ref=v26.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account?ref=v28.0.0"
   project_id = var.project_id
   name       = "apigee-mtls-proxy-vm"
 }
 
 module "config-bucket" {
-  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs?ref=v26.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs?ref=v28.0.0"
   project_id = var.project_id
   name       = "apigee-mtls-ingress-${random_id.bucket.dec}"
   location   = "EU"
@@ -65,7 +65,7 @@ resource "google_storage_bucket_object" "tls_key" {
 }
 
 module "apigee-mtls-proxy-template" {
-  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v26.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v28.0.0"
   project_id    = var.project_id
   name          = "apigee-nb-mtls-proxy"
   zone          = "${var.region}-b"
@@ -90,8 +90,10 @@ module "apigee-mtls-proxy-template" {
     BUCKET             = module.config-bucket.name
     startup-script-url = "gs://${module.config-bucket.name}/setup.sh"
   }
-  service_account        = module.mtls-proxy-sa.email
-  service_account_scopes = ["cloud-platform"]
+  service_account = {
+    scopes = ["cloud-platform"]
+    email  = module.mtls-proxy-sa.email
+  }
   depends_on = [
     google_storage_bucket_object.setup_script,
     google_storage_bucket_object.ca_cert,
@@ -103,7 +105,7 @@ module "apigee-mtls-proxy-template" {
 }
 
 module "apigee-mtls-proxy-mig" {
-  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v26.0.0"
+  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v28.0.0"
   project_id        = var.project_id
   location          = var.region
   name              = "apigee-mtls-proxy-${var.region}"
@@ -116,7 +118,7 @@ module "apigee-mtls-proxy-mig" {
 }
 
 module "nat" {
-  source         = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-cloudnat?ref=v26.0.0"
+  source         = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-cloudnat?ref=v28.0.0"
   project_id     = var.project_id
   region         = var.region
   name           = "nat-${var.region}"

diff --git a/modules/development-backend/README.md b/modules/development-backend/README.md
@@ -9,9 +9,9 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_demo-backend-mig"></a> [demo-backend-mig](#module\_demo-backend-mig) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig | v26.0.0 |
-| <a name="module_demo-backend-template"></a> [demo-backend-template](#module\_demo-backend-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v26.0.0 |
-| <a name="module_ilb-backend"></a> [ilb-backend](#module\_ilb-backend) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int | v26.0.0 |
+| <a name="module_demo-backend-mig"></a> [demo-backend-mig](#module\_demo-backend-mig) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig | v28.0.0 |
+| <a name="module_demo-backend-template"></a> [demo-backend-template](#module\_demo-backend-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v28.0.0 |
+| <a name="module_ilb-backend"></a> [ilb-backend](#module\_ilb-backend) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int | v28.0.0 |
 
 ## Resources
 

diff --git a/modules/development-backend/main.tf b/modules/development-backend/main.tf
@@ -15,7 +15,7 @@
  */
 
 module "demo-backend-template" {
-  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v26.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v28.0.0"
   project_id    = var.project_id
   name          = var.name
   zone          = "${var.region}-b"
@@ -39,12 +39,14 @@ module "demo-backend-template" {
   metadata = {
     startup-script = "sudo mkdir -p /var/www && cd /var/www && echo \"hello from $(hostname)\" > index.html && python3 -m http.server 80"
   }
-  service_account_create = true
-  service_account_scopes = ["cloud-platform"]
+  service_account = {
+    auto_create = true
+    scopes      = ["cloud-platform"]
+  }
 }
 
 module "demo-backend-mig" {
-  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v26.0.0"
+  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v28.0.0"
   project_id        = var.project_id
   location          = var.region
   name              = "${var.name}-${var.region}"
@@ -53,7 +55,7 @@ module "demo-backend-mig" {
 }
 
 module "ilb-backend" {
-  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int?ref=v26.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int?ref=v28.0.0"
   project_id    = var.project_id
   region        = var.region
   name          = var.name
@@ -62,7 +64,11 @@ module "ilb-backend" {
     network    = var.network
     subnetwork = var.subnet
   }
-  ports = [80]
+  forwarding_rules_config = {
+    "" = {
+      ports = [80]
+    }
+  }
   backends = [
     {
       group          = module.demo-backend-mig.group_manager.instance_group,

diff --git a/modules/development-backend/outputs.tf b/modules/development-backend/outputs.tf
@@ -21,15 +21,15 @@ output "instance_group" {
 
 output "ilb_forwarding_rule_address" {
   description = "ILB forwarding rule IP address."
-  value       = module.ilb-backend.forwarding_rule_address
+  value       = module.ilb-backend.forwarding_rule_addresses[""]
 }
 
 output "ilb_forwarding_rule_self_link" {
   description = "ILB forwarding rule self link."
-  value       = module.ilb-backend.forwarding_rule_self_link
+  value       = module.ilb-backend.forwarding_rule_self_links[""]
 }
 
 output "region" {
   description = "Backend Service region."
-  value       = module.ilb-backend.forwarding_rule.region
+  value       = module.ilb-backend.forwarding_rules[""].region
 }
diff --git a/modules/routing-appliance/README.md b/modules/routing-appliance/README.md
@@ -10,11 +10,11 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_appliance-sa"></a> [appliance-sa](#module\_appliance-sa) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account | v26.0.0 |
-| <a name="module_config-bucket"></a> [config-bucket](#module\_config-bucket) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs | v26.0.0 |
-| <a name="module_ilb-appliance"></a> [ilb-appliance](#module\_ilb-appliance) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int | v26.0.0 |
-| <a name="module_routing-appliance-mig"></a> [routing-appliance-mig](#module\_routing-appliance-mig) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig | v26.0.0 |
-| <a name="module_routing-appliance-template"></a> [routing-appliance-template](#module\_routing-appliance-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v26.0.0 |
+| <a name="module_appliance-sa"></a> [appliance-sa](#module\_appliance-sa) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account | v28.0.0 |
+| <a name="module_config-bucket"></a> [config-bucket](#module\_config-bucket) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs | v28.0.0 |
+| <a name="module_ilb-appliance"></a> [ilb-appliance](#module\_ilb-appliance) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int | v28.0.0 |
+| <a name="module_routing-appliance-mig"></a> [routing-appliance-mig](#module\_routing-appliance-mig) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig | v28.0.0 |
+| <a name="module_routing-appliance-template"></a> [routing-appliance-template](#module\_routing-appliance-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v28.0.0 |
 
 ## Resources
 

diff --git a/modules/routing-appliance/main.tf b/modules/routing-appliance/main.tf
@@ -19,13 +19,13 @@ resource "random_id" "bucket" {
 }
 
 module "appliance-sa" {
-  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account?ref=v26.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account?ref=v28.0.0"
   project_id = var.project_id
   name       = "sa-${var.name}"
 }
 
 module "config-bucket" {
-  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs?ref=v26.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs?ref=v28.0.0"
   project_id = var.project_id
   name       = "appliance-${random_id.bucket.dec}"
   location   = "EU"
@@ -41,7 +41,7 @@ resource "google_storage_bucket_object" "setup_script" {
 }
 
 module "routing-appliance-template" {
-  source         = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v26.0.0"
+  source         = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v28.0.0"
   project_id     = var.project_id
   name           = var.name
   zone           = "${var.region}-b"
@@ -66,16 +66,18 @@ module "routing-appliance-template" {
   metadata = {
     startup-script-url = "gs://${module.config-bucket.name}/setup.sh"
   }
-  service_account        = module.appliance-sa.email
-  service_account_scopes = ["cloud-platform"]
+  service_account = {
+    email  = module.appliance-sa.email
+    scopes = ["cloud-platform"]
+  }
 
   depends_on = [
     google_storage_bucket_object.setup_script
   ]
 }
 
 module "routing-appliance-mig" {
-  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v26.0.0"
+  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v28.0.0"
   project_id        = var.project_id
   location          = var.region
   name              = "${var.name}-${var.region}"
@@ -84,7 +86,7 @@ module "routing-appliance-mig" {
 }
 
 module "ilb-appliance" {
-  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int?ref=v26.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int?ref=v28.0.0"
   project_id    = var.project_id
   region        = var.region
   name          = var.name
@@ -93,7 +95,11 @@ module "ilb-appliance" {
     network    = var.network
     subnetwork = var.subnet
   }
-  ports = [443]
+  forwarding_rules_config = {
+    "" = {
+      ports = [443]
+    }
+  }
   backends = [
     {
       group          = module.routing-appliance-mig.group_manager.instance_group,
@@ -124,6 +130,6 @@ resource "google_compute_route" "appliance" {
   name         = "appliance-rt-${each.key}"
   dest_range   = each.value.range
   network      = var.network
-  next_hop_ilb = module.ilb-appliance.forwarding_rule.id
+  next_hop_ilb = module.ilb-appliance.forwarding_rules[""].id
   priority     = each.value.priority
 }
diff --git a/samples/x-basic/README.md b/samples/x-basic/README.md
@@ -55,8 +55,8 @@ No providers.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_apigee-x-core"></a> [apigee-x-core](#module\_apigee-x-core) | ../../modules/apigee-x-core | n/a |
-| <a name="module_project"></a> [project](#module\_project) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/project | v26.0.0 |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-vpc | v26.0.0 |
+| <a name="module_project"></a> [project](#module\_project) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/project | v28.0.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-vpc | v28.0.0 |
 
 ## Resources
 

diff --git a/samples/x-basic/main.tf b/samples/x-basic/main.tf
@@ -15,7 +15,7 @@
  */
 
 module "project" {
-  source          = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/project?ref=v26.0.0"
+  source          = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/project?ref=v28.0.0"
   name            = var.project_id
   parent          = var.project_parent
   billing_account = var.billing_account
@@ -29,7 +29,7 @@ module "project" {
 }
 
 module "vpc" {
-  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-vpc?ref=v26.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-vpc?ref=v28.0.0"
   project_id = module.project.project_id
   name       = var.network
   subnets    = []