Skip to content

Commit aad88fe

Browse files
modular-magicianmodular-magician
authored
eventarc: use tf-bootstrap prefix for bootstrapped resource names (#14139) (#23088)
[upstream:809c84b83e0f0653a50c90a1854a2c3442a999c7] Signed-off-by: Modular Magician <[email protected]>
1 parent a217638 commit aad88fe

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

‎google/services/eventarc/resource_eventarc_message_bus_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ func testAccEventarcMessageBus_pipeline(t *testing.T) {
432432
"project_id": envvar.GetTestProjectFromEnv(),
433433
"region": envvar.GetTestRegionFromEnv(),
434434
"random_suffix": acctest.RandString(t, 10),
435-
"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"))),
435+
"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"))),
436436
}
437437

438438
acctest.VcrTest(t, resource.TestCase{
@@ -480,7 +480,7 @@ func testAccEventarcMessageBus_enrollment(t *testing.T) {
480480
"project_id": envvar.GetTestProjectFromEnv(),
481481
"region": envvar.GetTestRegionFromEnv(),
482482
"random_suffix": acctest.RandString(t, 10),
483-
"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"))),
483+
"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"))),
484484
}
485485

486486
acctest.VcrTest(t, resource.TestCase{
@@ -547,7 +547,7 @@ func testAccEventarcMessageBus_updateEnrollment(t *testing.T) {
547547
"project_id": envvar.GetTestProjectFromEnv(),
548548
"region": envvar.GetTestRegionFromEnv(),
549549
"random_suffix": acctest.RandString(t, 10),
550-
"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"))),
550+
"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"))),
551551
}
552552

553553
acctest.VcrTest(t, resource.TestCase{

‎google/services/eventarc/resource_eventarc_pipeline_generated_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestAccEventarcPipeline_eventarcPipelineWithTopicDestinationExample(t *test
3636

3737
context := map[string]interface{}{
3838
"project_id": envvar.GetTestProjectFromEnv(),
39-
"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"))),
39+
"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"))),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

@@ -89,7 +89,7 @@ func TestAccEventarcPipeline_eventarcPipelineWithHttpDestinationExample(t *testi
8989

9090
context := map[string]interface{}{
9191
"project_id": envvar.GetTestProjectFromEnv(),
92-
"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"))),
92+
"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"))),
9393
"random_suffix": acctest.RandString(t, 10),
9494
}
9595

@@ -133,7 +133,7 @@ func TestAccEventarcPipeline_eventarcPipelineWithWorkflowDestinationExample(t *t
133133

134134
context := map[string]interface{}{
135135
"project_id": envvar.GetTestProjectFromEnv(),
136-
"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"))),
136+
"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"))),
137137
"random_suffix": acctest.RandString(t, 10),
138138
}
139139

@@ -209,7 +209,7 @@ func TestAccEventarcPipeline_eventarcPipelineWithOidcAndJsonFormatExample(t *tes
209209
context := map[string]interface{}{
210210
"project_id": envvar.GetTestProjectFromEnv(),
211211
"service_account": envvar.GetTestServiceAccountFromEnv(t),
212-
"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"))),
212+
"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"))),
213213
"random_suffix": acctest.RandString(t, 10),
214214
}
215215

@@ -286,7 +286,7 @@ func TestAccEventarcPipeline_eventarcPipelineWithOauthAndProtobufFormatExample(t
286286
context := map[string]interface{}{
287287
"project_id": envvar.GetTestProjectFromEnv(),
288288
"service_account": envvar.GetTestServiceAccountFromEnv(t),
289-
"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"))),
289+
"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"))),
290290
"random_suffix": acctest.RandString(t, 10),
291291
}
292292

@@ -385,7 +385,7 @@ func TestAccEventarcPipeline_eventarcPipelineWithCmekAndAvroFormatExample(t *tes
385385
context := map[string]interface{}{
386386
"project_id": envvar.GetTestProjectFromEnv(),
387387
"key_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-eventarc-pipeline-key").CryptoKey.Name,
388-
"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"))),
388+
"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"))),
389389
"random_suffix": acctest.RandString(t, 10),
390390
}
391391

‎google/services/eventarc/resource_eventarc_pipeline_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestAccEventarcPipeline_update(t *testing.T) {
3434
"service_account": envvar.GetTestServiceAccountFromEnv(t),
3535
"key_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-eventarc-pipeline-key").CryptoKey.Name,
3636
"key2_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-eventarc-pipeline-key2").CryptoKey.Name,
37-
"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"))),
37+
"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"))),
3838
"random_suffix": acctest.RandString(t, 10),
3939
}
4040
acctest.BootstrapIamMembers(t, []acctest.IamMember{

‎google/services/eventarc/resource_eventarc_trigger_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func TestAccEventarcTrigger_eventarcTriggerWithHttpDestinationExample(t *testing
116116
context := map[string]interface{}{
117117
"project_id": envvar.GetTestProjectFromEnv(),
118118
"service_account": envvar.GetTestServiceAccountFromEnv(t),
119-
"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"))),
119+
"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"))),
120120
"random_suffix": acctest.RandString(t, 10),
121121
}
122122

0 commit comments

Comments
 (0)