fix: update pattern name of resources (#151)

* separating vpc names * fixing lint * updating bucket pattern name * removing old comments * Update examples/batch-data-ingestion/main.tf Co-authored-by: Daniel Andrade <dandrade@ciandt.com> * fixed bucket name * fixed bucket name * Update test/setup/main.tf Co-authored-by: Daniel Andrade <dandrade@ciandt.com> * fixed bucket name * fixed the name bucket Co-authored-by: Daniel Andrade <dandrade@ciandt.com> Co-authored-by: Luiz Dutra <luizdutra@ciandt.com> Co-authored-by: LuizSDCit <86307064+LuizSDCit@users.noreply.github.com>
GoogleCloudPlatform · Oct 1, 2021 · 98d9d2e · 98d9d2e
1 parent 48c975d
commit 98d9d2e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/examples/regional-dlp/main.tf b/examples/regional-dlp/main.tf
@@ -32,7 +32,7 @@ module "data_ingestion" {
   sdx_project_number               = var.sdx_project_number
   terraform_service_account        = var.terraform_service_account
   access_context_manager_policy_id = var.access_context_manager_policy_id
-  bucket_name                      = "bkt-dlp-flex-ingest-${random_id.suffix.hex}"
+  bucket_name                      = "dlp-flex-ingest"
   dataset_id                       = "dlp_flex_ingest"
   cmek_keyring_name                = "dlp_flex_ingest-${random_id.suffix.hex}"
   region                           = var.location

diff --git a/flex_templates/template-artifact-storage/main.tf b/flex_templates/template-artifact-storage/main.tf
@@ -114,7 +114,7 @@ resource "google_project_iam_member" "cloud_build_builder" {
 }
 
 resource "google_storage_bucket" "templates_bucket" {
-  name     = "bkt-${var.location}-${var.project_id}-tpl-${random_id.suffix.hex}"
+  name     = "bkt-${var.project_id}-tpl-${random_id.suffix.hex}"
   location = var.location
   project  = var.project_id
 

diff --git a/modules/base-data-ingestion/main.tf b/modules/base-data-ingestion/main.tf
@@ -24,7 +24,7 @@ module "data_ingest_bucket" {
   version = "~> 2.0"
 
   project_id      = var.data_ingestion_project_id
-  name            = "bkt-${random_id.suffix.hex}-${var.bucket_name}"
+  name            = "bkt-${var.data_ingestion_project_id}-${var.bucket_name}-${random_id.suffix.hex}"
   location        = var.bucket_location
   storage_class   = var.bucket_class
   lifecycle_rules = var.bucket_lifecycle_rules

diff --git a/modules/data_governance/main.tf b/modules/data_governance/main.tf
@@ -32,7 +32,6 @@ locals {
   reidentification_key_name      = "reidentification_kms_key_${random_id.suffix.hex}"
   confidential_bigquery_key_name = "confidential_bigquery_kms_key_${random_id.suffix.hex}"
 
-
   ingestion_key_encrypters_decrypters = "serviceAccount:${local.storage_sa},serviceAccount:${local.pubsub_sa},serviceAccount:${local.dataflow_sa},serviceAccount:${local.compute_sa}"
   bigquery_key_encrypters_decrypters  = "serviceAccount:${local.bigquery_sa}"
 
@@ -100,7 +99,6 @@ resource "google_project_service_identity" "dataflow_sa" {
   service = "dataflow.googleapis.com"
 }
 
-
 data "google_project" "reid_project" {
   project_id = var.privileged_data_project_id
 }