From cbc5075ad301f2d9615602ebf368f0bb6b815545 Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Tue, 24 Sep 2024 14:07:23 +1000 Subject: [PATCH] fix(cloudrun): update cloud run services names to unique values fixes #164 --- run/access_control/main.tf | 2 +- run/add_tag/main.tf | 6 +++--- run/custom_domain_mapping/main.tf | 2 +- run/deploy_tag/main.tf | 8 ++++---- run/identity/main.tf | 2 +- run/noauth/main.tf | 2 +- run/remove_tag/main.tf | 6 +++--- run/secret_manager/main.tf | 4 ++-- run/traffic_gradual_rollout/main.tf | 4 ++-- run/traffic_latest_revision/main.tf | 2 +- run/traffic_rollback/main.tf | 4 ++-- run/traffic_split/main.tf | 8 ++++---- run/traffic_split_tag/main.tf | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/run/access_control/main.tf b/run/access_control/main.tf index 4ab88049..e6cad66f 100644 --- a/run/access_control/main.tf +++ b/run/access_control/main.tf @@ -17,7 +17,7 @@ # [START cloudrun_access_control_parent_tag] # [START cloudrun_service_access_control_run_service] resource "google_cloud_run_v2_service" "default" { - name = "cloud-run-srv" + name = "public-service" location = "us-central1" deletion_protection = false # set to "true" in production diff --git a/run/add_tag/main.tf b/run/add_tag/main.tf index 39c41be8..f4410ebd 100644 --- a/run/add_tag/main.tf +++ b/run/add_tag/main.tf @@ -16,7 +16,7 @@ # [START cloudrun_service_add_tag] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-service" location = "us-central1" template {} @@ -26,14 +26,14 @@ resource "google_cloud_run_v2_service" "default" { traffic { percent = 100 # This revision needs to already exist - revision = "cloudrun-srv-green" + revision = "green" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } traffic { # Deploy new revision with 0% traffic percent = 0 - revision = "cloudrun-srv-blue" + revision = "blue" tag = "tag-name" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } diff --git a/run/custom_domain_mapping/main.tf b/run/custom_domain_mapping/main.tf index 93137538..7412030d 100644 --- a/run/custom_domain_mapping/main.tf +++ b/run/custom_domain_mapping/main.tf @@ -17,7 +17,7 @@ # [START cloudrun_custom_domain_mapping_parent_tag] # [START cloudrun_custom_domain_mapping_run_service] resource "google_cloud_run_v2_service" "default" { - name = "cloud-run-srv" + name = "custom-domain" location = "us-central1" template { containers { diff --git a/run/deploy_tag/main.tf b/run/deploy_tag/main.tf index 7ccabea8..6f171c97 100644 --- a/run/deploy_tag/main.tf +++ b/run/deploy_tag/main.tf @@ -16,7 +16,7 @@ # [START cloudrun_service_deploy_tag] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-service" location = "us-central1" deletion_protection = false # set to "true" in production @@ -26,7 +26,7 @@ resource "google_cloud_run_v2_service" "default" { # image or tag must be different from previous revision image = "us-docker.pkg.dev/cloudrun/container/hello" } - revision = "cloudrun-srv-blue" + revision = "blue" } # Define the traffic split for each revision @@ -34,14 +34,14 @@ resource "google_cloud_run_v2_service" "default" { traffic { percent = 100 # This revision needs to already exist - revision = "cloudrun-srv-green" + revision = "green" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } traffic { # Deploy new revision with 0% traffic percent = 0 - revision = "cloudrun-srv-blue" + revision = "blue" tag = "tag-name" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } diff --git a/run/identity/main.tf b/run/identity/main.tf index ad613d47..5893364a 100644 --- a/run/identity/main.tf +++ b/run/identity/main.tf @@ -23,7 +23,7 @@ resource "google_service_account" "cloudrun_service_identity" { # [START cloudrun_service_identity_run_service] resource "google_cloud_run_v2_service" "default" { - name = "cloud-run-srv" + name = "id-service" location = "us-central1" deletion_protection = false # set to "true" in production diff --git a/run/noauth/main.tf b/run/noauth/main.tf index 8e68e7ee..31205116 100644 --- a/run/noauth/main.tf +++ b/run/noauth/main.tf @@ -19,7 +19,7 @@ # [START cloudrun_noauth_parent_tag] # [START cloudrun_service_noauth] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-public-service" location = "us-central1" deletion_protection = false # set to "true" in production diff --git a/run/remove_tag/main.tf b/run/remove_tag/main.tf index 555d7326..821a4eb5 100644 --- a/run/remove_tag/main.tf +++ b/run/remove_tag/main.tf @@ -16,7 +16,7 @@ # [START cloudrun_service_remove_tag] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-service" location = "us-central1" template {} @@ -26,7 +26,7 @@ resource "google_cloud_run_v2_service" "default" { traffic { percent = 100 # This revision needs to already exist - revision = "cloudrun-srv-green" + revision = "green" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } @@ -35,7 +35,7 @@ resource "google_cloud_run_v2_service" "default" { # Keep revision at 0% traffic percent = 0 # This revision needs to already exist - revision = "cloudrun-srv-blue" + revision = "blue" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } } diff --git a/run/secret_manager/main.tf b/run/secret_manager/main.tf index 3f213f5f..99ec3006 100644 --- a/run/secret_manager/main.tf +++ b/run/secret_manager/main.tf @@ -61,7 +61,7 @@ resource "google_secret_manager_secret_iam_member" "default" { # [START cloudrun_secret_manager_mounted] resource "google_cloud_run_v2_service" "mounted_secret" { - name = "cloudrun-srv-mounted-secret" + name = "service-with-mounted-secret" location = "us-central1" ingress = "INGRESS_TRAFFIC_ALL" @@ -94,7 +94,7 @@ resource "google_cloud_run_v2_service" "mounted_secret" { # [START cloudrun_secret_manager_env_variable] resource "google_cloud_run_v2_service" "env_variable_secret" { - name = "cloudrun-srv-env-var-secret" + name = "service-with-env-var-secret" location = "us-central1" ingress = "INGRESS_TRAFFIC_ALL" diff --git a/run/traffic_gradual_rollout/main.tf b/run/traffic_gradual_rollout/main.tf index 4945bfd5..223fd48b 100644 --- a/run/traffic_gradual_rollout/main.tf +++ b/run/traffic_gradual_rollout/main.tf @@ -16,7 +16,7 @@ # [START cloudrun_service_traffic_gradual_rollout] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-service" location = "us-central1" template { @@ -31,7 +31,7 @@ resource "google_cloud_run_v2_service" "default" { traffic { percent = 100 # This revision needs to already exist - revision = "cloudrun-srv-green" + revision = "green" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } diff --git a/run/traffic_latest_revision/main.tf b/run/traffic_latest_revision/main.tf index 3c6c9485..3bd0e58f 100644 --- a/run/traffic_latest_revision/main.tf +++ b/run/traffic_latest_revision/main.tf @@ -17,7 +17,7 @@ # [START cloudrun_traffic_latest_revision_parent_tag] # [START cloudrun_service_traffic_latest] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-service" location = "us-central1" template {} diff --git a/run/traffic_rollback/main.tf b/run/traffic_rollback/main.tf index 65ee74b9..c40dcd5e 100644 --- a/run/traffic_rollback/main.tf +++ b/run/traffic_rollback/main.tf @@ -16,7 +16,7 @@ # [START cloudrun_service_traffic_rollback] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-service" location = "us-central1" template {} @@ -24,7 +24,7 @@ resource "google_cloud_run_v2_service" "default" { traffic { percent = 100 # This revision needs to already exist - revision = "cloudrun-srv-green" + revision = "green" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } diff --git a/run/traffic_split/main.tf b/run/traffic_split/main.tf index 7c21e86c..dc9f0aa5 100644 --- a/run/traffic_split/main.tf +++ b/run/traffic_split/main.tf @@ -16,28 +16,28 @@ # [START cloudrun_service_traffic_split] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-service" location = "us-central1" template { containers { image = "us-docker.pkg.dev/cloudrun/container/hello" } - revision = "cloudrun-srv-green" + revision = "green" } # Define the traffic split for each revision # https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/cloud_run_v2_service#traffic traffic { percent = 25 - revision = "cloudrun-srv-green" + revision = "green" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } traffic { percent = 75 # This revision needs to already exist - revision = "cloudrun-srv-blue" + revision = "blue" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" } } diff --git a/run/traffic_split_tag/main.tf b/run/traffic_split_tag/main.tf index 4bfe4c64..86a6f32c 100644 --- a/run/traffic_split_tag/main.tf +++ b/run/traffic_split_tag/main.tf @@ -16,7 +16,7 @@ # [START cloudrun_service_traffic_split_tag] resource "google_cloud_run_v2_service" "default" { - name = "cloudrun-srv" + name = "my-service" location = "us-central1" template {} @@ -27,7 +27,7 @@ resource "google_cloud_run_v2_service" "default" { # Update revision to 50% traffic percent = 50 # This revision needs to already exist - revision = "cloudrun-srv-green" + revision = "green" type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION" }