Merge pull request #1432 from GoogleCloudPlatform/jccb/fix-1431

Make internal/external addresses optional in compute-vm
GoogleCloudPlatform · Jun 8, 2023 · eddef7e · eddef7e
2 parents 6baf872 + e900e9c
commit eddef7e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/blueprints/data-solutions/sqlserver-alwayson/instances.tf b/blueprints/data-solutions/sqlserver-alwayson/instances.tf
@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -68,7 +68,6 @@ module "nodes" {
     nat        = false
     addresses = {
       internal = module.ip-addresses.internal_addresses[each.value].address
-      external = null
     }
   }]
 
@@ -122,7 +121,6 @@ module "witness" {
     nat        = false
     addresses = {
       internal = module.ip-addresses.internal_addresses[each.value].address
-      external = null
     }
   }]
 

diff --git a/fast/stages/2-networking-e-nva-bgp/nva.tf b/fast/stages/2-networking-e-nva-bgp/nva.tf
@@ -152,7 +152,6 @@ module "nva" {
       subnetwork = module.landing-untrusted-vpc.subnet_self_links["${each.value.region}/landing-untrusted-default-${each.value.shortname}"]
       nat        = false
       addresses = {
-        external = null
         internal = google_compute_address.nva_static_ip_untrusted[each.key].address
       }
     },
@@ -161,7 +160,6 @@ module "nva" {
       subnetwork = module.landing-trusted-vpc.subnet_self_links["${each.value.region}/landing-trusted-default-${each.value.shortname}"]
       nat        = false
       addresses = {
-        external = null
         internal = google_compute_address.nva_static_ip_trusted[each.key].address
       }
     }

diff --git a/modules/compute-vm/README.md b/modules/compute-vm/README.md
@@ -215,7 +215,7 @@ module "vm-internal-ip" {
   network_interfaces = [{
     network    = var.vpc.self_link
     subnetwork = var.subnet.self_link
-    addresses  = { external = null, internal = "10.0.0.2" }
+    addresses  = { internal = "10.0.0.2" }
   }]
 }
 
@@ -228,7 +228,7 @@ module "vm-external-ip" {
     network    = var.vpc.self_link
     subnetwork = var.subnet.self_link
     nat        = true
-    addresses  = { external = "8.8.8.8", internal = null }
+    addresses  = { external = "8.8.8.8" }
   }]
 }
 # tftest modules=2 resources=2 inventory=ips.yaml
@@ -507,7 +507,7 @@ module "instance-group" {
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
 | [name](variables.tf#L182) | Instance name. | <code>string</code> | ✓ |  |
-| [network_interfaces](variables.tf#L187) | Network interfaces configuration. Use self links for Shared VPC, set addresses to null if not needed. | <code title="list&#40;object&#40;&#123;&#10;  nat        &#61; optional&#40;bool, false&#41;&#10;  network    &#61; string&#10;  subnetwork &#61; string&#10;  addresses &#61; optional&#40;object&#40;&#123;&#10;    internal &#61; string&#10;    external &#61; string&#10;  &#125;&#41;, null&#41;&#10;  alias_ips &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  nic_type  &#61; optional&#40;string&#41;&#10;&#125;&#41;&#41;">list&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | ✓ |  |
+| [network_interfaces](variables.tf#L187) | Network interfaces configuration. Use self links for Shared VPC, set addresses to null if not needed. | <code title="list&#40;object&#40;&#123;&#10;  nat        &#61; optional&#40;bool, false&#41;&#10;  network    &#61; string&#10;  subnetwork &#61; string&#10;  addresses &#61; optional&#40;object&#40;&#123;&#10;    internal &#61; optional&#40;string&#41;&#10;    external &#61; optional&#40;string&#41;&#10;  &#125;&#41;, null&#41;&#10;  alias_ips &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  nic_type  &#61; optional&#40;string&#41;&#10;&#125;&#41;&#41;">list&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | ✓ |  |
 | [project_id](variables.tf#L224) | Project id. | <code>string</code> | ✓ |  |
 | [zone](variables.tf#L283) | Compute zone. | <code>string</code> | ✓ |  |
 | [attached_disk_defaults](variables.tf#L17) | Defaults for attached disks options. | <code title="object&#40;&#123;&#10;  auto_delete  &#61; optional&#40;bool, false&#41;&#10;  mode         &#61; string&#10;  replica_zone &#61; string&#10;  type         &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code title="&#123;&#10;  auto_delete  &#61; true&#10;  mode         &#61; &#34;READ_WRITE&#34;&#10;  replica_zone &#61; null&#10;  type         &#61; &#34;pd-balanced&#34;&#10;&#125;">&#123;&#8230;&#125;</code> |

diff --git a/modules/compute-vm/variables.tf b/modules/compute-vm/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -191,8 +191,8 @@ variable "network_interfaces" {
     network    = string
     subnetwork = string
     addresses = optional(object({
-      internal = string
-      external = string
+      internal = optional(string)
+      external = optional(string)
     }), null)
     alias_ips = optional(map(string), {})
     nic_type  = optional(string)