align group names in lb modules (#1485)

modules/net-lb-app-ext/README.md

@@ -776,7 +776,8 @@ module "glb-0" {
 | name | description | resources |
 |---|---|---|
 | [backend-service.tf](./backend-service.tf) | Backend service resources. | <code>google_compute_backend_service</code> |
-| [backends.tf](./backends.tf) | Backend groups and backend buckets resources. | <code>google_compute_backend_bucket</code> · <code>google_compute_instance_group</code> |
+| [backends.tf](./backends.tf) | Backend groups and backend buckets resources. | <code>google_compute_backend_bucket</code> |
+| [groups.tf](./groups.tf) | None | <code>google_compute_instance_group</code> |
 | [health-check.tf](./health-check.tf) | Health check resource. | <code>google_compute_health_check</code> |
 | [main.tf](./main.tf) | Module-level locals and resources. | <code>google_compute_global_forwarding_rule</code> · <code>google_compute_managed_ssl_certificate</code> · <code>google_compute_ssl_certificate</code> · <code>google_compute_target_http_proxy</code> · <code>google_compute_target_https_proxy</code> |
 | [negs.tf](./negs.tf) | NEG resources. | <code>google_compute_global_network_endpoint</code> · <code>google_compute_global_network_endpoint_group</code> · <code>google_compute_network_endpoint</code> · <code>google_compute_network_endpoint_group</code> · <code>google_compute_region_network_endpoint_group</code> |

modules/net-lb-app-ext/backends.tf

@@ -75,24 +75,3 @@ resource "google_compute_backend_bucket" "default" {
     }
   }
 }
-
-resource "google_compute_instance_group" "default" {
-  for_each = var.group_configs
-  project = (
-    each.value.project_id == null
-    ? var.project_id
-    : each.value.project_id
-  )
-  zone        = each.value.zone
-  name        = "${var.name}-${each.key}"
-  description = var.description
-  instances   = each.value.instances
-
-  dynamic "named_port" {
-    for_each = each.value.named_ports
-    content {
-      name = named_port.key
-      port = named_port.value
-    }
-  }
-}

modules/net-lb-app-ext/groups.tf

@@ -0,0 +1,36 @@
+/**
+ * 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.
+ */
+
+resource "google_compute_instance_group" "default" {
+  for_each = var.group_configs
+  project = (
+    each.value.project_id == null
+    ? var.project_id
+    : each.value.project_id
+  )
+  zone        = each.value.zone
+  name        = "${var.name}-${each.key}"
+  description = var.description
+  instances   = each.value.instances
+
+  dynamic "named_port" {
+    for_each = each.value.named_ports
+    content {
+      name = named_port.key
+      port = named_port.value
+    }
+  }
+}

modules/net-lb-app-int/README.md

