From 973a8594b6c94afa8d0ed9b4119fdf0bd73a4783 Mon Sep 17 00:00:00 2001
From: simonebruzzechesse
<60114646+simonebruzzechesse@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:04:54 +0200
Subject: [PATCH] add support for custom description in net-address (#1499)
---
modules/net-address/README.md | 8 ++++----
modules/net-address/main.tf | 6 +++---
modules/net-address/variables.tf | 19 +++++++++++--------
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/modules/net-address/README.md b/modules/net-address/README.md
index e8e34ff1..cefecd9b 100644
--- a/modules/net-address/README.md
+++ b/modules/net-address/README.md
@@ -83,12 +83,12 @@ module "addresses" {
| name | description | type | required | default |
|---|---|:---:|:---:|:---:|
-| [project_id](variables.tf#L54) | Project where the addresses will be created. | string | ✓ | |
+| [project_id](variables.tf#L55) | Project where the addresses will be created. | string | ✓ | |
| [external_addresses](variables.tf#L17) | Map of external address regions, keyed by name. | map(string) | | {} |
| [global_addresses](variables.tf#L29) | List of global addresses to create. | list(string) | | [] |
-| [internal_addresses](variables.tf#L35) | Map of internal addresses to create, keyed by name. | map(object({…})) | | {} |
-| [psa_addresses](variables.tf#L59) | Map of internal addresses used for Private Service Access. | map(object({…})) | | {} |
-| [psc_addresses](variables.tf#L69) | Map of internal addresses used for Private Service Connect. | map(object({…})) | | {} |
+| [internal_addresses](variables.tf#L35) | Map of internal addresses to create, keyed by name. | map(object({…})) | | {} |
+| [psa_addresses](variables.tf#L60) | Map of internal addresses used for Private Service Access. | map(object({…})) | | {} |
+| [psc_addresses](variables.tf#L71) | Map of internal addresses used for Private Service Connect. | map(object({…})) | | {} |
## Outputs
diff --git a/modules/net-address/main.tf b/modules/net-address/main.tf
index 8619f95b..0ca49423 100644
--- a/modules/net-address/main.tf
+++ b/modules/net-address/main.tf
@@ -35,7 +35,7 @@ resource "google_compute_address" "internal" {
for_each = var.internal_addresses
project = var.project_id
name = each.key
- description = "Terraform managed."
+ description = each.value.description
address_type = "INTERNAL"
region = each.value.region
subnetwork = each.value.subnetwork
@@ -49,7 +49,7 @@ resource "google_compute_global_address" "psc" {
for_each = var.psc_addresses
project = var.project_id
name = each.key
- description = "Terraform managed."
+ description = each.value.description
address = try(each.value.address, null)
address_type = "INTERNAL"
network = each.value.network
@@ -61,7 +61,7 @@ resource "google_compute_global_address" "psa" {
for_each = var.psa_addresses
project = var.project_id
name = each.key
- description = "Terraform managed."
+ description = each.value.description
address = each.value.address
address_type = "INTERNAL"
network = each.value.network
diff --git a/modules/net-address/variables.tf b/modules/net-address/variables.tf
index 35093e83..f460b3ff 100644
--- a/modules/net-address/variables.tf
+++ b/modules/net-address/variables.tf
@@ -35,12 +35,13 @@ variable "global_addresses" {
variable "internal_addresses" {
description = "Map of internal addresses to create, keyed by name."
type = map(object({
- region = string
- subnetwork = string
- address = optional(string)
- labels = optional(map(string))
- purpose = optional(string)
- tier = optional(string)
+ region = string
+ subnetwork = string
+ address = optional(string)
+ description = optional(string, "Terraform managed.")
+ labels = optional(map(string))
+ purpose = optional(string)
+ tier = optional(string)
}))
default = {}
}
@@ -61,6 +62,7 @@ variable "psa_addresses" {
type = map(object({
address = string
network = string
+ description = optional(string, "Terraform managed.")
prefix_length = number
}))
default = {}
@@ -69,8 +71,9 @@ variable "psa_addresses" {
variable "psc_addresses" {
description = "Map of internal addresses used for Private Service Connect."
type = map(object({
- address = string
- network = string
+ address = string
+ network = string
+ description = optional(string, "Terraform managed.")
}))
default = {}
}