Revert "fix: back out unique names and use unique webhook_sa_name" (#89)

GoogleCloudPlatform · Mar 26, 2024 · 4551c08 · 4551c08
1 parent 94541db
commit 4551c08
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Deployment: 6 mins
 | firestore\_location | Firestore location, see https://firebase.google.com/docs/firestore/locations | `string` | `"nam5"` | no |
 | project\_id | The Google Cloud project ID to deploy to | `string` | n/a | yes |
 | region | The Google Cloud region to deploy to | `string` | `"us-central1"` | no |
-| unique\_names | Whether to use unique names for resources | `bool` | `false` | no |
+| unique\_names | Whether to use unique names for resources | `bool` | `true` | no |
 | webhook\_path | Path to the webhook source directory | `string` | `"webhook"` | no |
 
 ## Outputs

diff --git a/assets/diagram_updated.json b/assets/diagram_updated.json
diff --git a/main.tf b/main.tf
@@ -48,7 +48,7 @@ locals {
   bucket_main_name   = var.unique_names ? "${var.project_id}-main-${random_id.unique_id.hex}" : "${var.project_id}-main"
   bucket_docs_name   = var.unique_names ? "${var.project_id}-docs-${random_id.unique_id.hex}" : "${var.project_id}-docs"
   webhook_name       = var.unique_names ? "webhook-${random_id.unique_id.hex}" : "webhook"
-  webhook_sa_name    = var.unique_names ? "webhook-service-account-kb-${random_id.unique_id.hex}" : "webhook-service-account-kb"
+  webhook_sa_name    = var.unique_names ? "webhook-service-account-${random_id.unique_id.hex}" : "webhook-service-account"
   trigger_name       = var.unique_names ? "trigger-${random_id.unique_id.hex}" : "trigger"
   trigger_sa_name    = var.unique_names ? "trigger-service-account-${random_id.unique_id.hex}" : "trigger-service-account"
   ocr_processor_name = var.unique_names ? "ocr-processor-${random_id.unique_id.hex}" : "ocr-processor"

diff --git a/metadata.yaml b/metadata.yaml
@@ -92,7 +92,7 @@ spec:
       - name: unique_names
         description: Whether to use unique names for resources
         varType: bool
-        defaultValue: false
+        defaultValue: true
       - name: webhook_path
         description: Path to the webhook source directory
         varType: string

diff --git a/variables.tf b/variables.tf
@@ -59,5 +59,5 @@ variable "webhook_path" {
 variable "unique_names" {
   description = "Whether to use unique names for resources"
   type        = bool
-  default     = false
+  default     = true
 }