@@ -622,8 +622,9 @@ module "ilb-l7" {
 | name | description | resources |
 |---|---|---|
 | [backend-service.tf](./backend-service.tf) | Backend service resources. | <code>google_compute_region_backend_service</code> |
+| [groups.tf](./groups.tf) | None | <code>google_compute_instance_group</code> |
 | [health-check.tf](./health-check.tf) | Health check resource. | <code>google_compute_health_check</code> |
-| [main.tf](./main.tf) | Module-level locals and resources. | <code>google_compute_forwarding_rule</code> · <code>google_compute_instance_group</code> · <code>google_compute_network_endpoint</code> · <code>google_compute_network_endpoint_group</code> · <code>google_compute_region_network_endpoint_group</code> · <code>google_compute_region_ssl_certificate</code> · <code>google_compute_region_target_http_proxy</code> · <code>google_compute_region_target_https_proxy</code> |
+| [main.tf](./main.tf) | Module-level locals and resources. | <code>google_compute_forwarding_rule</code> · <code>google_compute_network_endpoint</code> · <code>google_compute_network_endpoint_group</code> · <code>google_compute_region_network_endpoint_group</code> · <code>google_compute_region_ssl_certificate</code> · <code>google_compute_region_target_http_proxy</code> · <code>google_compute_region_target_https_proxy</code> |
 | [outputs.tf](./outputs.tf) | Module outputs. |  |
 | [urlmap.tf](./urlmap.tf) | URL map resources. | <code>google_compute_region_url_map</code> |
 | [variables-backend-service.tf](./variables-backend-service.tf) | Backend services variables. |  |

modules/net-lb-app-int/groups.tf

@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+
+resource "google_compute_instance_group" "default" {
+  for_each = var.group_configs
+  project = (
+    each.value.project_id == null
+    ? var.project_id
+    : each.value.project_id
+  )
+  zone        = each.value.zone
+  name        = "${var.name}-${each.key}"
+  description = var.description
+  instances   = each.value.instances
+
+  dynamic "named_port" {
+    for_each = each.value.named_ports
+    content {
+      name = named_port.key
+      port = named_port.value
+    }
+  }
+}
+

modules/net-lb-app-int/main.tf

@@ -117,26 +117,6 @@ resource "google_compute_region_target_https_proxy" "default" {
   url_map          = google_compute_region_url_map.default.id
 }
 
-resource "google_compute_instance_group" "default" {
-  for_each = var.group_configs
-  project = (
-    each.value.project_id == null
-    ? var.project_id
-    : each.value.project_id
-  )
-  zone        = each.value.zone
-  name        = "${var.name}-${each.key}"
-  description = var.description
-  instances   = each.value.instances
-  dynamic "named_port" {
-    for_each = each.value.named_ports
-    content {
-      name = named_port.key
-      port = named_port.value
-    }
-  }
-}
-
 resource "google_compute_network_endpoint_group" "default" {
   for_each = local.neg_zonal
   project = (

modules/net-lb-ext/groups.tf

@@ -16,13 +16,14 @@
 
 # tfdoc:file:description Optional instance group resources.
 
-resource "google_compute_instance_group" "unmanaged" {
+resource "google_compute_instance_group" "default" {
   for_each    = var.group_configs
   project     = var.project_id
   zone        = each.value.zone
-  name        = each.key
-  description = "Terraform-managed."
+  name        = "${var.name}-${each.key}"
+  description = var.description
   instances   = each.value.instances
+
   dynamic "named_port" {
     for_each = each.value.named_ports
     content {

modules/net-lb-ext/outputs.tf

@@ -47,13 +47,13 @@ output "forwarding_rule_self_link" {
 output "group_self_links" {
   description = "Optional unmanaged instance group self links."
   value = {
-    for k, v in google_compute_instance_group.unmanaged : k => v.self_link
+    for k, v in google_compute_instance_group.default : k => v.self_link
   }
 }
 
 output "groups" {
   description = "Optional unmanaged instance group resources."
-  value       = google_compute_instance_group.unmanaged
+  value       = google_compute_instance_group.default
 }
 
 output "health_check" {

modules/net-lb-int/groups.tf

@@ -16,13 +16,14 @@
 
 # tfdoc:file:description Optional instance group resources.
 
-resource "google_compute_instance_group" "unmanaged" {
+resource "google_compute_instance_group" "default" {
   for_each    = var.group_configs
   project     = var.project_id
   zone        = each.value.zone
-  name        = each.key
+  name        = "${var.name}-${each.key}"
   description = each.value.description
   instances   = each.value.instances
+
   dynamic "named_port" {
     for_each = each.value.named_ports
     content {

modules/net-lb-int/outputs.tf

@@ -47,13 +47,13 @@ output "forwarding_rule_self_link" {
 output "group_self_links" {
   description = "Optional unmanaged instance group self links."
   value = {
-    for k, v in google_compute_instance_group.unmanaged : k => v.self_link
+    for k, v in google_compute_instance_group.default : k => v.self_link
   }
 }
 
 output "groups" {
   description = "Optional unmanaged instance group resources."
-  value       = google_compute_instance_group.unmanaged
+  value       = google_compute_instance_group.default
 }
 
 output "health_check" {