feat: Harmonize Cloud Foundation Fabric dependencies to all use v26.0.0

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

Hide file tree

Showing 48 changed files with 225 additions and 233 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ modules/apigee-hybrid-workload/overrides/
 **.key
 modules/apigee-hybrid-workload/apigeectl_*
 __pycache__
+.venv
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 | v16.0.0 |
-| <a name="module_bridge-template"></a> [bridge-template](#module\_bridge-template) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm | v16.0.0 |
+| <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 |
 
 ## 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=v16.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v26.0.0"
   project_id    = var.project_id
   name          = local.bridge_name
   zone          = "${var.region}-b"
@@ -33,9 +33,11 @@ module "bridge-template" {
     alias_ips  = null
   }]
   boot_disk = {
-    image = "debian-cloud/debian-11"
-    type  = "pd-standard"
-    size  = 20
+    initialize_params = {
+      image = "debian-cloud/debian-11"
+      type  = "pd-standard"
+      size  = 20
+    }
   }
   create_template = true
   metadata = {
@@ -47,17 +49,13 @@ module "bridge-template" {
 }
 
 module "bridge-mig" {
-  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v16.0.0"
+  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v26.0.0"
   project_id        = var.project_id
   location          = var.region
-  regional          = true
   name              = local.bridge_name
   target_size       = var.target_size
   autoscaler_config = var.autoscaler_config
-  default_version = {
-    instance_template = module.bridge-template.template.self_link
-    name              = "default"
-  }
+  instance_template = module.bridge-template.template.self_link
   named_ports = {
     https = 443
   }
@@ -66,13 +64,10 @@ module "bridge-mig" {
     initial_delay_sec = 30
   }
   health_check_config = {
-    type = "https"
-    check = {
+    https = {
       port         = 443,
       request_path = "/healthz/ingress"
     }
-    config  = {}
-    logging = false
   }
 }
 

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 | v16.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 | v16.0.0 |
-| <a name="module_config-bucket"></a> [config-bucket](#module\_config-bucket) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs | v16.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 | v16.0.0 |
-| <a name="module_nat"></a> [nat](#module\_nat) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-cloudnat | v16.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 | 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 |
 
 ## 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=v16.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account?ref=v26.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=v16.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs?ref=v26.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=v16.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v26.0.0"
   project_id    = var.project_id
   name          = "apigee-nb-mtls-proxy"
   zone          = "${var.region}-b"
@@ -79,9 +79,11 @@ module "apigee-mtls-proxy-template" {
     alias_ips  = null
   }]
   boot_disk = {
-    image = "projects/debian-cloud/global/images/family/debian-11"
-    type  = "pd-standard"
-    size  = 10
+    initialize_params = {
+      image = "projects/debian-cloud/global/images/family/debian-11"
+      type  = "pd-standard"
+      size  = 10
+    }
   }
   create_template = true
   metadata = {
@@ -101,24 +103,20 @@ module "apigee-mtls-proxy-template" {
 }
 
 module "apigee-mtls-proxy-mig" {
-  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v16.0.0"
+  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v26.0.0"
   project_id        = var.project_id
   location          = var.region
-  regional          = true
   name              = "apigee-mtls-proxy-${var.region}"
   target_size       = var.target_size
   autoscaler_config = var.autoscaler_config
   named_ports = {
     https = 443
   }
-  default_version = {
-    instance_template = module.apigee-mtls-proxy-template.template.self_link
-    name              = "default"
-  }
+  instance_template = module.apigee-mtls-proxy-template.template.self_link
 }
 
 module "nat" {
-  source         = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-cloudnat?ref=v16.0.0"
+  source         = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-cloudnat?ref=v26.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 | v16.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 | v16.0.0 |
-| <a name="module_ilb-backend"></a> [ilb-backend](#module\_ilb-backend) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-ilb | v16.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 | 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 |
 
 ## 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=v16.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v26.0.0"
   project_id    = var.project_id
   name          = var.name
   zone          = "${var.region}-b"
@@ -29,9 +29,11 @@ module "demo-backend-template" {
     alias_ips  = null
   }]
   boot_disk = {
-    image = "projects/debian-cloud/global/images/family/debian-11"
-    type  = "pd-standard"
-    size  = 10
+    initialize_params = {
+      image = "projects/debian-cloud/global/images/family/debian-11"
+      type  = "pd-standard"
+      size  = 10
+    }
   }
   create_template = true
   metadata = {
@@ -42,27 +44,25 @@ module "demo-backend-template" {
 }
 
 module "demo-backend-mig" {
-  source      = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v16.0.0"
-  project_id  = var.project_id
-  location    = var.region
-  regional    = true
-  name        = "${var.name}-${var.region}"
-  target_size = 2
-  default_version = {
-    instance_template = module.demo-backend-template.template.self_link
-    name              = "default"
-  }
+  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v26.0.0"
+  project_id        = var.project_id
+  location          = var.region
+  name              = "${var.name}-${var.region}"
+  target_size       = 2
+  instance_template = module.demo-backend-template.template.self_link
 }
 
 module "ilb-backend" {
-  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-ilb?ref=v16.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int?ref=v26.0.0"
   project_id    = var.project_id
   region        = var.region
   name          = var.name
   service_label = var.name
-  network       = var.network
-  subnetwork    = var.subnet
-  ports         = [80]
+  vpc_config = {
+    network    = var.network
+    subnetwork = var.subnet
+  }
+  ports = [80]
   backends = [
     {
       group          = module.demo-backend-mig.group_manager.instance_group,
@@ -71,10 +71,7 @@ module "ilb-backend" {
     }
   ]
   health_check_config = {
-    type    = "tcp"
-    check   = { port = 80 }
-    config  = {}
-    logging = false
+    tcp = { port = 80 }
   }
 }
 

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 | v16.0.0 |
-| <a name="module_config-bucket"></a> [config-bucket](#module\_config-bucket) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs | v16.0.0 |
-| <a name="module_ilb-appliance"></a> [ilb-appliance](#module\_ilb-appliance) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-ilb | v16.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 | v16.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 | v16.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 | 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 |
 
 ## 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=v16.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/iam-service-account?ref=v26.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=v16.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/gcs?ref=v26.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=v16.0.0"
+  source         = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-vm?ref=v26.0.0"
   project_id     = var.project_id
   name           = var.name
   zone           = "${var.region}-b"
@@ -56,9 +56,11 @@ module "routing-appliance-template" {
     alias_ips  = null
   }]
   boot_disk = {
-    image = "projects/debian-cloud/global/images/family/debian-11"
-    type  = "pd-standard"
-    size  = 10
+    initialize_params = {
+      image = "projects/debian-cloud/global/images/family/debian-11"
+      type  = "pd-standard"
+      size  = 10
+    }
   }
   create_template = true
   metadata = {
@@ -73,27 +75,25 @@ module "routing-appliance-template" {
 }
 
 module "routing-appliance-mig" {
-  source      = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v16.0.0"
-  project_id  = var.project_id
-  location    = var.region
-  regional    = true
-  name        = "${var.name}-${var.region}"
-  target_size = 2
-  default_version = {
-    instance_template = module.routing-appliance-template.template.self_link
-    name              = "default"
-  }
+  source            = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/compute-mig?ref=v26.0.0"
+  project_id        = var.project_id
+  location          = var.region
+  name              = "${var.name}-${var.region}"
+  target_size       = 2
+  instance_template = module.routing-appliance-template.template.self_link
 }
 
 module "ilb-appliance" {
-  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-ilb?ref=v16.0.0"
+  source        = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-lb-int?ref=v26.0.0"
   project_id    = var.project_id
   region        = var.region
   name          = var.name
   service_label = var.name
-  network       = var.network
-  subnetwork    = var.subnet
-  ports         = [443]
+  vpc_config = {
+    network    = var.network
+    subnetwork = var.subnet
+  }
+  ports = [443]
   backends = [
     {
       group          = module.routing-appliance-mig.group_manager.instance_group,
@@ -102,10 +102,7 @@ module "ilb-appliance" {
     }
   ]
   health_check_config = {
-    type    = "tcp"
-    check   = { port = 80 }
-    config  = {}
-    logging = false
+    tcp = { port = 80 }
   }
 }
 

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 | v16.0.0 |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-vpc | v16.0.0 |
+| <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 |
 
 ## 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=v16.0.0"
+  source          = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/project?ref=v26.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=v16.0.0"
+  source     = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/net-vpc?ref=v26.0.0"
   project_id = module.project.project_id
   name       = var.network
   subnets    = []
@@ -38,7 +38,6 @@ module "vpc" {
       apigee-range         = var.peering_range
       apigee-support-range = var.support_range
     }
-    routes = null
   }
 }