Skip to content

Commit cca78b0

Browse files
Do not validate INTERNAL_MANAGED backend service capacity. (#5484) (#10664)
* Do not validate INTERNAL_MANAGED backend service capacity. * remove test expecting this behavior. * remove a bunch of dead code that the linter complained about. Signed-off-by: Modular Magician <[email protected]>
1 parent 735f2f1 commit cca78b0

File tree

3 files changed

+5
-149
lines changed

3 files changed

+5
-149
lines changed

.changelog/5484.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
compute: Fixed incorrectly failing validation for `INTERNAL_MANAGED` `google_compute_region_backend_service`.
3+
```

google/resource_compute_region_backend_service.go

+2
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ func customDiffRegionBackendService(_ context.Context, d *schema.ResourceDiff, m
109109
switch d.Get("load_balancing_scheme").(string) {
110110
case "INTERNAL", "EXTERNAL":
111111
return validateNonManagedBackendServiceBackends(backends, d)
112+
case "INTERNAL_MANAGED":
113+
return nil
112114
default:
113115
return validateManagedBackendServiceBackends(backends, d)
114116
}

google/resource_compute_region_backend_service_test.go

-149
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ func TestAccComputeRegionBackendService_withBackendInternalManaged(t *testing.T)
9191
Providers: testAccProviders,
9292
CheckDestroy: testAccCheckComputeRegionBackendServiceDestroyProducer(t),
9393
Steps: []resource.TestStep{
94-
{
95-
Config: testAccComputeRegionBackendService_internalManagedInvalidBackend(serviceName, igmName, hcName),
96-
ExpectError: regexp.MustCompile("non-zero capacity_scaler"),
97-
},
98-
{
99-
Config: testAccComputeRegionBackendService_internalManagedInvalidMultiBackends(serviceName, igmName, hcName),
100-
ExpectError: regexp.MustCompile("non-zero capacity_scaler"),
101-
},
10294
{
10395
Config: testAccComputeRegionBackendService_internalManagedMultipleBackends(serviceName, igmName, hcName),
10496
},
@@ -554,147 +546,6 @@ resource "google_compute_health_check" "default" {
554546
`, serviceName, igName, itName, checkName)
555547
}
556548

557-
func testAccComputeRegionBackendService_internalManagedInvalidBackend(serviceName, igmName, hcName string) string {
558-
return fmt.Sprintf(`
559-
resource "google_compute_region_backend_service" "default" {
560-
name = "%s"
561-
562-
load_balancing_scheme = "INTERNAL_MANAGED"
563-
564-
backend {
565-
group = google_compute_region_instance_group_manager.rigm.instance_group
566-
balancing_mode = "UTILIZATION"
567-
}
568-
569-
region = "us-central1"
570-
port_name = "http"
571-
protocol = "HTTP"
572-
timeout_sec = 10
573-
574-
health_checks = [google_compute_region_health_check.default.self_link]
575-
}
576-
577-
data "google_compute_image" "debian_image" {
578-
family = "debian-9"
579-
project = "debian-cloud"
580-
}
581-
582-
resource "google_compute_region_instance_group_manager" "rigm" {
583-
region = "us-central1"
584-
name = "%s"
585-
version {
586-
instance_template = google_compute_instance_template.instance_template.self_link
587-
name = "primary"
588-
}
589-
base_instance_name = "internal-glb"
590-
target_size = 1
591-
}
592-
593-
resource "google_compute_instance_template" "instance_template" {
594-
name = "%s-template"
595-
machine_type = "e2-medium"
596-
597-
network_interface {
598-
network = "default"
599-
}
600-
601-
disk {
602-
source_image = data.google_compute_image.debian_image.self_link
603-
auto_delete = true
604-
boot = true
605-
}
606-
}
607-
608-
resource "google_compute_region_health_check" "default" {
609-
name = "%s"
610-
region = "us-central1"
611-
612-
http_health_check {
613-
port_specification = "USE_SERVING_PORT"
614-
}
615-
}
616-
`, serviceName, igmName, igmName, hcName)
617-
}
618-
619-
func testAccComputeRegionBackendService_internalManagedInvalidMultiBackends(serviceName, igmName, hcName string) string {
620-
return fmt.Sprintf(`
621-
resource "google_compute_region_backend_service" "default" {
622-
name = "%s"
623-
load_balancing_scheme = "INTERNAL_MANAGED"
624-
625-
backend {
626-
group = google_compute_region_instance_group_manager.rigm1.instance_group
627-
balancing_mode = "UTILIZATION"
628-
capacity_scaler = 0.0
629-
}
630-
631-
backend {
632-
group = google_compute_region_instance_group_manager.rigm2.instance_group
633-
balancing_mode = "UTILIZATION"
634-
capacity_scaler = 0.0
635-
}
636-
637-
region = "us-central1"
638-
port_name = "http"
639-
protocol = "HTTP"
640-
timeout_sec = 10
641-
642-
health_checks = [google_compute_region_health_check.default.self_link]
643-
}
644-
645-
data "google_compute_image" "debian_image" {
646-
family = "debian-9"
647-
project = "debian-cloud"
648-
}
649-
650-
resource "google_compute_region_instance_group_manager" "rigm1" {
651-
name = "%s-1"
652-
region = "us-central1"
653-
version {
654-
instance_template = google_compute_instance_template.instance_template.self_link
655-
name = "primary"
656-
}
657-
base_instance_name = "internal-glb"
658-
target_size = 1
659-
}
660-
661-
resource "google_compute_region_instance_group_manager" "rigm2" {
662-
name = "%s-2"
663-
region = "us-central1"
664-
version {
665-
instance_template = google_compute_instance_template.instance_template.self_link
666-
name = "primary"
667-
}
668-
base_instance_name = "internal-glb"
669-
target_size = 1
670-
}
671-
672-
resource "google_compute_instance_template" "instance_template" {
673-
name = "%s-template"
674-
machine_type = "e2-medium"
675-
676-
network_interface {
677-
network = "default"
678-
}
679-
680-
disk {
681-
source_image = data.google_compute_image.debian_image.self_link
682-
auto_delete = true
683-
boot = true
684-
}
685-
}
686-
687-
resource "google_compute_region_health_check" "default" {
688-
name = "%s"
689-
region = "us-central1"
690-
691-
http_health_check {
692-
port_specification = "USE_SERVING_PORT"
693-
}
694-
}
695-
`, serviceName, igmName, igmName, igmName, hcName)
696-
}
697-
698549
func testAccComputeRegionBackendService_internalManagedMultipleBackends(serviceName, igmName, hcName string) string {
699550
return fmt.Sprintf(`
700551
resource "google_compute_region_backend_service" "default" {

0 commit comments

Comments
 (0)