From 7c6726e79b5554093be1b7c1c1779fbfb6f0a510 Mon Sep 17 00:00:00 2001 From: Luca Prete Date: Sat, 28 Oct 2023 15:36:30 +0200 Subject: [PATCH 1/3] [net-address] enable ipv6 (#1821) --------- Co-authored-by: Luca Prete --- blueprints/apigee/hybrid-gke/glb.tf | 8 +-- blueprints/gke/autopilot/glbs.tf | 10 ++-- .../third-party-solutions/phpipam/glb.tf | 10 ++-- modules/net-address/README.md | 53 ++++++++++++++++--- modules/net-address/main.tf | 27 ++++++---- modules/net-address/variables.tf | 23 ++++++-- modules/net-lb-app-ext/README.md | 8 +-- tests/modules/net_address/examples/ipv6.yaml | 44 +++++++++++++++ 8 files changed, 147 insertions(+), 36 deletions(-) create mode 100644 tests/modules/net_address/examples/ipv6.yaml diff --git a/blueprints/apigee/hybrid-gke/glb.tf b/blueprints/apigee/hybrid-gke/glb.tf index 80ff2269..247b92b5 100644 --- a/blueprints/apigee/hybrid-gke/glb.tf +++ b/blueprints/apigee/hybrid-gke/glb.tf @@ -19,7 +19,9 @@ locals { } module "addresses" { - source = "../../../modules/net-address" - project_id = module.project.project_id - global_addresses = [local.ingress_ip_name] + source = "../../../modules/net-address" + project_id = module.project.project_id + global_addresses = { + "${local.ingress_ip_name}" = {} + } } diff --git a/blueprints/gke/autopilot/glbs.tf b/blueprints/gke/autopilot/glbs.tf index 39897c43..026411e0 100644 --- a/blueprints/gke/autopilot/glbs.tf +++ b/blueprints/gke/autopilot/glbs.tf @@ -19,7 +19,11 @@ locals { } module "addresses" { - source = "../../../modules/net-address" - project_id = module.project.project_id - global_addresses = ["grafana", "locust", "app"] + source = "../../../modules/net-address" + project_id = module.project.project_id + global_addresses = { + app = {} + grafana = {} + locust = {} + } } diff --git a/blueprints/third-party-solutions/phpipam/glb.tf b/blueprints/third-party-solutions/phpipam/glb.tf index 9016330e..2a9aa449 100644 --- a/blueprints/third-party-solutions/phpipam/glb.tf +++ b/blueprints/third-party-solutions/phpipam/glb.tf @@ -21,10 +21,12 @@ locals { # Reserved static IP for the Load Balancer module "addresses" { - source = "../../../modules/net-address" - count = local.glb_create ? 1 : 0 - project_id = var.project_id - global_addresses = ["phpipam"] + source = "../../../modules/net-address" + count = local.glb_create ? 1 : 0 + project_id = var.project_id + global_addresses = { + phpipam = {} + } } # Global L7 HTTPS Load Balancer in front of Cloud Run diff --git a/modules/net-address/README.md b/modules/net-address/README.md index c99ca511..02eb6458 100644 --- a/modules/net-address/README.md +++ b/modules/net-address/README.md @@ -14,7 +14,10 @@ module "addresses" { one = { region = "europe-west1" } two = { region = "europe-west2" } } - global_addresses = ["app-1", "app-2"] + global_addresses = { + app-1 = {} + app-2 = {} + } } # tftest modules=1 resources=4 inventory=external.yaml ``` @@ -41,6 +44,40 @@ module "addresses" { # tftest modules=1 resources=2 inventory=internal.yaml ``` +### IPv6 addresses + +You can reserve both external and internal IPv6 addresses. + +```hcl +module "addresses" { + source = "./fabric/modules/net-address" + project_id = var.project_id + external_addresses = { + nlb = { + region = var.region + subnetwork = var.subnet.self_link + ipv6 = { + endpoint_type = "NETLB" + } + } + } + internal_addresses = { + ilb = { + ipv6 = {} + purpose = "SHARED_LOADBALANCER_VIP" + region = var.region + subnetwork = var.subnet.self_link + } + vm = { + ipv6 = {} + region = var.region + subnetwork = var.subnet.self_link + } + } +} +# tftest modules=1 resources=3 inventory=ipv6.yaml +``` + ### PSA addresses ```hcl @@ -106,13 +143,13 @@ module "addresses" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [project_id](variables.tf#L68) | Project where the addresses will be created. | string | ✓ | | -| [external_addresses](variables.tf#L17) | Map of external addresses, keyed by name. | map(object({…})) | | {} | -| [global_addresses](variables.tf#L28) | List of global addresses to create. | list(string) | | [] | -| [internal_addresses](variables.tf#L34) | Map of internal addresses to create, keyed by name. | map(object({…})) | | {} | -| [ipsec_interconnect_addresses](variables.tf#L49) | Map of internal addresses used for HPA VPN over Cloud Interconnect. | map(object({…})) | | {} | -| [psa_addresses](variables.tf#L73) | Map of internal addresses used for Private Service Access. | map(object({…})) | | {} | -| [psc_addresses](variables.tf#L86) | Map of internal addresses used for Private Service Connect. | map(object({…})) | | {} | +| [project_id](variables.tf#L83) | Project where the addresses will be created. | string | ✓ | | +| [external_addresses](variables.tf#L17) | Map of external addresses, keyed by name. | map(object({…})) | | {} | +| [global_addresses](variables.tf#L38) | List of global addresses to create. | map(object({…})) | | {} | +| [internal_addresses](variables.tf#L48) | Map of internal addresses to create, keyed by name. | map(object({…})) | | {} | +| [ipsec_interconnect_addresses](variables.tf#L64) | Map of internal addresses used for HPA VPN over Cloud Interconnect. | map(object({…})) | | {} | +| [psa_addresses](variables.tf#L88) | Map of internal addresses used for Private Service Access. | map(object({…})) | | {} | +| [psc_addresses](variables.tf#L101) | 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 f80cab29..9f9d5230 100644 --- a/modules/net-address/main.tf +++ b/modules/net-address/main.tf @@ -15,20 +15,24 @@ */ resource "google_compute_global_address" "global" { - for_each = toset(var.global_addresses) - project = var.project_id - name = each.value + for_each = var.global_addresses + project = var.project_id + name = coalesce(each.value.name, each.key) + description = each.value.description + ip_version = each.value.ipv6 != null ? "IPV6" : "IPV4" } resource "google_compute_address" "external" { - provider = google-beta - for_each = var.external_addresses - project = var.project_id - name = coalesce(each.value.name, each.key) - description = each.value.description - address_type = "EXTERNAL" - region = each.value.region - labels = each.value.labels + provider = google-beta + for_each = var.external_addresses + project = var.project_id + name = coalesce(each.value.name, each.key) + description = each.value.description + address_type = "EXTERNAL" + ip_version = each.value.ipv6 != null ? "IPV6" : "IPV4" + ipv6_endpoint_type = try(each.value.ipv6.endpoint_type, null) + region = each.value.region + labels = each.value.labels } resource "google_compute_address" "internal" { @@ -41,6 +45,7 @@ resource "google_compute_address" "internal" { region = each.value.region subnetwork = each.value.subnetwork address = each.value.address + ip_version = each.value.ipv6 != null ? "IPV6" : "IPV4" network_tier = each.value.tier purpose = each.value.purpose labels = coalesce(each.value.labels, {}) diff --git a/modules/net-address/variables.tf b/modules/net-address/variables.tf index 9f7c5c70..5a6fd683 100644 --- a/modules/net-address/variables.tf +++ b/modules/net-address/variables.tf @@ -19,16 +19,30 @@ variable "external_addresses" { type = map(object({ region = string description = optional(string, "Terraform managed.") - labels = optional(map(string), {}) - name = optional(string) + ipv6 = optional(object({ + endpoint_type = string + })) + labels = optional(map(string), {}) + name = optional(string) })) default = {} + validation { + condition = ( + try(var.external_addresses.ipv6, null) == null + || can(regex("^(NETLB|VM)$", try(var.external_addresses.ipv6.endpoint_type, null))) + ) + error_message = "IPv6 endpoint type must be NETLB, VM." + } } variable "global_addresses" { description = "List of global addresses to create." - type = list(string) - default = [] + type = map(object({ + description = optional(string, "Terraform managed.") + ipv6 = optional(map(string)) # To be left empty for ipv6 + name = optional(string) + })) + default = {} } variable "internal_addresses" { @@ -38,6 +52,7 @@ variable "internal_addresses" { subnetwork = string address = optional(string) description = optional(string, "Terraform managed.") + ipv6 = optional(map(string)) # To be left empty for ipv6 labels = optional(map(string)) name = optional(string) purpose = optional(string) diff --git a/modules/net-lb-app-ext/README.md b/modules/net-lb-app-ext/README.md index f404f105..72b1e48f 100644 --- a/modules/net-lb-app-ext/README.md +++ b/modules/net-lb-app-ext/README.md @@ -129,9 +129,11 @@ Redirect is implemented via an additional HTTP load balancer with a custom URL m ```hcl module "addresses" { - source = "./fabric/modules/net-address" - project_id = "myprj" - global_addresses = ["glb-test-0"] + source = "./fabric/modules/net-address" + project_id = "myprj" + global_addresses = { + "glb-test-0" = {} + } } module "glb-test-0-redirect" { diff --git a/tests/modules/net_address/examples/ipv6.yaml b/tests/modules/net_address/examples/ipv6.yaml new file mode 100644 index 00000000..306e39c6 --- /dev/null +++ b/tests/modules/net_address/examples/ipv6.yaml @@ -0,0 +1,44 @@ +# 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +values: + module.addresses.google_compute_address.external["nlb"]: + address_type: EXTERNAL + ip_version: IPV6 + ipv6_endpoint_type: NETLB + name: nlb + project: project-id + region: region + module.addresses.google_compute_address.internal["ilb"]: + address_type: INTERNAL + ip_version: IPV6 + labels: null + name: ilb + network: null + project: project-id + purpose: SHARED_LOADBALANCER_VIP + region: region + subnetwork: subnet_self_link + module.addresses.google_compute_address.internal["vm"]: + address_type: INTERNAL + ip_version: IPV6 + labels: null + name: vm + network: null + project: project-id + region: region + subnetwork: subnet_self_link + +counts: + google_compute_address: 3 From 671f06a3a483753599a50e255a989250618aa504 Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Sun, 29 Oct 2023 11:24:52 +0100 Subject: [PATCH 2/3] Billing budget factory (#1822) * billing budget factory * review comment changes --- modules/billing-account/README.md | 57 ++++++++++++++-- modules/billing-account/budgets.tf | 2 +- modules/billing-account/factory.tf | 98 ++++++++++++++++++++++++++++ modules/billing-account/variables.tf | 10 +++ 4 files changed, 159 insertions(+), 8 deletions(-) create mode 100644 modules/billing-account/factory.tf diff --git a/modules/billing-account/README.md b/modules/billing-account/README.md index f5fd4e2f..3b596a0f 100644 --- a/modules/billing-account/README.md +++ b/modules/billing-account/README.md @@ -23,6 +23,7 @@ provider "google" { - [Billing budgets](#billing-budgets) - [PubSub update rules](#pubsub-update-rules) - [Monitoring channels](#monitoring-channels) + - [Budget factory](#budget-factory) - [Variables](#variables) - [Outputs](#outputs) @@ -212,21 +213,63 @@ module "billing-account" { # tftest modules=1 resources=2 inventory=budget-monitoring-channel.yaml ``` +#### Budget factory + +This module also exposes a factory for billing budgets, that works in a similar way to factories in other modules: a specific folder is searched for YAML files, which contain one budget description per file. The file name is used to generate the key of the resulting map of budgets, which is merged with the one coming from the `budgets` variable. The YAML files support the same type of the `budgets` variable. + +```hcl +module "billing-account" { + source = "./fabric/modules/billing-account" + id = "012345-ABCDEF-012345" + budget_notification_channels = { + billing-default = { + project_id = "tf-playground-simple" + type = "email" + labels = { + email_address = "gcp-billing-admins@example.com" + } + } + } +} +# tftest modules=1 resources=2 files=test-1 inventory=budget-monitoring-channel.yaml +``` + +```yaml +# tftest-file id=test-1 path=data/billing-budgets/folder-net-month-current-100.yaml +display_name: 100 dollars in current spend +amount: + units: 100 +filter: + period: + calendar: MONTH + resource_ancestors: + - folders/1234567890 +threshold_rules: +- percent: 0.5 +- percent: 0.75 +update_rules: + default: + disable_default_iam_recipients: true + monitoring_notification_channels: + - billing-default +``` + ## Variables | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [id](variables.tf#L165) | Billing account id. | string | ✓ | | +| [id](variables.tf#L175) | Billing account id. | string | ✓ | | | [budget_notification_channels](variables.tf#L17) | Notification channels used by budget alerts. | map(object({…})) | | {} | | [budgets](variables.tf#L47) | Billing budgets. Notification channels are either keys in corresponding variable, or external ids. | map(object({…})) | | {} | -| [group_iam](variables.tf#L121) | Authoritative IAM binding for organization groups, in {GROUP_EMAIL => [ROLES]} format. Group emails need to be static. Can be used in combination with the `iam` variable. | map(list(string)) | | {} | -| [iam](variables.tf#L128) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | -| [iam_bindings](variables.tf#L135) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | map(object({…})) | | {} | -| [iam_bindings_additive](variables.tf#L150) | Individual additive IAM bindings. Keys are arbitrary. | map(object({…})) | | {} | -| [logging_sinks](variables.tf#L170) | Logging sinks to create for the organization. | map(object({…})) | | {} | -| [projects](variables.tf#L203) | Projects associated with this billing account. | list(string) | | [] | +| [factory_config](variables.tf#L121) | Path to folder containing budget alerts data files. | object({…}) | | {} | +| [group_iam](variables.tf#L131) | Authoritative IAM binding for organization groups, in {GROUP_EMAIL => [ROLES]} format. Group emails need to be static. Can be used in combination with the `iam` variable. | map(list(string)) | | {} | +| [iam](variables.tf#L138) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | +| [iam_bindings](variables.tf#L145) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | map(object({…})) | | {} | +| [iam_bindings_additive](variables.tf#L160) | Individual additive IAM bindings. Keys are arbitrary. | map(object({…})) | | {} | +| [logging_sinks](variables.tf#L180) | Logging sinks to create for the organization. | map(object({…})) | | {} | +| [projects](variables.tf#L213) | Projects associated with this billing account. | list(string) | | [] | ## Outputs diff --git a/modules/billing-account/budgets.tf b/modules/billing-account/budgets.tf index a1aed400..710af5d8 100644 --- a/modules/billing-account/budgets.tf +++ b/modules/billing-account/budgets.tf @@ -37,7 +37,7 @@ resource "google_monitoring_notification_channel" "default" { } resource "google_billing_budget" "default" { - for_each = var.budgets + for_each = merge(local.factory_budgets, var.budgets) billing_account = var.id display_name = each.value.display_name dynamic "amount" { diff --git a/modules/billing-account/factory.tf b/modules/billing-account/factory.tf new file mode 100644 index 00000000..f32c7c35 --- /dev/null +++ b/modules/billing-account/factory.tf @@ -0,0 +1,98 @@ +/** + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +locals { + _factory_data = { + for f in fileset("${local._factory_path}", "**/*.yaml") : + trimsuffix(f, ".yaml") => yamldecode(file("${local._factory_path}/${f}")) + } + _factory_path = var.factory_config.budgets_data_path + factory_budgets = { + for k, v in local._factory_data : k => merge(v, { + amount = merge( + { + currency_code = null + nanos = null + units = null + use_last_period = null + }, + try(v.amount, {}) + ) + display_name = try(v.display_name, null) + filter = try(v.filter, null) == null ? null : { + credit_types_treatment = ( + try(v.filter.credit_types_treatment, null) == null + ? null + : merge( + { exclude_all = null, include_specified = null }, + v.filter.credit_types_treatment + ) + ) + label = try(v.filter.label, null) + projects = try(v.filter.projects, null) + resource_ancestors = try(v.filter.resource_ancestors, null) + services = try(v.filter.services, null) + subaccounts = try(v.filter.subaccounts, null) + } + threshold_rules = [ + for vv in try(v.threshold_rules, []) : merge({ + percent = null + forecasted_spend = null + }, vv) + ] + update_rules = { + for kk, vv in try(v.update_rules, {}) : kk => merge({ + disable_default_iam_recipients = null + monitoring_notification_channels = null + pubsub_topic = null + }, vv) + } + }) + } +} + +# check data coming from the factory as it bypasses variable validation rules + +check "factory_budgets" { + assert { + condition = alltrue([ + for k, v in local.factory_budgets : v.amount != null && ( + try(v.amount.use_last_period, null) == true || + try(v.amount.units, null) != null + ) + ]) + error_message = "Factory budgets need either amount units or last period set." + } + assert { + condition = alltrue([ + for k, v in local.factory_budgets : + v.threshold_rules == null || try(v.threshold_rules.percent, null) != null + ]) + error_message = "Threshold rules need percent set." + } + assert { + condition = alltrue(flatten([ + for k, v in local.factory_budgets : [ + for kk, vv in v.update_rules : [ + vv.monitoring_notification_channels != null + || + vv.pubsub_topic != null + ] + ] + ])) + error_message = "Notification rules need either a pubsub topic or monitoring channels defined." + } +} diff --git a/modules/billing-account/variables.tf b/modules/billing-account/variables.tf index 6d949ea6..526521e5 100644 --- a/modules/billing-account/variables.tf +++ b/modules/billing-account/variables.tf @@ -118,6 +118,16 @@ variable "budgets" { } } +variable "factory_config" { + # TODO: align all other factory variable names + description = "Path to folder containing budget alerts data files." + type = object({ + budgets_data_path = optional(string, "data/billing-budgets") + }) + nullable = false + default = {} +} + variable "group_iam" { description = "Authoritative IAM binding for organization groups, in {GROUP_EMAIL => [ROLES]} format. Group emails need to be static. Can be used in combination with the `iam` variable." type = map(list(string)) From 4c17dea8d998ca2190657cfc92ffc758390022a5 Mon Sep 17 00:00:00 2001 From: Ludo Date: Mon, 30 Oct 2023 07:42:57 +0100 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 735b6c7e..5a71669a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ All notable changes to this project will be documented in this file. ### BLUEPRINTS +- [[#1821](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1821)] [net-address] enable ipv6 ([LucaPrete](https://github.com/LucaPrete)) +- [[#1814](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1814)] **incompatible change:** Allow specifying arbitrary project roles for service accounts in project factory ([ludoo](https://github.com/ludoo)) - [[#1812](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1812)] Stop wrapping yamldecode with try() ([sruffilli](https://github.com/sruffilli)) - [[#1806](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1806)] Updating network dashboard: fixing Cloud SQL problem, fixing 1 metric… ([aurelienlegrand](https://github.com/aurelienlegrand)) - [[#1796](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1796)] Make extended shared vpc attributes optional in project factory ([ludoo](https://github.com/ludoo)) @@ -25,6 +27,7 @@ All notable changes to this project will be documented in this file. ### FAST +- [[#1818](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1818)] FAST: rename VPC-related files to `net-*` ([sruffilli](https://github.com/sruffilli)) - [[#1812](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1812)] Stop wrapping yamldecode with try() ([sruffilli](https://github.com/sruffilli)) - [[#1810](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1810)] FAST: Add access transparency logs to the default sinks ([sruffilli](https://github.com/sruffilli)) - [[#1809](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1809)] FAST: Add VPC serverless connector NAT ranges to hierarchical fw ([sruffilli](https://github.com/sruffilli)) @@ -46,6 +49,11 @@ All notable changes to this project will be documented in this file. ### MODULES +- [[#1822](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1822)] Billing budget factory ([ludoo](https://github.com/ludoo)) +- [[#1821](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1821)] [net-address] enable ipv6 ([LucaPrete](https://github.com/LucaPrete)) +- [[#1820](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1820)] Added iam_bindings and iam_bindings_additive to apigee module ([apichick](https://github.com/apichick)) +- [[#1813](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1813)] empty gpu sharing config fix ([ewojtach](https://github.com/ewojtach)) +- [[#1815](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1815)] Fix logic for default source range in firewall ingress rules ([ludoo](https://github.com/ludoo)) - [[#1812](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1812)] Stop wrapping yamldecode with try() ([sruffilli](https://github.com/sruffilli)) - [[#1750](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1750)] AI models support ([ewojtach](https://github.com/ewojtach)) - [[#1798](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1798)] Fix Apigee add-ons configuration ([mwarm2](https://github.com/mwarm2))