From a6e377fad2edcdbc861bec11f490baea6e122827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20Niesiob=C4=99dzki?= Date: Sat, 6 Jan 2024 08:12:49 +0000 Subject: [PATCH] Rename compute-mig-bc.tf to compute-vm-group-bc.tf --- modules/net-lb-app-ext-regional/README.md | 54 +++++++-------- modules/net-lb-app-ext/README.md | 66 +++++++++---------- ...mpute-mig-bc.tf => compute-vm-group-bc.tf} | 4 +- 3 files changed, 62 insertions(+), 62 deletions(-) rename tests/fixtures/{compute-mig-bc.tf => compute-vm-group-bc.tf} (95%) diff --git a/modules/net-lb-app-ext-regional/README.md b/modules/net-lb-app-ext-regional/README.md index 1de3a82a..b633047b 100644 --- a/modules/net-lb-app-ext-regional/README.md +++ b/modules/net-lb-app-ext-regional/README.md @@ -45,13 +45,13 @@ module "glb-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, - { backend = module.compute-mig-c.group.id } + { backend = module.compute-vm-group-b.group.id }, + { backend = module.compute-vm-group-c.group.id } ] } } } -# tftest modules=3 resources=9 fixtures=fixtures/compute-mig-bc.tf +# tftest modules=3 resources=9 fixtures=fixtures/compute-vm-group-bc.tf ``` ### Minimal HTTPS examples @@ -89,8 +89,8 @@ module "ralb-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, - { backend = module.compute-mig-c.group.id } + { backend = module.compute-vm-group-b.group.id }, + { backend = module.compute-vm-group-c.group.id } ] protocol = "HTTP" } @@ -106,7 +106,7 @@ module "ralb-0" { } } } -# tftest modules=3 resources=12 fixtures=fixtures/compute-mig-bc.tf +# tftest modules=3 resources=12 fixtures=fixtures/compute-vm-group-bc.tf ``` #### HTTPS backends @@ -123,8 +123,8 @@ module "ralb-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, - { backend = module.compute-mig-c.group.id } + { backend = module.compute-vm-group-b.group.id }, + { backend = module.compute-vm-group-c.group.id } ] protocol = "HTTPS" } @@ -146,7 +146,7 @@ module "ralb-0" { } } } -# tftest modules=3 resources=12 fixtures=fixtures/ssl-certificate.tf,fixtures/compute-mig-bc.tf +# tftest modules=3 resources=12 fixtures=fixtures/ssl-certificate.tf,fixtures/compute-vm-group-bc.tf ``` #### HTTP to HTTPS redirect @@ -193,7 +193,7 @@ module "ralb-test-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, + { backend = module.compute-vm-group-b.group.id }, ] protocol = "HTTP" } @@ -209,7 +209,7 @@ module "ralb-test-0" { } } -# tftest modules=5 resources=16 fixtures=fixtures/ssl-certificate.tf,fixtures/compute-mig-bc.tf +# tftest modules=5 resources=16 fixtures=fixtures/ssl-certificate.tf,fixtures/compute-vm-group-bc.tf ``` ### Health Checks @@ -230,7 +230,7 @@ module "ralb-0" { backend_service_configs = { default = { backends = [{ - backend = module.compute-mig-b.group.id + backend = module.compute-vm-group-b.group.id }] # no need to reference the hc explicitly when using the `default` key # health_checks = ["default"] @@ -242,7 +242,7 @@ module "ralb-0" { } } } -# tftest modules=3 resources=9 fixtures=fixtures/compute-mig-bc.tf +# tftest modules=3 resources=9 fixtures=fixtures/compute-vm-group-bc.tf ``` To leverage existing health checks without having the module create them, simply pass their self links to backend services and set the `health_check_configs` variable to an empty map: @@ -257,14 +257,14 @@ module "ralb-0" { backend_service_configs = { default = { backends = [{ - backend = module.compute-mig-b.group.id + backend = module.compute-vm-group-b.group.id }] health_checks = ["projects/${var.project_id}/global/healthChecks/custom"] } } health_check_configs = {} } -# tftest modules=3 resources=8 fixtures=fixtures/compute-mig-bc.tf +# tftest modules=3 resources=8 fixtures=fixtures/compute-vm-group-bc.tf ``` ### Backend Types and Management @@ -291,13 +291,13 @@ module "ralb-0" { default-b = { zone = "${var.region}-b" instances = [ - module.compute-mig-b.id + module.compute-vm-group-b.id ] named_ports = { http = 80 } } } } -# tftest modules=3 resources=10 fixtures=fixtures/compute-mig-bc.tf +# tftest modules=3 resources=10 fixtures=fixtures/compute-vm-group-bc.tf ``` #### Managed Instance Groups @@ -397,7 +397,7 @@ module "ralb-0" { endpoints = { e-0 = { instance = "my-ig-b" - ip_address = module.compute-mig-b.internal_ip + ip_address = module.compute-vm-group-b.internal_ip port = 80 } } @@ -405,7 +405,7 @@ module "ralb-0" { } } } -# tftest modules=3 resources=11 fixtures=fixtures/compute-mig-bc.tf +# tftest modules=3 resources=11 fixtures=fixtures/compute-vm-group-bc.tf ``` #### Hybrid NEG creation @@ -530,12 +530,12 @@ module "ralb-0" { backend_service_configs = { default = { backends = [{ - backend = module.compute-mig-b.group.id + backend = module.compute-vm-group-b.group.id }] } other = { backends = [{ - backend = module.compute-mig-c.group.id + backend = module.compute-vm-group-c.group.id }] } } @@ -557,7 +557,7 @@ module "ralb-0" { } } -# tftest modules=3 resources=10 fixtures=fixtures/compute-mig-bc.tf +# tftest modules=3 resources=10 fixtures=fixtures/compute-vm-group-bc.tf ``` ### Complex example @@ -599,14 +599,14 @@ module "ralb-0" { group-zone-b = { zone = "${var.region}-b" instances = [ - module.compute-mig-b.id + module.compute-vm-group-b.id ] named_ports = { http = 80 } } group-zone-c = { zone = "${var.region}-c" instances = [ - module.compute-mig-c.id + module.compute-vm-group-c.id ] named_ports = { http = 80 } } @@ -633,7 +633,7 @@ module "ralb-0" { endpoints = { e-0 = { instance = "my-ig-c" - ip_address = module.compute-mig-c.internal_ip + ip_address = module.compute-vm-group-c.internal_ip port = 80 } } @@ -687,7 +687,7 @@ module "ralb-0" { } } } -# tftest modules=3 resources=18 fixtures=fixtures/compute-mig-bc.tf +# tftest modules=3 resources=18 fixtures=fixtures/compute-vm-group-bc.tf ``` @@ -745,6 +745,6 @@ module "ralb-0" { ## Fixtures -- [compute-mig-bc.tf](../../tests/fixtures/compute-mig-bc.tf) +- [compute-mig-bc.tf](../../tests/fixtures/compute-vm-group-bc.tf) - [ssl-certificate.tf](../../tests/fixtures/ssl-certificate.tf) diff --git a/modules/net-lb-app-ext/README.md b/modules/net-lb-app-ext/README.md index bb0d7963..5939043c 100644 --- a/modules/net-lb-app-ext/README.md +++ b/modules/net-lb-app-ext/README.md @@ -46,13 +46,13 @@ module "glb-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, - { backend = module.compute-mig-c.group.id }, + { backend = module.compute-vm-group-b.group.id }, + { backend = module.compute-vm-group-c.group.id }, ] } } } -# tftest modules=3 resources=9 fixtures=fixtures/compute-mig-bc.tf inventory=minimal-http.yaml e2e +# tftest modules=3 resources=9 fixtures=fixtures/compute-vm-group-bc.tf inventory=minimal-http.yaml e2e ``` ### Minimal HTTPS examples @@ -69,8 +69,8 @@ module "glb-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, - { backend = module.compute-mig-c.group.id }, + { backend = module.compute-vm-group-b.group.id }, + { backend = module.compute-vm-group-c.group.id }, ] protocol = "HTTP" } @@ -84,7 +84,7 @@ module "glb-0" { } } } -# tftest modules=3 resources=10 fixtures=fixtures/compute-mig-bc.tf inventory=http-backends.yaml e2e +# tftest modules=3 resources=10 fixtures=fixtures/compute-vm-group-bc.tf inventory=http-backends.yaml e2e ``` #### HTTPS backends @@ -99,8 +99,8 @@ module "glb-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, - { backend = module.compute-mig-c.group.id }, + { backend = module.compute-vm-group-b.group.id }, + { backend = module.compute-vm-group-c.group.id }, ] protocol = "HTTPS" } @@ -121,7 +121,7 @@ module "glb-0" { } } } -# tftest modules=3 resources=10 fixtures=fixtures/compute-mig-bc.tf inventory=https-backends.yaml e2e +# tftest modules=3 resources=10 fixtures=fixtures/compute-vm-group-bc.tf inventory=https-backends.yaml e2e ``` #### HTTP to HTTPS redirect @@ -165,7 +165,7 @@ module "glb-test-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, + { backend = module.compute-vm-group-b.group.id }, ] protocol = "HTTP" } @@ -180,7 +180,7 @@ module "glb-test-0" { } } -# tftest modules=5 resources=14 fixtures=fixtures/compute-mig-bc.tf inventory=http-https-redirect.yaml e2e +# tftest modules=5 resources=14 fixtures=fixtures/compute-vm-group-bc.tf inventory=http-https-redirect.yaml e2e ``` ### Classic vs Non-classic @@ -196,13 +196,13 @@ module "glb-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, - { backend = module.compute-mig-c.group.id }, + { backend = module.compute-vm-group-b.group.id }, + { backend = module.compute-vm-group-c.group.id }, ] } } } -# tftest modules=3 resources=9 fixtures=fixtures/compute-mig-bc.tf inventory=classic-vs-non-classic.yaml e2e +# tftest modules=3 resources=9 fixtures=fixtures/compute-vm-group-bc.tf inventory=classic-vs-non-classic.yaml e2e ``` ### Health Checks @@ -221,7 +221,7 @@ module "glb-0" { backend_service_configs = { default = { backends = [{ - backend = module.compute-mig-b.group.id + backend = module.compute-vm-group-b.group.id }] # no need to reference the hc explicitly when using the `default` key # health_checks = ["default"] @@ -233,7 +233,7 @@ module "glb-0" { } } } -# tftest modules=3 resources=9 fixtures=fixtures/compute-mig-bc.tf inventory=health-check-1.yaml e2e +# tftest modules=3 resources=9 fixtures=fixtures/compute-vm-group-bc.tf inventory=health-check-1.yaml e2e ``` To leverage existing health checks without having the module create them, simply pass their self links to backend services and set the `health_check_configs` variable to an empty map: @@ -246,14 +246,14 @@ module "glb-0" { backend_service_configs = { default = { backends = [{ - backend = module.compute-mig-b.group.id + backend = module.compute-vm-group-b.group.id }] health_checks = ["projects/${var.project_id}/global/healthChecks/custom"] } } health_check_configs = {} } -# tftest modules=3 resources=8 fixtures=fixtures/compute-mig-bc.tf inventory=health-check-2.yaml +# tftest modules=3 resources=8 fixtures=fixtures/compute-vm-group-bc.tf inventory=health-check-2.yaml ``` ### Backend Types and Management @@ -278,13 +278,13 @@ module "glb-0" { default-b = { zone = "${var.region}-b" instances = [ - module.compute-mig-b.id + module.compute-vm-group-b.id ] named_ports = { http = 80 } } } } -# tftest modules=3 resources=10 fixtures=fixtures/compute-mig-bc.tf inventory=instance-groups.yaml e2e +# tftest modules=3 resources=10 fixtures=fixtures/compute-vm-group-bc.tf inventory=instance-groups.yaml e2e ``` #### Managed Instance Groups @@ -432,7 +432,7 @@ module "glb-0" { endpoints = { e-0 = { instance = "my-ig-b" - ip_address = module.compute-mig-b.internal_ip + ip_address = module.compute-vm-group-b.internal_ip port = 80 } } @@ -440,7 +440,7 @@ module "glb-0" { } } } -# tftest modules=3 resources=11 fixtures=fixtures/compute-mig-bc.tf inventory=zonal-neg-creation.yaml e2e +# tftest modules=3 resources=11 fixtures=fixtures/compute-vm-group-bc.tf inventory=zonal-neg-creation.yaml e2e ``` #### Hybrid NEG creation @@ -636,12 +636,12 @@ module "glb-0" { backend_service_configs = { default = { backends = [{ - backend = module.compute-mig-b.group.id + backend = module.compute-vm-group-b.group.id }] } other = { backends = [{ - backend = module.compute-mig-c.group.id + backend = module.compute-vm-group-c.group.id }] } } @@ -663,7 +663,7 @@ module "glb-0" { } } -# tftest modules=3 resources=10 fixtures=fixtures/compute-mig-bc.tf inventory=url-map.yaml e2e +# tftest modules=3 resources=10 fixtures=fixtures/compute-vm-group-bc.tf inventory=url-map.yaml e2e ``` ### SSL Certificates @@ -699,8 +699,8 @@ module "glb-0" { backend_service_configs = { default = { backends = [ - { backend = module.compute-mig-b.group.id }, - { backend = module.compute-mig-c.group.id }, + { backend = module.compute-vm-group-b.group.id }, + { backend = module.compute-vm-group-c.group.id }, ] protocol = "HTTP" } @@ -716,7 +716,7 @@ module "glb-0" { } } } -# tftest modules=3 resources=12 fixtures=fixtures/compute-mig-bc.tf inventory=ssl-certificates.yaml e2e +# tftest modules=3 resources=12 fixtures=fixtures/compute-vm-group-bc.tf inventory=ssl-certificates.yaml e2e ``` ### Complex example @@ -761,14 +761,14 @@ module "glb-0" { group-zone-b = { zone = "${var.region}-b" instances = [ - module.compute-mig-b.id + module.compute-vm-group-b.id ] named_ports = { http = 80 } } group-zone-c = { zone = "${var.region}-c" instances = [ - module.compute-mig-c.id + module.compute-vm-group-c.id ] named_ports = { http = 80 } } @@ -795,7 +795,7 @@ module "glb-0" { endpoints = { e-0 = { instance = "my-ig-c" - ip_address = module.compute-mig-c.internal_ip + ip_address = module.compute-vm-group-c.internal_ip port = 80 } } @@ -849,7 +849,7 @@ module "glb-0" { } } } -# tftest modules=3 resources=19 fixtures=fixtures/compute-mig-bc.tf inventory=complex-example.yaml e2e +# tftest modules=3 resources=19 fixtures=fixtures/compute-vm-group-bc.tf inventory=complex-example.yaml e2e ``` @@ -911,5 +911,5 @@ module "glb-0" { ## Fixtures -- [compute-mig-bc.tf](../../tests/fixtures/compute-mig-bc.tf) +- [compute-vm-group-bc.tf](../../tests/fixtures/compute-vm-group-bc.tf) diff --git a/tests/fixtures/compute-mig-bc.tf b/tests/fixtures/compute-vm-group-bc.tf similarity index 95% rename from tests/fixtures/compute-mig-bc.tf rename to tests/fixtures/compute-vm-group-bc.tf index fbf8f311..59183f93 100644 --- a/tests/fixtures/compute-mig-bc.tf +++ b/tests/fixtures/compute-vm-group-bc.tf @@ -13,7 +13,7 @@ # limitations under the License. -module "compute-mig-b" { +module "compute-vm-group-b" { source = "./fabric/modules/compute-vm" project_id = var.project_id zone = "${var.region}-b" @@ -30,7 +30,7 @@ module "compute-mig-b" { group = { named_ports = {} } } -module "compute-mig-c" { +module "compute-vm-group-c" { source = "./fabric/modules/compute-vm" project_id = var.project_id zone = "${var.region}-c"