Skip to content

add test prefix to cloud build trigger tests #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
modular-magician merged 1 commit into from
Aug 2, 2023
Merged

add test prefix to cloud build trigger tests #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudbuild_trigger_bitbucket_server_pull_request/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions cloudbuild_trigger_bitbucket_server_push/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild_trigger_manual/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cloudbuild_trigger_pubsub_config/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions cloudbuild_trigger_pubsub_with_repo/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions cloudbuild_trigger_repo/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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}"
}
Expand Down
4 changes: 2 additions & 2 deletions cloudbuild_trigger_webhook_config/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down