Add subnets id output, expand net-address outputs

modules/net-address/README.md

@@ -95,9 +95,9 @@ module "addresses" {
 | name | description | sensitive |
 |---|---|:---:|
 | [external_addresses](outputs.tf#L17) | Allocated external addresses. |  |
-| [global_addresses](outputs.tf#L28) | Allocated global external addresses. |  |
-| [internal_addresses](outputs.tf#L39) | Allocated internal addresses. |  |
-| [psa_addresses](outputs.tf#L50) | Allocated internal addresses for PSA endpoints. |  |
-| [psc_addresses](outputs.tf#L62) | Allocated internal addresses for PSC endpoints. |  |
+| [global_addresses](outputs.tf#L25) | Allocated global external addresses. |  |
+| [internal_addresses](outputs.tf#L33) | Allocated internal addresses. |  |
+| [psa_addresses](outputs.tf#L41) | Allocated internal addresses for PSA endpoints. |  |
+| [psc_addresses](outputs.tf#L49) | Allocated internal addresses for PSC endpoints. |  |
 
 <!-- END TFDOC -->

modules/net-address/outputs.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.
@@ -18,10 +18,7 @@ output "external_addresses" {
   description = "Allocated external addresses."
   value = {
     for address in google_compute_address.external :
-    address.name => {
-      address   = address.address
-      self_link = address.self_link
-    }
+    address.name => address
   }
 }
 
@@ -29,10 +26,7 @@ output "global_addresses" {
   description = "Allocated global external addresses."
   value = {
     for address in google_compute_global_address.global :
-    address.name => {
-      address   = address.address
-      self_link = address.self_link
-    }
+    address.name => address
   }
 }
 
@@ -40,10 +34,7 @@ output "internal_addresses" {
   description = "Allocated internal addresses."
   value = {
     for address in google_compute_address.internal :
-    address.name => {
-      address   = address.address
-      self_link = address.self_link
-    }
+    address.name => address
   }
 }
 
@@ -51,11 +42,7 @@ output "psa_addresses" {
   description = "Allocated internal addresses for PSA endpoints."
   value = {
     for address in google_compute_global_address.psa :
-    address.name => {
-      address       = address.address
-      prefix_length = address.prefix_length
-      self_link     = address.self_link
-    }
+    address.name => address
   }
 }
 
@@ -63,9 +50,6 @@ output "psc_addresses" {
   description = "Allocated internal addresses for PSC endpoints."
   value = {
     for address in google_compute_global_address.psc :
-    address.name => {
-      address   = address.address
-      self_link = address.self_link
-    }
+    address.name => address
   }
 }