From 027312bead1813d7201b4aac1506e73148921e13 Mon Sep 17 00:00:00 2001
From: Modular Magician <magic-modules@google.com>
Date: Wed, 2 Aug 2023 16:03:29 +0000
Subject: [PATCH] add test prefix to cloud build trigger tests (#8506)

Signed-off-by: Modular Magician <magic-modules@google.com>
---
 cloudbuild_trigger_bitbucket_server_pull_request/main.tf | 2 +-
 cloudbuild_trigger_bitbucket_server_push/main.tf         | 4 ++--
 cloudbuild_trigger_manual/main.tf                        | 2 +-
 cloudbuild_trigger_pubsub_config/main.tf                 | 4 ++--
 cloudbuild_trigger_pubsub_with_repo/main.tf              | 8 ++++----
 cloudbuild_trigger_repo/main.tf                          | 4 ++--
 cloudbuild_trigger_webhook_config/main.tf                | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cloudbuild_trigger_bitbucket_server_pull_request/main.tf b/cloudbuild_trigger_bitbucket_server_pull_request/main.tf
index a2499b21..28757c6a 100644
--- a/cloudbuild_trigger_bitbucket_server_pull_request/main.tf
+++ b/cloudbuild_trigger_bitbucket_server_pull_request/main.tf
@@ -1,5 +1,5 @@
 resource "google_cloudbuild_trigger" "bbs-pull-request-trigger" {
-  name        = "terraform-bbs-pull-request-trigger"
+  name        = "ghe-trigger-${local.name_suffix}"
   location    = "us-central1"
 
   bitbucket_server_trigger_config {
diff --git a/cloudbuild_trigger_bitbucket_server_push/main.tf b/cloudbuild_trigger_bitbucket_server_push/main.tf
index 4b98a36b..6602a1dc 100644
--- a/cloudbuild_trigger_bitbucket_server_push/main.tf
+++ b/cloudbuild_trigger_bitbucket_server_push/main.tf
@@ -1,9 +1,9 @@
 resource "google_cloudbuild_trigger" "bbs-push-trigger" {
-  name        = "terraform-bbs-push-trigger"
+  name        = "bbs-push-trigger"
   location    = "us-central1"
 
   bitbucket_server_trigger_config {
-    repo_slug = "terraform-provider-google"
+    repo_slug = "bbs-push-trigger-${local.name_suffix}"
     project_key = "STAG"
     bitbucket_server_config_resource = "projects/123456789/locations/us-central1/bitbucketServerConfigs/myBitbucketConfig"
     push {
diff --git a/cloudbuild_trigger_manual/main.tf b/cloudbuild_trigger_manual/main.tf
index cafe25b7..50299b23 100644
--- a/cloudbuild_trigger_manual/main.tf
+++ b/cloudbuild_trigger_manual/main.tf
@@ -1,6 +1,6 @@
 
 resource "google_cloudbuild_trigger" "manual-trigger" {
-  name        = "manual-build"
+  name        = "manual-trigger-${local.name_suffix}"
 
   source_to_build {
     uri       = "https://hashicorp/terraform-provider-google-beta"
diff --git a/cloudbuild_trigger_pubsub_config/main.tf b/cloudbuild_trigger_pubsub_config/main.tf
index 35f4f035..4d205ccd 100644
--- a/cloudbuild_trigger_pubsub_config/main.tf
+++ b/cloudbuild_trigger_pubsub_config/main.tf
@@ -1,11 +1,11 @@
 
 resource "google_pubsub_topic" "mytopic" {
-  name = "mytopic"
+  name = "my-topic-${local.name_suffix}"
 }
 
 resource "google_cloudbuild_trigger" "pubsub-config-trigger" {
   location    = "us-central1"
-  name        = "pubsub-trigger"
+  name        = "pubsub-trigger-${local.name_suffix}"
   description = "acceptance test example pubsub build trigger"
 
   pubsub_config {
diff --git a/cloudbuild_trigger_pubsub_with_repo/main.tf b/cloudbuild_trigger_pubsub_with_repo/main.tf
index 6e0e5c51..4db817eb 100644
--- a/cloudbuild_trigger_pubsub_with_repo/main.tf
+++ b/cloudbuild_trigger_pubsub_with_repo/main.tf
@@ -1,6 +1,6 @@
 resource "google_cloudbuildv2_connection" "my-connection" {
   location = "us-central1"
-  name = "my-connection"
+  name = "my-connection-${local.name_suffix}"
 
   github_config {
     app_installation_id = 123123-${local.name_suffix}
@@ -11,17 +11,17 @@ resource "google_cloudbuildv2_connection" "my-connection" {
 }
 
 resource "google_cloudbuildv2_repository" "my-repository" {
-  name = "my-repo"
+  name = "my-repo-${local.name_suffix}"
   parent_connection = google_cloudbuildv2_connection.my-connection.id
   remote_uri = "https://github.com/myuser/my-repo.git-${local.name_suffix}"
 }
 
 resource "google_pubsub_topic" "mytopic" {
-  name = "mytopic"
+  name = "my-topic-${local.name_suffix}"
 }
 
 resource "google_cloudbuild_trigger" "pubsub-with-repo-trigger" {
-  name = "pubsub-with-repo-trigger"
+  name = "pubsub-with-repo-trigger-${local.name_suffix}"
   location = "us-central1"
 
   pubsub_config {
diff --git a/cloudbuild_trigger_repo/main.tf b/cloudbuild_trigger_repo/main.tf
index 33c91ee6..b269d72f 100644
--- a/cloudbuild_trigger_repo/main.tf
+++ b/cloudbuild_trigger_repo/main.tf
@@ -1,6 +1,6 @@
 resource "google_cloudbuildv2_connection" "my-connection" {
   location = "us-central1"
-  name = "my-connection"
+  name = "my-connection-${local.name_suffix}"
 
   github_config {
     app_installation_id = 123123-${local.name_suffix}
@@ -11,7 +11,7 @@ resource "google_cloudbuildv2_connection" "my-connection" {
 }
 
 resource "google_cloudbuildv2_repository" "my-repository" {
-  name = "my-repo"
+  name = "my-repo-${local.name_suffix}"
   parent_connection = google_cloudbuildv2_connection.my-connection.id
   remote_uri = "https://github.com/myuser/my-repo.git-${local.name_suffix}"
 }
diff --git a/cloudbuild_trigger_webhook_config/main.tf b/cloudbuild_trigger_webhook_config/main.tf
index 4657eb6e..a8a55208 100644
--- a/cloudbuild_trigger_webhook_config/main.tf
+++ b/cloudbuild_trigger_webhook_config/main.tf
@@ -1,6 +1,6 @@
 
 resource "google_secret_manager_secret" "webhook_trigger_secret_key" {
-  secret_id = "webhook_trigger-secret-key-1"
+  secret_id = "webhook-trigger-secret-key-${local.name_suffix}"
 
   replication {
     user_managed {
@@ -36,7 +36,7 @@ resource "google_secret_manager_secret_iam_policy" "policy" {
 
 
 resource "google_cloudbuild_trigger" "webhook-config-trigger" {
-  name        = "webhook-trigger"
+  name        = "webhook-trigger-${local.name_suffix}"
   description = "acceptance test example webhook build trigger"
  
  webhook_config {