From 21fa6d1f1300fda41e7af2e77b1ed68327bcd1d3 Mon Sep 17 00:00:00 2001
From: Miren Esnaola <mirene@google.com>
Date: Thu, 16 Mar 2023 14:30:05 +0100
Subject: [PATCH] Fixes related to boot_disk in compute-vm module

---
 CONTRIBUTING.md                                          | 8 +++++---
 blueprints/apigee/hybrid-gke/mgmt.tf                     | 8 +++++---
 blueprints/cloud-operations/adfs/main.tf                 | 8 +++++---
 .../unmanaged-instances-healthcheck/main.tf              | 8 +++++---
 blueprints/data-solutions/cloudsql-multiregion/gce.tf    | 8 +++++---
 .../data-solutions/cmek-via-centralized-kms/main.tf      | 9 +++++----
 .../data-solutions/sqlserver-alwayson/instances.tf       | 8 +++++---
 blueprints/gke/autopilot/mgmt.tf                         | 8 +++++---
 blueprints/gke/multi-cluster-mesh-gke-fleet-api/vm.tf    | 8 +++++---
 .../__need_fixing/nginx-reverse-proxy-cluster/main.tf    | 4 +++-
 .../__need_fixing/onprem-google-access-dns/main.tf       | 4 +++-
 blueprints/networking/ilb-next-hop/gateways.tf           | 8 +++++---
 .../private-cloud-function-from-onprem/main.tf           | 4 +++-
 .../__need_fixing/onprem/README.md                       | 8 +++++---
 modules/cloud-config-container/coredns/README.md         | 8 +++++---
 modules/cloud-config-container/nginx-tls/README.md       | 8 +++++---
 modules/cloud-config-container/nginx/README.md           | 8 +++++---
 modules/cloud-config-container/simple-nva/README.md      | 8 +++++---
 modules/net-ilb/README.md                                | 8 +++++---
 19 files changed, 89 insertions(+), 52 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2cdb64fb..ab87ad25 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -310,9 +310,11 @@ module "simple-vm-example" {
   zone       = "europe-west1-b"
   name       = "test"
   boot_disk  = {
-    image = "projects/debian-cloud/global/images/family/cos-97-lts"
-    type = "pd-balanced"
-    size = 10
+    initialize_params = {
+      image = "projects/debian-cloud/global/images/family/cos-97-lts"
+      type = "pd-balanced"
+      size = 10
+    }
   }
 }
 ```
diff --git a/blueprints/apigee/hybrid-gke/mgmt.tf b/blueprints/apigee/hybrid-gke/mgmt.tf
index 538940e7..1d4f42e1 100644
--- a/blueprints/apigee/hybrid-gke/mgmt.tf
+++ b/blueprints/apigee/hybrid-gke/mgmt.tf
@@ -30,9 +30,11 @@ module "mgmt_server" {
   }]
   service_account_create = true
   boot_disk = {
-    image = var.mgmt_server_config.image
-    type  = var.mgmt_server_config.disk_type
-    size  = var.mgmt_server_config.disk_size
+    initialize_params = {
+      image = var.mgmt_server_config.image
+      type  = var.mgmt_server_config.disk_type
+      size  = var.mgmt_server_config.disk_size
+    }
   }
   metadata = {
     startup-script = <<EOT
diff --git a/blueprints/cloud-operations/adfs/main.tf b/blueprints/cloud-operations/adfs/main.tf
index 8948e49b..0a35a90a 100644
--- a/blueprints/cloud-operations/adfs/main.tf
+++ b/blueprints/cloud-operations/adfs/main.tf
@@ -81,9 +81,11 @@ module "server" {
   }
   service_account_create = true
   boot_disk = {
-    image = var.image
-    type  = var.disk_type
-    size  = var.disk_size
+    initialize_params = {
+      image = var.image
+      type  = var.disk_type
+      size  = var.disk_size
+    }
   }
   group = {
     named_ports = {
diff --git a/blueprints/cloud-operations/unmanaged-instances-healthcheck/main.tf b/blueprints/cloud-operations/unmanaged-instances-healthcheck/main.tf
index 19f2d467..b1cfb3a2 100644
--- a/blueprints/cloud-operations/unmanaged-instances-healthcheck/main.tf
+++ b/blueprints/cloud-operations/unmanaged-instances-healthcheck/main.tf
@@ -234,9 +234,11 @@ module "test-vm" {
   zone       = "${var.region}-b"
   name       = "nginx-test"
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   metadata = {
     user-data              = module.cos-nginx.cloud_config
diff --git a/blueprints/data-solutions/cloudsql-multiregion/gce.tf b/blueprints/data-solutions/cloudsql-multiregion/gce.tf
index 17048aa8..f5e8cd1d 100644
--- a/blueprints/data-solutions/cloudsql-multiregion/gce.tf
+++ b/blueprints/data-solutions/cloudsql-multiregion/gce.tf
@@ -46,9 +46,11 @@ module "test-vm" {
   service_account        = module.service-account-sql.email
   service_account_scopes = ["https://www.googleapis.com/auth/cloud-platform"]
   boot_disk = {
-    image = "projects/debian-cloud/global/images/family/debian-10"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/debian-cloud/global/images/family/debian-10"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   encryption = var.service_encryption_keys != null ? {
     encrypt_boot            = true
diff --git a/blueprints/data-solutions/cmek-via-centralized-kms/main.tf b/blueprints/data-solutions/cmek-via-centralized-kms/main.tf
index 73f2b701..27fbe99b 100644
--- a/blueprints/data-solutions/cmek-via-centralized-kms/main.tf
+++ b/blueprints/data-solutions/cmek-via-centralized-kms/main.tf
@@ -134,10 +134,11 @@ module "vm_example" {
     }
   ]
   boot_disk = {
-    image        = "projects/debian-cloud/global/images/family/debian-10"
-    type         = "pd-ssd"
-    size         = 10
-    encrypt_disk = true
+    initialize_params = {
+      image = "projects/debian-cloud/global/images/family/debian-10"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   tags = ["ssh"]
   encryption = {
diff --git a/blueprints/data-solutions/sqlserver-alwayson/instances.tf b/blueprints/data-solutions/sqlserver-alwayson/instances.tf
index 40f26e95..89f39a61 100644
--- a/blueprints/data-solutions/sqlserver-alwayson/instances.tf
+++ b/blueprints/data-solutions/sqlserver-alwayson/instances.tf
@@ -73,9 +73,11 @@ module "nodes" {
   }]
 
   boot_disk = {
-    image = var.node_image
-    type  = "pd-ssd"
-    size  = var.boot_disk_size
+    initialize_params = {
+      image = var.node_image
+      type  = "pd-ssd"
+      size  = var.boot_disk_size
+    }
   }
 
   attached_disks = [{
diff --git a/blueprints/gke/autopilot/mgmt.tf b/blueprints/gke/autopilot/mgmt.tf
index 3b9e4a6d..35ff760a 100644
--- a/blueprints/gke/autopilot/mgmt.tf
+++ b/blueprints/gke/autopilot/mgmt.tf
@@ -32,9 +32,11 @@ module "mgmt_server" {
   }]
   service_account_create = true
   boot_disk = {
-    image = var.mgmt_server_config.image
-    type  = var.mgmt_server_config.disk_type
-    size  = var.mgmt_server_config.disk_size
+    initialize_params = {
+      image = var.mgmt_server_config.image
+      type  = var.mgmt_server_config.disk_type
+      size  = var.mgmt_server_config.disk_size
+    }
   }
   tags = ["ssh"]
 }
diff --git a/blueprints/gke/multi-cluster-mesh-gke-fleet-api/vm.tf b/blueprints/gke/multi-cluster-mesh-gke-fleet-api/vm.tf
index 0a53ee51..8c6a19f3 100644
--- a/blueprints/gke/multi-cluster-mesh-gke-fleet-api/vm.tf
+++ b/blueprints/gke/multi-cluster-mesh-gke-fleet-api/vm.tf
@@ -30,9 +30,11 @@ module "mgmt_server" {
   }]
   service_account_create = true
   boot_disk = {
-    image = var.mgmt_server_config.image
-    type  = var.mgmt_server_config.disk_type
-    size  = var.mgmt_server_config.disk_size
+    initialize_params = {
+      image = var.mgmt_server_config.image
+      type  = var.mgmt_server_config.disk_type
+      size  = var.mgmt_server_config.disk_size
+    }
   }
 }
 
diff --git a/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/main.tf b/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/main.tf
index df0397bd..ad2d0e48 100644
--- a/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/main.tf
+++ b/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/main.tf
@@ -289,7 +289,9 @@ module "proxy-vm" {
     subnetwork = module.vpc.subnet_self_links[format("%s/%s", var.region, var.subnetwork)]
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   create_template = true
   metadata = {
diff --git a/blueprints/networking/__need_fixing/onprem-google-access-dns/main.tf b/blueprints/networking/__need_fixing/onprem-google-access-dns/main.tf
index 8be38fbc..24e7ca4d 100644
--- a/blueprints/networking/__need_fixing/onprem-google-access-dns/main.tf
+++ b/blueprints/networking/__need_fixing/onprem-google-access-dns/main.tf
@@ -302,7 +302,9 @@ module "vm-onprem" {
   instance_type = "f1-micro"
   name          = "onprem"
   boot_disk = {
-    image = "ubuntu-os-cloud/ubuntu-1804-lts"
+    initialize_params = {
+      image = "ubuntu-os-cloud/ubuntu-1804-lts"
+    }
   }
   metadata = {
     user-data = module.config-onprem.cloud_config
diff --git a/blueprints/networking/ilb-next-hop/gateways.tf b/blueprints/networking/ilb-next-hop/gateways.tf
index 3a1dcffb..97f69fef 100644
--- a/blueprints/networking/ilb-next-hop/gateways.tf
+++ b/blueprints/networking/ilb-next-hop/gateways.tf
@@ -23,9 +23,11 @@ module "gw" {
   instance_type = "f1-micro"
 
   boot_disk = {
-    image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts",
-    type  = "pd-ssd",
-    size  = 10
+    initialize_params = {
+      image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts",
+      type  = "pd-ssd",
+      size  = 10
+    }
   }
 
   network_interfaces = [
diff --git a/blueprints/networking/private-cloud-function-from-onprem/main.tf b/blueprints/networking/private-cloud-function-from-onprem/main.tf
index 49bab252..b3737bef 100644
--- a/blueprints/networking/private-cloud-function-from-onprem/main.tf
+++ b/blueprints/networking/private-cloud-function-from-onprem/main.tf
@@ -161,7 +161,9 @@ module "test-vm" {
   name          = "${var.name}-test"
   instance_type = "e2-micro"
   boot_disk = {
-    image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2104"
+    initialize_params = {
+      image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2104"
+    }
   }
   network_interfaces = [{
     network    = module.vpc-onprem.self_link
diff --git a/modules/cloud-config-container/__need_fixing/onprem/README.md b/modules/cloud-config-container/__need_fixing/onprem/README.md
index bc81f437..1f6308ca 100644
--- a/modules/cloud-config-container/__need_fixing/onprem/README.md
+++ b/modules/cloud-config-container/__need_fixing/onprem/README.md
@@ -58,9 +58,11 @@ module "vm" {
     google-logging-enabled = true
   }
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   tags = ["ssh"]
 }
diff --git a/modules/cloud-config-container/coredns/README.md b/modules/cloud-config-container/coredns/README.md
index 4abe69e3..c4f63a90 100644
--- a/modules/cloud-config-container/coredns/README.md
+++ b/modules/cloud-config-container/coredns/README.md
@@ -41,9 +41,11 @@ module "vm" {
     google-logging-enabled = true
   }
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   tags = ["dns", "ssh"]
 }
diff --git a/modules/cloud-config-container/nginx-tls/README.md b/modules/cloud-config-container/nginx-tls/README.md
index 9dfe9b06..15f2ffe0 100644
--- a/modules/cloud-config-container/nginx-tls/README.md
+++ b/modules/cloud-config-container/nginx-tls/README.md
@@ -25,9 +25,11 @@ module "vm-nginx-tls" {
     google-logging-enabled = true
   }
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   tags = ["http-server", "https-server", "ssh"]
 }
diff --git a/modules/cloud-config-container/nginx/README.md b/modules/cloud-config-container/nginx/README.md
index c5fbc09b..dad3d55d 100644
--- a/modules/cloud-config-container/nginx/README.md
+++ b/modules/cloud-config-container/nginx/README.md
@@ -41,9 +41,11 @@ module "vm-nginx-tls" {
     google-logging-enabled = true
   }
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   tags = ["http-server", "ssh"]
 }
diff --git a/modules/cloud-config-container/simple-nva/README.md b/modules/cloud-config-container/simple-nva/README.md
index e0800d17..7eb7b4b8 100644
--- a/modules/cloud-config-container/simple-nva/README.md
+++ b/modules/cloud-config-container/simple-nva/README.md
@@ -54,9 +54,11 @@ module "vm" {
     google-logging-enabled = true
   }
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   tags = ["nva", "ssh"]
 }
diff --git a/modules/net-ilb/README.md b/modules/net-ilb/README.md
index 48c1d908..aa428733 100644
--- a/modules/net-ilb/README.md
+++ b/modules/net-ilb/README.md
@@ -132,9 +132,11 @@ module "instance-group" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+      type  = "pd-ssd"
+      size  = 10
+    }
   }
   tags = ["http-server", "ssh"]
   metadata = {