From 4f79e12365f2dcc6ce945f0b6c5a9de331379ad4 Mon Sep 17 00:00:00 2001 From: Luca Prete Date: Fri, 14 Jan 2022 16:52:03 +0100 Subject: [PATCH] Rename net-xlb module to net-glb (#433) --- CHANGELOG.md | 2 +- modules/{net-xlb => net-glb}/README.md | 54 +++++++++---------- .../{net-xlb => net-glb}/backend_services.tf | 0 .../global_forwarding_rule.tf | 0 modules/{net-xlb => net-glb}/health_checks.tf | 0 modules/{net-xlb => net-glb}/ip_address.tf | 0 modules/{net-xlb => net-glb}/outputs.tf | 0 .../{net-xlb => net-glb}/ssl_certificates.tf | 0 modules/{net-xlb => net-glb}/target_proxy.tf | 0 modules/{net-xlb => net-glb}/url_map.tf | 0 modules/{net-xlb => net-glb}/variables.tf | 0 modules/{net-xlb => net-glb}/versions.tf | 0 .../modules/{net_xlb => net_glb}/__init__.py | 0 .../{net_xlb => net_glb}/fixture/main.tf | 4 +- .../{net_xlb => net_glb}/fixture/variables.tf | 0 .../modules/{net_xlb => net_glb}/test_plan.py | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) rename modules/{net-xlb => net-glb}/README.md (94%) rename modules/{net-xlb => net-glb}/backend_services.tf (100%) rename modules/{net-xlb => net-glb}/global_forwarding_rule.tf (100%) rename modules/{net-xlb => net-glb}/health_checks.tf (100%) rename modules/{net-xlb => net-glb}/ip_address.tf (100%) rename modules/{net-xlb => net-glb}/outputs.tf (100%) rename modules/{net-xlb => net-glb}/ssl_certificates.tf (100%) rename modules/{net-xlb => net-glb}/target_proxy.tf (100%) rename modules/{net-xlb => net-glb}/url_map.tf (100%) rename modules/{net-xlb => net-glb}/variables.tf (100%) rename modules/{net-xlb => net-glb}/versions.tf (100%) rename tests/modules/{net_xlb => net_glb}/__init__.py (100%) rename tests/modules/{net_xlb => net_glb}/fixture/main.tf (92%) rename tests/modules/{net_xlb => net_glb}/fixture/variables.tf (100%) rename tests/modules/{net_xlb => net_glb}/test_plan.py (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e132fe29f..30f5f37e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. ## Unreleased -- new `net-xlb` module for Global External Load balancer +- new `net-glb` module for Global External Load balancer ## [12.0.0] - 2022-01-11 diff --git a/modules/net-xlb/README.md b/modules/net-glb/README.md similarity index 94% rename from modules/net-xlb/README.md rename to modules/net-glb/README.md index 726ef7bd3..6dc4162e4 100644 --- a/modules/net-xlb/README.md +++ b/modules/net-glb/README.md @@ -9,9 +9,9 @@ The module allows managing External Global HTTP/HTTPS Load Balancers (XGLB), int This is a minimal example, which creates a global HTTP load balancer, pointing the path `/` to an existing GCS bucket called `my_test_bucket`. ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id backend_services_config = { @@ -34,9 +34,9 @@ module "xlb" { A very similar coniguration also applies to GCE instance groups: ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id backend_services_config = { @@ -71,9 +71,9 @@ Alternatively, one or more health checks can be either contextually created or a For example, to contextually create a health check and attach it to the backend service: ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id backend_services_config = { @@ -116,9 +116,9 @@ module "xlb" { Backends can be multiple, group and bucket backends can be mixed and group backends support multiple groups. ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id backend_services_config = { @@ -180,9 +180,9 @@ Backend services can be specified as needed in the url-map configuration, refere In this example, we're using one backend service as the default backend ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id url_map_config = { @@ -248,9 +248,9 @@ module "xlb" { Optionally, a static IP address can be reserved: ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id reserve_ip_address = true @@ -285,9 +285,9 @@ The module supports both managed and unmanaged certificates, and they can be eit If no `ssl_certificates_config` variable is specified, a managed certificate for the domain *example.com* is automatically created. ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id https = true @@ -319,9 +319,9 @@ Otherwise, SSL certificates can be explicitely defined. In this case, they'll ne If the ids specified in the `target_proxy_https_config` variable are not found in the `ssl_certificates_config` map, they are used as is, assuming the ssl certificates already exist. ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id https = true @@ -367,9 +367,9 @@ module "xlb" { Using unamanged certificates is also possible. Here is an example: ```hcl -module "xlb" { - source = "./modules/net-xlb" - name = "xlb-test" +module "glb" { + source = "./modules/net-glb" + name = "glb-test" project_id = var.project_id https = true diff --git a/modules/net-xlb/backend_services.tf b/modules/net-glb/backend_services.tf similarity index 100% rename from modules/net-xlb/backend_services.tf rename to modules/net-glb/backend_services.tf diff --git a/modules/net-xlb/global_forwarding_rule.tf b/modules/net-glb/global_forwarding_rule.tf similarity index 100% rename from modules/net-xlb/global_forwarding_rule.tf rename to modules/net-glb/global_forwarding_rule.tf diff --git a/modules/net-xlb/health_checks.tf b/modules/net-glb/health_checks.tf similarity index 100% rename from modules/net-xlb/health_checks.tf rename to modules/net-glb/health_checks.tf diff --git a/modules/net-xlb/ip_address.tf b/modules/net-glb/ip_address.tf similarity index 100% rename from modules/net-xlb/ip_address.tf rename to modules/net-glb/ip_address.tf diff --git a/modules/net-xlb/outputs.tf b/modules/net-glb/outputs.tf similarity index 100% rename from modules/net-xlb/outputs.tf rename to modules/net-glb/outputs.tf diff --git a/modules/net-xlb/ssl_certificates.tf b/modules/net-glb/ssl_certificates.tf similarity index 100% rename from modules/net-xlb/ssl_certificates.tf rename to modules/net-glb/ssl_certificates.tf diff --git a/modules/net-xlb/target_proxy.tf b/modules/net-glb/target_proxy.tf similarity index 100% rename from modules/net-xlb/target_proxy.tf rename to modules/net-glb/target_proxy.tf diff --git a/modules/net-xlb/url_map.tf b/modules/net-glb/url_map.tf similarity index 100% rename from modules/net-xlb/url_map.tf rename to modules/net-glb/url_map.tf diff --git a/modules/net-xlb/variables.tf b/modules/net-glb/variables.tf similarity index 100% rename from modules/net-xlb/variables.tf rename to modules/net-glb/variables.tf diff --git a/modules/net-xlb/versions.tf b/modules/net-glb/versions.tf similarity index 100% rename from modules/net-xlb/versions.tf rename to modules/net-glb/versions.tf diff --git a/tests/modules/net_xlb/__init__.py b/tests/modules/net_glb/__init__.py similarity index 100% rename from tests/modules/net_xlb/__init__.py rename to tests/modules/net_glb/__init__.py diff --git a/tests/modules/net_xlb/fixture/main.tf b/tests/modules/net_glb/fixture/main.tf similarity index 92% rename from tests/modules/net_xlb/fixture/main.tf rename to tests/modules/net_glb/fixture/main.tf index d8b97e45f..544804d02 100644 --- a/tests/modules/net_xlb/fixture/main.tf +++ b/tests/modules/net_glb/fixture/main.tf @@ -15,9 +15,9 @@ */ module "test" { - source = "../../../../modules/net-xlb" + source = "../../../../modules/net-glb" project_id = "my-project" - name = "xlb-test" + name = "glb-test" health_checks_config_defaults = var.health_checks_config_defaults health_checks_config = var.health_checks_config backend_services_config = var.backend_services_config diff --git a/tests/modules/net_xlb/fixture/variables.tf b/tests/modules/net_glb/fixture/variables.tf similarity index 100% rename from tests/modules/net_xlb/fixture/variables.tf rename to tests/modules/net_glb/fixture/variables.tf diff --git a/tests/modules/net_xlb/test_plan.py b/tests/modules/net_glb/test_plan.py similarity index 99% rename from tests/modules/net_xlb/test_plan.py rename to tests/modules/net_glb/test_plan.py index 471d6265b..48804300b 100644 --- a/tests/modules/net_xlb/test_plan.py +++ b/tests/modules/net_glb/test_plan.py @@ -63,7 +63,7 @@ _BACKEND_GROUP_HC = '''{ } }''' -_NAME = 'xlb-test' +_NAME = 'glb-test' _SSL_CERTIFICATES_CONFIG_MANAGED = '''{ my-domain = {