Skip to content

Commit 77aa276

Browse files
modular-magicianmodular-magician
authored
Promote PSC global access to GA (#8013) (#5693)
* Promote PSC global access to GA Signed-off-by: Modular Magician <[email protected]>
1 parent 1729a2d commit 77aa276

File tree

4 files changed

+6
-36
lines changed

4 files changed

+6
-36
lines changed

‎.changelog/8013.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:note
2+
compute: promoted `allowPscGlobalAccess` field to GA for resource `google_compute_forwarding_rule`
3+
```

‎google-beta/resource_compute_forwarding_rule_generated_test.go‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ func TestAccComputeForwardingRule_forwardingRuleVpcPscExample(t *testing.T) {
11951195

11961196
VcrTest(t, resource.TestCase{
11971197
PreCheck: func() { acctest.AccTestPreCheck(t) },
1198-
ProtoV5ProviderFactories: ProtoV5ProviderBetaFactories(t),
1198+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
11991199
CheckDestroy: testAccCheckComputeForwardingRuleDestroyProducer(t),
12001200
Steps: []resource.TestStep{
12011201
{
@@ -1215,7 +1215,6 @@ func testAccComputeForwardingRule_forwardingRuleVpcPscExample(context map[string
12151215
return Nprintf(`
12161216
// Forwarding rule for VPC private service connect
12171217
resource "google_compute_forwarding_rule" "default" {
1218-
provider = google-beta
12191218
name = "tf-test-psc-endpoint%{random_suffix}"
12201219
region = "us-central1"
12211220
load_balancing_scheme = ""
@@ -1228,21 +1227,18 @@ resource "google_compute_forwarding_rule" "default" {
12281227
// Consumer service endpoint
12291228
12301229
resource "google_compute_network" "consumer_net" {
1231-
provider = google-beta
12321230
name = "tf-test-consumer-net%{random_suffix}"
12331231
auto_create_subnetworks = false
12341232
}
12351233
12361234
resource "google_compute_subnetwork" "consumer_subnet" {
1237-
provider = google-beta
12381235
name = "tf-test-consumer-net%{random_suffix}"
12391236
ip_cidr_range = "10.0.0.0/16"
12401237
region = "us-central1"
12411238
network = google_compute_network.consumer_net.id
12421239
}
12431240
12441241
resource "google_compute_address" "consumer_address" {
1245-
provider = google-beta
12461242
name = "tf-test-website-ip%{random_suffix}-1"
12471243
region = "us-central1"
12481244
subnetwork = google_compute_subnetwork.consumer_subnet.id
@@ -1253,21 +1249,18 @@ resource "google_compute_address" "consumer_address" {
12531249
// Producer service attachment
12541250
12551251
resource "google_compute_network" "producer_net" {
1256-
provider = google-beta
12571252
name = "tf-test-producer-net%{random_suffix}"
12581253
auto_create_subnetworks = false
12591254
}
12601255
12611256
resource "google_compute_subnetwork" "producer_subnet" {
1262-
provider = google-beta
12631257
name = "tf-test-producer-net%{random_suffix}"
12641258
ip_cidr_range = "10.0.0.0/16"
12651259
region = "us-central1"
12661260
network = google_compute_network.producer_net.id
12671261
}
12681262
12691263
resource "google_compute_subnetwork" "psc_producer_subnet" {
1270-
provider = google-beta
12711264
name = "tf-test-producer-psc-net%{random_suffix}"
12721265
ip_cidr_range = "10.1.0.0/16"
12731266
region = "us-central1"
@@ -1277,7 +1270,6 @@ resource "google_compute_subnetwork" "psc_producer_subnet" {
12771270
}
12781271
12791272
resource "google_compute_service_attachment" "producer_service_attachment" {
1280-
provider = google-beta
12811273
name = "tf-test-producer-service%{random_suffix}"
12821274
region = "us-central1"
12831275
description = "A service attachment configured with Terraform"
@@ -1289,7 +1281,6 @@ resource "google_compute_service_attachment" "producer_service_attachment" {
12891281
}
12901282
12911283
resource "google_compute_forwarding_rule" "producer_target_service" {
1292-
provider = google-beta
12931284
name = "tf-test-producer-forwarding-rule%{random_suffix}"
12941285
region = "us-central1"
12951286
@@ -1301,15 +1292,13 @@ resource "google_compute_forwarding_rule" "producer_target_service" {
13011292
}
13021293
13031294
resource "google_compute_region_backend_service" "producer_service_backend" {
1304-
provider = google-beta
13051295
name = "tf-test-producer-service-backend%{random_suffix}"
13061296
region = "us-central1"
13071297
13081298
health_checks = [google_compute_health_check.producer_service_health_check.id]
13091299
}
13101300
13111301
resource "google_compute_health_check" "producer_service_health_check" {
1312-
provider = google-beta
13131302
name = "tf-test-producer-service-health-check%{random_suffix}"
13141303
13151304
check_interval_sec = 1

‎google-beta/resource_compute_forwarding_rule_test.go‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func TestAccComputeForwardingRule_forwardingRuleVpcPscExampleUpdate(t *testing.T
167167

168168
VcrTest(t, resource.TestCase{
169169
PreCheck: func() { AccTestPreCheck(t) },
170-
ProtoV5ProviderFactories: ProtoV5ProviderBetaFactories(t),
170+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
171171
CheckDestroy: testAccCheckComputeForwardingRuleDestroyProducer(t),
172172
Steps: []resource.TestStep{
173173
{
@@ -540,7 +540,6 @@ func testAccComputeForwardingRule_forwardingRuleVpcPscExampleUpdate(context map[
540540
return Nprintf(`
541541
// Forwarding rule for VPC private service connect
542542
resource "google_compute_forwarding_rule" "default" {
543-
provider = google-beta
544543
name = "tf-test-psc-endpoint%{random_suffix}"
545544
region = "us-central1"
546545
load_balancing_scheme = ""
@@ -553,21 +552,18 @@ resource "google_compute_forwarding_rule" "default" {
553552
// Consumer service endpoint
554553
555554
resource "google_compute_network" "consumer_net" {
556-
provider = google-beta
557555
name = "tf-test-consumer-net%{random_suffix}"
558556
auto_create_subnetworks = false
559557
}
560558
561559
resource "google_compute_subnetwork" "consumer_subnet" {
562-
provider = google-beta
563560
name = "tf-test-consumer-net%{random_suffix}"
564561
ip_cidr_range = "10.0.0.0/16"
565562
region = "us-central1"
566563
network = google_compute_network.consumer_net.id
567564
}
568565
569566
resource "google_compute_address" "consumer_address" {
570-
provider = google-beta
571567
name = "tf-test-website-ip%{random_suffix}-1"
572568
region = "us-central1"
573569
subnetwork = google_compute_subnetwork.consumer_subnet.id
@@ -578,21 +574,18 @@ resource "google_compute_address" "consumer_address" {
578574
// Producer service attachment
579575
580576
resource "google_compute_network" "producer_net" {
581-
provider = google-beta
582577
name = "tf-test-producer-net%{random_suffix}"
583578
auto_create_subnetworks = false
584579
}
585580
586581
resource "google_compute_subnetwork" "producer_subnet" {
587-
provider = google-beta
588582
name = "tf-test-producer-net%{random_suffix}"
589583
ip_cidr_range = "10.0.0.0/16"
590584
region = "us-central1"
591585
network = google_compute_network.producer_net.id
592586
}
593587
594588
resource "google_compute_subnetwork" "psc_producer_subnet" {
595-
provider = google-beta
596589
name = "tf-test-producer-psc-net%{random_suffix}"
597590
ip_cidr_range = "10.1.0.0/16"
598591
region = "us-central1"
@@ -602,7 +595,6 @@ resource "google_compute_subnetwork" "psc_producer_subnet" {
602595
}
603596
604597
resource "google_compute_service_attachment" "producer_service_attachment" {
605-
provider = google-beta
606598
name = "tf-test-producer-service%{random_suffix}"
607599
region = "us-central1"
608600
description = "A service attachment configured with Terraform"
@@ -614,7 +606,6 @@ resource "google_compute_service_attachment" "producer_service_attachment" {
614606
}
615607
616608
resource "google_compute_forwarding_rule" "producer_target_service" {
617-
provider = google-beta
618609
name = "tf-test-producer-forwarding-rule%{random_suffix}"
619610
region = "us-central1"
620611
@@ -626,15 +617,13 @@ resource "google_compute_forwarding_rule" "producer_target_service" {
626617
}
627618
628619
resource "google_compute_region_backend_service" "producer_service_backend" {
629-
provider = google-beta
630620
name = "tf-test-producer-service-backend%{random_suffix}"
631621
region = "us-central1"
632622
633623
health_checks = [google_compute_health_check.producer_service_health_check.id]
634624
}
635625
636626
resource "google_compute_health_check" "producer_service_health_check" {
637-
provider = google-beta
638627
name = "tf-test-producer-service-health-check%{random_suffix}"
639628
640629
check_interval_sec = 1

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,6 @@ resource "google_compute_subnetwork" "proxy" {
10171017
```hcl
10181018
// Forwarding rule for VPC private service connect
10191019
resource "google_compute_forwarding_rule" "default" {
1020-
provider = google-beta
10211020
name = "psc-endpoint"
10221021
region = "us-central1"
10231022
load_balancing_scheme = ""
@@ -1030,21 +1029,18 @@ resource "google_compute_forwarding_rule" "default" {
10301029
// Consumer service endpoint
10311030
10321031
resource "google_compute_network" "consumer_net" {
1033-
provider = google-beta
10341032
name = "consumer-net"
10351033
auto_create_subnetworks = false
10361034
}
10371035
10381036
resource "google_compute_subnetwork" "consumer_subnet" {
1039-
provider = google-beta
10401037
name = "consumer-net"
10411038
ip_cidr_range = "10.0.0.0/16"
10421039
region = "us-central1"
10431040
network = google_compute_network.consumer_net.id
10441041
}
10451042
10461043
resource "google_compute_address" "consumer_address" {
1047-
provider = google-beta
10481044
name = "website-ip-1"
10491045
region = "us-central1"
10501046
subnetwork = google_compute_subnetwork.consumer_subnet.id
@@ -1055,21 +1051,18 @@ resource "google_compute_address" "consumer_address" {
10551051
// Producer service attachment
10561052
10571053
resource "google_compute_network" "producer_net" {
1058-
provider = google-beta
10591054
name = "producer-net"
10601055
auto_create_subnetworks = false
10611056
}
10621057
10631058
resource "google_compute_subnetwork" "producer_subnet" {
1064-
provider = google-beta
10651059
name = "producer-net"
10661060
ip_cidr_range = "10.0.0.0/16"
10671061
region = "us-central1"
10681062
network = google_compute_network.producer_net.id
10691063
}
10701064
10711065
resource "google_compute_subnetwork" "psc_producer_subnet" {
1072-
provider = google-beta
10731066
name = "producer-psc-net"
10741067
ip_cidr_range = "10.1.0.0/16"
10751068
region = "us-central1"
@@ -1079,7 +1072,6 @@ resource "google_compute_subnetwork" "psc_producer_subnet" {
10791072
}
10801073
10811074
resource "google_compute_service_attachment" "producer_service_attachment" {
1082-
provider = google-beta
10831075
name = "producer-service"
10841076
region = "us-central1"
10851077
description = "A service attachment configured with Terraform"
@@ -1091,7 +1083,6 @@ resource "google_compute_service_attachment" "producer_service_attachment" {
10911083
}
10921084
10931085
resource "google_compute_forwarding_rule" "producer_target_service" {
1094-
provider = google-beta
10951086
name = "producer-forwarding-rule"
10961087
region = "us-central1"
10971088
@@ -1103,15 +1094,13 @@ resource "google_compute_forwarding_rule" "producer_target_service" {
11031094
}
11041095
11051096
resource "google_compute_region_backend_service" "producer_service_backend" {
1106-
provider = google-beta
11071097
name = "producer-service-backend"
11081098
region = "us-central1"
11091099
11101100
health_checks = [google_compute_health_check.producer_service_health_check.id]
11111101
}
11121102
11131103
resource "google_compute_health_check" "producer_service_health_check" {
1114-
provider = google-beta
11151104
name = "producer-service-health-check"
11161105
11171106
check_interval_sec = 1
@@ -1398,7 +1387,7 @@ The following arguments are supported:
13981387
If not empty, this Forwarding Rule will only forward the traffic when the source IP address matches one of the IP addresses or CIDR ranges set here. Note that a Forwarding Rule can only have up to 64 source IP ranges, and this field can only be used with a regional Forwarding Rule whose scheme is EXTERNAL. Each sourceIpRange entry should be either an IP address (for example, 1.2.3.4) or a CIDR range (for example, 1.2.3.0/24).
13991388

14001389
* `allow_psc_global_access` -
1401-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
1390+
(Optional)
14021391
This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region.
14031392

14041393
* `region` -

0 commit comments

Comments
 (0)