Skip to content

Commit b15d569

Browse files
modular-magicianmodular-magician
authored
Make Backend Service Custom Metrics tests available in ga (#13274) (#9550)
[upstream:38449e2c5533dd6bce0dbf9b0794b115cc57309f] Signed-off-by: Modular Magician <[email protected]>
1 parent a551419 commit b15d569

File tree

6 files changed

+5
-29
lines changed

6 files changed

+5
-29
lines changed

‎.changelog/13274.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
```release-note:none
2+
```

‎google-beta/services/compute/resource_compute_backend_service_generated_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ func TestAccComputeBackendService_backendServiceCustomMetricsExample(t *testing.
671671

672672
acctest.VcrTest(t, resource.TestCase{
673673
PreCheck: func() { acctest.AccTestPreCheck(t) },
674-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
674+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
675675
CheckDestroy: testAccCheckComputeBackendServiceDestroyProducer(t),
676676
Steps: []resource.TestStep{
677677
{
@@ -690,13 +690,11 @@ func TestAccComputeBackendService_backendServiceCustomMetricsExample(t *testing.
690690
func testAccComputeBackendService_backendServiceCustomMetricsExample(context map[string]interface{}) string {
691691
return acctest.Nprintf(`
692692
resource "google_compute_network" "default" {
693-
provider = google-beta
694693
name = "network%{random_suffix}"
695694
}
696695
697696
// Zonal NEG with GCE_VM_IP_PORT
698697
resource "google_compute_network_endpoint_group" "default" {
699-
provider = google-beta
700698
name = "tf-test-network-endpoint%{random_suffix}"
701699
network = google_compute_network.default.id
702700
default_port = "90"
@@ -705,7 +703,6 @@ resource "google_compute_network_endpoint_group" "default" {
705703
}
706704
707705
resource "google_compute_backend_service" "default" {
708-
provider = google-beta
709706
name = "tf-test-backend-service%{random_suffix}"
710707
health_checks = [google_compute_health_check.default.id]
711708
@@ -734,7 +731,6 @@ resource "google_compute_backend_service" "default" {
734731
}
735732
736733
resource "google_compute_health_check" "default" {
737-
provider = google-beta
738734
name = "tf-test-health-check%{random_suffix}"
739735
timeout_sec = 1
740736
check_interval_sec = 1

‎google-beta/services/compute/resource_compute_backend_service_test.go‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,7 +2282,7 @@ func TestAccComputeBackendService_backendServiceCustomMetrics_update(t *testing.
22822282

22832283
acctest.VcrTest(t, resource.TestCase{
22842284
PreCheck: func() { acctest.AccTestPreCheck(t) },
2285-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
2285+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
22862286
CheckDestroy: testAccCheckComputeBackendServiceDestroyProducer(t),
22872287
Steps: []resource.TestStep{
22882288
{
@@ -2310,13 +2310,11 @@ func TestAccComputeBackendService_backendServiceCustomMetrics_update(t *testing.
23102310
func testAccComputeBackendService_backendServiceCustomMetrics_full(context map[string]interface{}) string {
23112311
return acctest.Nprintf(`
23122312
resource "google_compute_network" "default" {
2313-
provider = google-beta
23142313
name = "network%{random_suffix}"
23152314
}
23162315
23172316
// Zonal NEG with GCE_VM_IP_PORT
23182317
resource "google_compute_network_endpoint_group" "default" {
2319-
provider = google-beta
23202318
name = "tf-test-network-endpoint%{random_suffix}"
23212319
network = google_compute_network.default.id
23222320
default_port = "90"
@@ -2325,7 +2323,6 @@ resource "google_compute_network_endpoint_group" "default" {
23252323
}
23262324
23272325
resource "google_compute_backend_service" "default" {
2328-
provider = google-beta
23292326
name = "tf-test-backend-service%{random_suffix}"
23302327
health_checks = [google_compute_health_check.default.id]
23312328
@@ -2355,7 +2352,6 @@ resource "google_compute_backend_service" "default" {
23552352
}
23562353
23572354
resource "google_compute_health_check" "default" {
2358-
provider = google-beta
23592355
name = "tf-test-health-check%{random_suffix}"
23602356
timeout_sec = 1
23612357
check_interval_sec = 1
@@ -2370,13 +2366,11 @@ resource "google_compute_health_check" "default" {
23702366
func testAccComputeBackendService_backendServiceCustomMetrics_update(context map[string]interface{}) string {
23712367
return acctest.Nprintf(`
23722368
resource "google_compute_network" "default" {
2373-
provider = google-beta
23742369
name = "network%{random_suffix}"
23752370
}
23762371
23772372
// Zonal NEG with GCE_VM_IP_PORT
23782373
resource "google_compute_network_endpoint_group" "default" {
2379-
provider = google-beta
23802374
name = "tf-test-network-endpoint%{random_suffix}"
23812375
network = google_compute_network.default.id
23822376
default_port = "90"
@@ -2385,7 +2379,6 @@ resource "google_compute_network_endpoint_group" "default" {
23852379
}
23862380
23872381
resource "google_compute_backend_service" "default" {
2388-
provider = google-beta
23892382
name = "tf-test-backend-service%{random_suffix}"
23902383
health_checks = [google_compute_health_check.default.id]
23912384
@@ -2415,7 +2408,6 @@ resource "google_compute_backend_service" "default" {
24152408
}
24162409
24172410
resource "google_compute_health_check" "default" {
2418-
provider = google-beta
24192411
name = "tf-test-health-check%{random_suffix}"
24202412
timeout_sec = 1
24212413
check_interval_sec = 1

‎google-beta/services/compute/resource_compute_region_backend_service_generated_test.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ func TestAccComputeRegionBackendService_regionBackendServiceIlbCustomMetricsExam
651651

652652
acctest.VcrTest(t, resource.TestCase{
653653
PreCheck: func() { acctest.AccTestPreCheck(t) },
654-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
654+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
655655
CheckDestroy: testAccCheckComputeRegionBackendServiceDestroyProducer(t),
656656
Steps: []resource.TestStep{
657657
{
@@ -670,13 +670,11 @@ func TestAccComputeRegionBackendService_regionBackendServiceIlbCustomMetricsExam
670670
func testAccComputeRegionBackendService_regionBackendServiceIlbCustomMetricsExample(context map[string]interface{}) string {
671671
return acctest.Nprintf(`
672672
resource "google_compute_network" "default" {
673-
provider = google-beta
674673
name = "network%{random_suffix}"
675674
}
676675
677676
// Zonal NEG with GCE_VM_IP_PORT
678677
resource "google_compute_network_endpoint_group" "default" {
679-
provider = google-beta
680678
name = "tf-test-network-endpoint%{random_suffix}"
681679
network = google_compute_network.default.id
682680
default_port = "90"
@@ -685,8 +683,6 @@ resource "google_compute_network_endpoint_group" "default" {
685683
}
686684
687685
resource "google_compute_region_backend_service" "default" {
688-
provider = google-beta
689-
690686
region = "us-central1"
691687
name = "tf-test-region-service%{random_suffix}"
692688
health_checks = [google_compute_health_check.health_check.id]
@@ -714,7 +710,6 @@ resource "google_compute_region_backend_service" "default" {
714710
}
715711
716712
resource "google_compute_health_check" "health_check" {
717-
provider = google-beta
718713
name = "tf-test-rbs-health-check%{random_suffix}"
719714
http_health_check {
720715
port = 80

‎website/docs/r/compute_backend_service.html.markdown‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,13 +422,11 @@ resource "google_compute_backend_service" "default" {
422422

423423
```hcl
424424
resource "google_compute_network" "default" {
425-
provider = google-beta
426425
name = "network"
427426
}
428427
429428
// Zonal NEG with GCE_VM_IP_PORT
430429
resource "google_compute_network_endpoint_group" "default" {
431-
provider = google-beta
432430
name = "network-endpoint"
433431
network = google_compute_network.default.id
434432
default_port = "90"
@@ -437,7 +435,6 @@ resource "google_compute_network_endpoint_group" "default" {
437435
}
438436
439437
resource "google_compute_backend_service" "default" {
440-
provider = google-beta
441438
name = "backend-service"
442439
health_checks = [google_compute_health_check.default.id]
443440
@@ -466,7 +463,6 @@ resource "google_compute_backend_service" "default" {
466463
}
467464
468465
resource "google_compute_health_check" "default" {
469-
provider = google-beta
470466
name = "health-check"
471467
timeout_sec = 1
472468
check_interval_sec = 1

‎website/docs/r/compute_region_backend_service.html.markdown‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,11 @@ resource "google_compute_region_health_check" "health_check" {
438438

439439
```hcl
440440
resource "google_compute_network" "default" {
441-
provider = google-beta
442441
name = "network"
443442
}
444443
445444
// Zonal NEG with GCE_VM_IP_PORT
446445
resource "google_compute_network_endpoint_group" "default" {
447-
provider = google-beta
448446
name = "network-endpoint"
449447
network = google_compute_network.default.id
450448
default_port = "90"
@@ -453,8 +451,6 @@ resource "google_compute_network_endpoint_group" "default" {
453451
}
454452
455453
resource "google_compute_region_backend_service" "default" {
456-
provider = google-beta
457-
458454
region = "us-central1"
459455
name = "region-service"
460456
health_checks = [google_compute_health_check.health_check.id]
@@ -482,7 +478,6 @@ resource "google_compute_region_backend_service" "default" {
482478
}
483479
484480
resource "google_compute_health_check" "health_check" {
485-
provider = google-beta
486481
name = "rbs-health-check"
487482
http_health_check {
488483
port = 80

0 commit comments

Comments
 (0)