Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not validate INTERNAL_MANAGED backend service capacity. #10664

Merged
merged 1 commit into from
Dec 1, 2021
Merged

Do not validate INTERNAL_MANAGED backend service capacity. #10664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/5484.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
compute: Fixed incorrectly failing validation for `INTERNAL_MANAGED` `google_compute_region_backend_service`.
```
2 changes: 2 additions & 0 deletions google/resource_compute_region_backend_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ func customDiffRegionBackendService(_ context.Context, d *schema.ResourceDiff, m
switch d.Get("load_balancing_scheme").(string) {
case "INTERNAL", "EXTERNAL":
return validateNonManagedBackendServiceBackends(backends, d)
case "INTERNAL_MANAGED":
return nil
default:
return validateManagedBackendServiceBackends(backends, d)
}
Expand Down
149 changes: 0 additions & 149 deletions google/resource_compute_region_backend_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,6 @@ func TestAccComputeRegionBackendService_withBackendInternalManaged(t *testing.T)
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionBackendServiceDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccComputeRegionBackendService_internalManagedInvalidBackend(serviceName, igmName, hcName),
ExpectError: regexp.MustCompile("non-zero capacity_scaler"),
},
{
Config: testAccComputeRegionBackendService_internalManagedInvalidMultiBackends(serviceName, igmName, hcName),
ExpectError: regexp.MustCompile("non-zero capacity_scaler"),
},
{
Config: testAccComputeRegionBackendService_internalManagedMultipleBackends(serviceName, igmName, hcName),
},
Expand Down Expand Up @@ -554,147 +546,6 @@ resource "google_compute_health_check" "default" {
`, serviceName, igName, itName, checkName)
}

func testAccComputeRegionBackendService_internalManagedInvalidBackend(serviceName, igmName, hcName string) string {
return fmt.Sprintf(`
resource "google_compute_region_backend_service" "default" {
name = "%s"

load_balancing_scheme = "INTERNAL_MANAGED"

backend {
group = google_compute_region_instance_group_manager.rigm.instance_group
balancing_mode = "UTILIZATION"
}

region = "us-central1"
port_name = "http"
protocol = "HTTP"
timeout_sec = 10

health_checks = [google_compute_region_health_check.default.self_link]
}

data "google_compute_image" "debian_image" {
family = "debian-9"
project = "debian-cloud"
}

resource "google_compute_region_instance_group_manager" "rigm" {
region = "us-central1"
name = "%s"
version {
instance_template = google_compute_instance_template.instance_template.self_link
name = "primary"
}
base_instance_name = "internal-glb"
target_size = 1
}

resource "google_compute_instance_template" "instance_template" {
name = "%s-template"
machine_type = "e2-medium"

network_interface {
network = "default"
}

disk {
source_image = data.google_compute_image.debian_image.self_link
auto_delete = true
boot = true
}
}

resource "google_compute_region_health_check" "default" {
name = "%s"
region = "us-central1"

http_health_check {
port_specification = "USE_SERVING_PORT"
}
}
`, serviceName, igmName, igmName, hcName)
}

func testAccComputeRegionBackendService_internalManagedInvalidMultiBackends(serviceName, igmName, hcName string) string {
return fmt.Sprintf(`
resource "google_compute_region_backend_service" "default" {
name = "%s"
load_balancing_scheme = "INTERNAL_MANAGED"

backend {
group = google_compute_region_instance_group_manager.rigm1.instance_group
balancing_mode = "UTILIZATION"
capacity_scaler = 0.0
}

backend {
group = google_compute_region_instance_group_manager.rigm2.instance_group
balancing_mode = "UTILIZATION"
capacity_scaler = 0.0
}

region = "us-central1"
port_name = "http"
protocol = "HTTP"
timeout_sec = 10

health_checks = [google_compute_region_health_check.default.self_link]
}

data "google_compute_image" "debian_image" {
family = "debian-9"
project = "debian-cloud"
}

resource "google_compute_region_instance_group_manager" "rigm1" {
name = "%s-1"
region = "us-central1"
version {
instance_template = google_compute_instance_template.instance_template.self_link
name = "primary"
}
base_instance_name = "internal-glb"
target_size = 1
}

resource "google_compute_region_instance_group_manager" "rigm2" {
name = "%s-2"
region = "us-central1"
version {
instance_template = google_compute_instance_template.instance_template.self_link
name = "primary"
}
base_instance_name = "internal-glb"
target_size = 1
}

resource "google_compute_instance_template" "instance_template" {
name = "%s-template"
machine_type = "e2-medium"

network_interface {
network = "default"
}

disk {
source_image = data.google_compute_image.debian_image.self_link
auto_delete = true
boot = true
}
}

resource "google_compute_region_health_check" "default" {
name = "%s"
region = "us-central1"

http_health_check {
port_specification = "USE_SERVING_PORT"
}
}
`, serviceName, igmName, igmName, igmName, hcName)
}

func testAccComputeRegionBackendService_internalManagedMultipleBackends(serviceName, igmName, hcName string) string {
return fmt.Sprintf(`
resource "google_compute_region_backend_service" "default" {
Expand Down