Skip to content

Commit 7099244

Browse files
fix test in PR 5852 (also test VCR) (#5910) (#4192)
Signed-off-by: Modular Magician <[email protected]>
1 parent 10436cc commit 7099244

File tree

3 files changed

+67
-48
lines changed

3 files changed

+67
-48
lines changed

.changelog/5910.txt

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

google-beta/resource_cloud_run_service_generated_test.go

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -487,16 +487,19 @@ func testAccCloudRunService_eventarcBasicTfExample(context map[string]interface{
487487
return Nprintf(`
488488
# Used to retrieve project_number later
489489
data "google_project" "project" {
490+
provider = google-beta
490491
}
491492
492493
# Enable Cloud Run API
493494
resource "google_project_service" "run" {
495+
provider = google-beta
494496
service = "run.googleapis.com"
495497
disable_on_destroy = false
496498
}
497499
498500
# Enable Eventarc API
499501
resource "google_project_service" "eventarc" {
502+
provider = google-beta
500503
service = "eventarc.googleapis.com"
501504
disable_on_destroy = false
502505
}
@@ -505,6 +508,7 @@ resource "google_project_service" "eventarc" {
505508
506509
# Deploy Cloud Run service
507510
resource "google_cloud_run_service" "default" {
511+
provider = google-beta
508512
name = "tf-test-cloudrun-hello-tf%{random_suffix}"
509513
location = "us-east1"
510514
@@ -526,6 +530,7 @@ resource "google_cloud_run_service" "default" {
526530
527531
# Make Cloud Run service publicly accessible
528532
resource "google_cloud_run_service_iam_member" "allUsers" {
533+
provider = google-beta
529534
service = google_cloud_run_service.default.name
530535
location = google_cloud_run_service.default.location
531536
role = "roles/run.invoker"
@@ -537,25 +542,27 @@ resource "google_cloud_run_service_iam_member" "allUsers" {
537542
538543
# Create a Pub/Sub trigger
539544
resource "google_eventarc_trigger" "tf-test-trigger-pubsub-tf%{random_suffix}" {
540-
name = "tf-test-trigger-pubsub-tf%{random_suffix}"
541-
location = google_cloud_run_service.default.location
542-
matching_criteria {
543-
attribute = "type"
544-
value = "google.cloud.pubsub.topic.v1.messagePublished"
545-
}
546-
destination {
547-
cloud_run_service {
548-
service = google_cloud_run_service.default.name
549-
region = google_cloud_run_service.default.location
545+
provider = google-beta
546+
name = "tf-test-trigger-pubsub-tf%{random_suffix}"
547+
location = google_cloud_run_service.default.location
548+
matching_criteria {
549+
attribute = "type"
550+
value = "google.cloud.pubsub.topic.v1.messagePublished"
551+
}
552+
destination {
553+
cloud_run_service {
554+
service = google_cloud_run_service.default.name
555+
region = google_cloud_run_service.default.location
556+
}
550557
}
551-
}
552558
553-
depends_on = [google_project_service.eventarc]
559+
depends_on = [google_project_service.eventarc]
554560
}
555561
556562
557563
# Give default Compute service account eventarc.eventReceiver role
558564
resource "google_project_iam_binding" "project" {
565+
provider = google-beta
559566
project = data.google_project.project.id
560567
role = "roles/eventarc.eventReceiver"
561568
@@ -566,6 +573,7 @@ resource "google_project_iam_binding" "project" {
566573
567574
# Create an AuditLog for Cloud Storage trigger
568575
resource "google_eventarc_trigger" "tf-test-trigger-auditlog-tf%{random_suffix}" {
576+
provider = google-beta
569577
name = "tf-test-trigger-auditlog-tf%{random_suffix}"
570578
location = google_cloud_run_service.default.location
571579
project = data.google_project.project.id
@@ -577,19 +585,19 @@ resource "google_eventarc_trigger" "tf-test-trigger-auditlog-tf%{random_suffix}"
577585
attribute = "serviceName"
578586
value = "storage.googleapis.com"
579587
}
580-
matching_criteria {
581-
attribute = "methodName"
582-
value = "storage.objects.create"
583-
}
584-
destination {
585-
cloud_run_service {
586-
service = google_cloud_run_service.default.name
587-
region = google_cloud_run_service.default.location
588-
}
589-
}
590-
service_account = "${data.google_project.project.number}[email protected]"
588+
matching_criteria {
589+
attribute = "methodName"
590+
value = "storage.objects.create"
591+
}
592+
destination {
593+
cloud_run_service {
594+
service = google_cloud_run_service.default.name
595+
region = google_cloud_run_service.default.location
596+
}
597+
}
598+
service_account = "${data.google_project.project.number}[email protected]"
591599
592-
depends_on = [google_project_service.eventarc]
600+
depends_on = [google_project_service.eventarc]
593601
}
594602
595603
`, context)

website/docs/r/cloud_run_service.html.markdown

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -417,16 +417,19 @@ resource "google_cloud_run_service" "default" {
417417
```hcl
418418
# Used to retrieve project_number later
419419
data "google_project" "project" {
420+
provider = google-beta
420421
}
421422
422423
# Enable Cloud Run API
423424
resource "google_project_service" "run" {
425+
provider = google-beta
424426
service = "run.googleapis.com"
425427
disable_on_destroy = false
426428
}
427429
428430
# Enable Eventarc API
429431
resource "google_project_service" "eventarc" {
432+
provider = google-beta
430433
service = "eventarc.googleapis.com"
431434
disable_on_destroy = false
432435
}
@@ -435,6 +438,7 @@ resource "google_project_service" "eventarc" {
435438
436439
# Deploy Cloud Run service
437440
resource "google_cloud_run_service" "default" {
441+
provider = google-beta
438442
name = "cloudrun-hello-tf"
439443
location = "us-east1"
440444
@@ -456,6 +460,7 @@ resource "google_cloud_run_service" "default" {
456460
457461
# Make Cloud Run service publicly accessible
458462
resource "google_cloud_run_service_iam_member" "allUsers" {
463+
provider = google-beta
459464
service = google_cloud_run_service.default.name
460465
location = google_cloud_run_service.default.location
461466
role = "roles/run.invoker"
@@ -467,25 +472,27 @@ resource "google_cloud_run_service_iam_member" "allUsers" {
467472
468473
# Create a Pub/Sub trigger
469474
resource "google_eventarc_trigger" "trigger-pubsub-tf" {
470-
name = "trigger-pubsub-tf"
471-
location = google_cloud_run_service.default.location
472-
matching_criteria {
473-
attribute = "type"
474-
value = "google.cloud.pubsub.topic.v1.messagePublished"
475-
}
476-
destination {
477-
cloud_run_service {
478-
service = google_cloud_run_service.default.name
479-
region = google_cloud_run_service.default.location
475+
provider = google-beta
476+
name = "trigger-pubsub-tf"
477+
location = google_cloud_run_service.default.location
478+
matching_criteria {
479+
attribute = "type"
480+
value = "google.cloud.pubsub.topic.v1.messagePublished"
481+
}
482+
destination {
483+
cloud_run_service {
484+
service = google_cloud_run_service.default.name
485+
region = google_cloud_run_service.default.location
486+
}
480487
}
481-
}
482488
483-
depends_on = [google_project_service.eventarc]
489+
depends_on = [google_project_service.eventarc]
484490
}
485491
486492
487493
# Give default Compute service account eventarc.eventReceiver role
488494
resource "google_project_iam_binding" "project" {
495+
provider = google-beta
489496
project = data.google_project.project.id
490497
role = "roles/eventarc.eventReceiver"
491498
@@ -496,6 +503,7 @@ resource "google_project_iam_binding" "project" {
496503
497504
# Create an AuditLog for Cloud Storage trigger
498505
resource "google_eventarc_trigger" "trigger-auditlog-tf" {
506+
provider = google-beta
499507
name = "trigger-auditlog-tf"
500508
location = google_cloud_run_service.default.location
501509
project = data.google_project.project.id
@@ -507,19 +515,19 @@ resource "google_eventarc_trigger" "trigger-auditlog-tf" {
507515
attribute = "serviceName"
508516
value = "storage.googleapis.com"
509517
}
510-
matching_criteria {
511-
attribute = "methodName"
512-
value = "storage.objects.create"
513-
}
514-
destination {
515-
cloud_run_service {
516-
service = google_cloud_run_service.default.name
517-
region = google_cloud_run_service.default.location
518-
}
519-
}
520-
service_account = "${data.google_project.project.number}[email protected]"
518+
matching_criteria {
519+
attribute = "methodName"
520+
value = "storage.objects.create"
521+
}
522+
destination {
523+
cloud_run_service {
524+
service = google_cloud_run_service.default.name
525+
region = google_cloud_run_service.default.location
526+
}
527+
}
528+
service_account = "${data.google_project.project.number}[email protected]"
521529
522-
depends_on = [google_project_service.eventarc]
530+
depends_on = [google_project_service.eventarc]
523531
}
524532
525533
```

0 commit comments

Comments
 (0)