Skip to content

Commit 9a0dfe3

Browse files
tommyreddadBBBmau
tommyreddad
authored and
BBBmau
committed
eventarc: use tf-bootstrap prefix for bootstrapped resource names (GoogleCloudPlatform#14139)
1 parent d0edccc commit 9a0dfe3

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

‎mmv1/products/eventarc/Pipeline.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ examples:
4545
test_env_vars:
4646
project_id: 'PROJECT_NAME'
4747
test_vars_overrides:
48-
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-pipeline-network")))'
48+
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))'
4949
- name: eventarc_pipeline_with_http_destination
5050
primary_resource_id: primary
5151
vars:
@@ -54,7 +54,7 @@ examples:
5454
test_env_vars:
5555
project_id: 'PROJECT_NAME'
5656
test_vars_overrides:
57-
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-pipeline-network")))'
57+
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))'
5858
- name: eventarc_pipeline_with_workflow_destination
5959
primary_resource_id: primary
6060
vars:
@@ -64,7 +64,7 @@ examples:
6464
test_env_vars:
6565
project_id: 'PROJECT_NAME'
6666
test_vars_overrides:
67-
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-pipeline-network")))'
67+
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))'
6868
- name: eventarc_pipeline_with_oidc_and_json_format
6969
primary_resource_id: primary
7070
vars:
@@ -74,7 +74,7 @@ examples:
7474
project_id: 'PROJECT_NAME'
7575
service_account: 'SERVICE_ACCT'
7676
test_vars_overrides:
77-
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-pipeline-network")))'
77+
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))'
7878
- name: eventarc_pipeline_with_oauth_and_protobuf_format
7979
primary_resource_id: primary
8080
vars:
@@ -84,7 +84,7 @@ examples:
8484
project_id: 'PROJECT_NAME'
8585
service_account: 'SERVICE_ACCT'
8686
test_vars_overrides:
87-
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-pipeline-network")))'
87+
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))'
8888
- name: eventarc_pipeline_with_cmek_and_avro_format
8989
primary_resource_id: primary
9090
bootstrap_iam:
@@ -97,7 +97,7 @@ examples:
9797
test_env_vars:
9898
project_id: 'PROJECT_NAME'
9999
test_vars_overrides:
100-
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-pipeline-network")))'
100+
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network")))'
101101
'key_name': 'acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-eventarc-pipeline-key").CryptoKey.Name'
102102
parameters:
103103
- name: location

‎mmv1/products/eventarc/Trigger.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ examples:
5050
trigger_name: some-trigger
5151
network_attachment_name: network-attachment
5252
test_vars_overrides:
53-
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-trigger-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-trigger-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-trigger-network")))'
53+
'network_attachment_name': 'acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-trigger-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-trigger-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-trigger-network")))'
5454
test_env_vars:
5555
project_id: 'PROJECT_NAME'
5656
service_account: 'SERVICE_ACCT'

‎mmv1/third_party/terraform/services/eventarc/resource_eventarc_message_bus_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ func testAccEventarcMessageBus_pipeline(t *testing.T) {
416416
"project_id": envvar.GetTestProjectFromEnv(),
417417
"region": envvar.GetTestRegionFromEnv(),
418418
"random_suffix": acctest.RandString(t, 10),
419-
"network_attachment_name": acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-messagebus-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-messagebus-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-messagebus-network"))),
419+
"network_attachment_name": acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-messagebus-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-messagebus-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-messagebus-network"))),
420420
}
421421

422422
acctest.VcrTest(t, resource.TestCase{
@@ -464,7 +464,7 @@ func testAccEventarcMessageBus_enrollment(t *testing.T) {
464464
"project_id": envvar.GetTestProjectFromEnv(),
465465
"region": envvar.GetTestRegionFromEnv(),
466466
"random_suffix": acctest.RandString(t, 10),
467-
"network_attachment_name": acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-messagebus-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-messagebus-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-messagebus-network"))),
467+
"network_attachment_name": acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-messagebus-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-messagebus-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-messagebus-network"))),
468468
}
469469

470470
acctest.VcrTest(t, resource.TestCase{
@@ -531,7 +531,7 @@ func testAccEventarcMessageBus_updateEnrollment(t *testing.T) {
531531
"project_id": envvar.GetTestProjectFromEnv(),
532532
"region": envvar.GetTestRegionFromEnv(),
533533
"random_suffix": acctest.RandString(t, 10),
534-
"network_attachment_name": acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-messagebus-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-messagebus-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-messagebus-network"))),
534+
"network_attachment_name": acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-messagebus-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-messagebus-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-messagebus-network"))),
535535
}
536536

537537
acctest.VcrTest(t, resource.TestCase{

‎mmv1/third_party/terraform/services/eventarc/resource_eventarc_pipeline_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccEventarcPipeline_update(t *testing.T) {
1818
"service_account": envvar.GetTestServiceAccountFromEnv(t),
1919
"key_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-eventarc-pipeline-key").CryptoKey.Name,
2020
"key2_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-eventarc-pipeline-key2").CryptoKey.Name,
21-
"network_attachment_name": acctest.BootstrapNetworkAttachment(t, "tf-test-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-test-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-test-eventarc-pipeline-network"))),
21+
"network_attachment_name": acctest.BootstrapNetworkAttachment(t, "tf-bootstrap-eventarc-pipeline-na", acctest.BootstrapSubnet(t, "tf-bootstrap-eventarc-pipeline-subnet", acctest.BootstrapSharedTestNetwork(t, "tf-bootstrap-eventarc-pipeline-network"))),
2222
"random_suffix": acctest.RandString(t, 10),
2323
}
2424
acctest.BootstrapIamMembers(t, []acctest.IamMember{

0 commit comments

Comments
 (0)