feat: data_warehouse add labels to objects (#253)

terraform-google-modules · Sep 20, 2023 · 70962af · 70962af
1 parent d2c1256
commit 70962af
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 3 deletions.
diff --git a/modules/data_warehouse/README.md b/modules/data_warehouse/README.md
@@ -37,7 +37,7 @@ Functional examples are included in the
 | deletion\_protection | Whether or not to protect GCS resources from deletion when solution is modified or changed. | `string` | `true` | no |
 | enable\_apis | Whether or not to enable underlying apis in this solution. | `string` | `true` | no |
 | force\_destroy | Whether or not to protect BigQuery resources from deletion when solution is modified or changed. | `string` | `false` | no |
-| labels | A map of labels to apply to contained resources. | `map(string)` | <pre>{<br>  "edw-bigquery": true<br>}</pre> | no |
+| labels | A map of labels to apply to contained resources. | `map(string)` | <pre>{<br>  "data-warehouse": true<br>}</pre> | no |
 | project\_id | Google Cloud Project ID | `string` | n/a | yes |
 | region | Google Cloud Region | `string` | n/a | yes |
 

diff --git a/modules/data_warehouse/bigquery.tf b/modules/data_warehouse/bigquery.tf
@@ -65,6 +65,8 @@ resource "google_bigquery_table" "tbl_edw_taxi" {
 
   schema = file("${path.module}/src/taxi_trips_schema.json")
 
+  labels = var.labels
+
   depends_on = [
     google_bigquery_connection.ds_connection,
     google_storage_bucket.raw_bucket,

diff --git a/modules/data_warehouse/main.tf b/modules/data_warehouse/main.tf
@@ -75,6 +75,8 @@ resource "google_storage_bucket" "raw_bucket" {
   force_destroy               = var.force_destroy
 
   public_access_prevention = "enforced"
+
+  labels = var.labels
 }
 
 # # Set up the provisioning bucketstorage bucket
@@ -86,13 +88,17 @@ resource "google_storage_bucket" "provisioning_bucket" {
   force_destroy               = var.force_destroy
 
   public_access_prevention = "enforced"
+
+  labels = var.labels
 }
 
 // Create Eventarc Trigger
 # # Create a Pub/Sub topic.
 resource "google_pubsub_topic" "topic" {
   name    = "provisioning-topic"
   project = module.project-services.project_id
+
+  labels = var.labels
 }
 
 resource "google_pubsub_topic_iam_binding" "binding" {
@@ -138,6 +144,8 @@ resource "google_eventarc_trigger" "trigger_pubsub_tf" {
   }
   service_account = google_service_account.eventarc_service_account.email
 
+  labels = var.labels
+
   depends_on = [
     google_workflows_workflow.workflow,
     google_project_iam_member.eventarc_service_account_invoke_role,

diff --git a/modules/data_warehouse/src/sql/sp_bigqueryml_model.sql b/modules/data_warehouse/src/sql/sp_bigqueryml_model.sql
@@ -20,7 +20,8 @@ select * from ML.PREDICT(MODEL ds_edw.model_taxi_estimate,
 
 --Model Example
 CREATE OR REPLACE MODEL
-  `${project_id}.ds_edw.model_taxi_estimate` OPTIONS ( MODEL_TYPE='LINEAR_REG',
+  `${project_id}.ds_edw.model_taxi_estimate`
+OPTIONS ( MODEL_TYPE='LINEAR_REG',
     LS_INIT_LEARN_RATE=0.15,
     L1_REG=1,
     MAX_ITERATIONS=5 ) AS

diff --git a/modules/data_warehouse/src/sql/sp_lookerstudio_report.sql b/modules/data_warehouse/src/sql/sp_lookerstudio_report.sql
@@ -13,6 +13,9 @@
 -- limitations under the License.
 
 CREATE OR REPLACE TABLE `${project_id}.ds_edw.lookerstudio_report`
+OPTIONS(
+    labels=[("data-warehouse","true")]
+)
 AS
 WITH TaxiData AS
 (

diff --git a/modules/data_warehouse/src/sql/sp_provision_lookup_tables.sql b/modules/data_warehouse/src/sql/sp_provision_lookup_tables.sql
@@ -17,6 +17,9 @@ CREATE OR REPLACE TABLE `${project_id}.ds_edw.vendor`
         Vendor_Id INTEGER,
         Vendor_Description STRING
     )
+OPTIONS(
+    labels=[("data-warehouse","true")]
+)
 AS
 SELECT 1, 'Creative Mobile Technologies, LLC'
 UNION ALL
@@ -27,6 +30,9 @@ CREATE OR REPLACE TABLE `${project_id}.ds_edw.payment_type`
         Payment_Type_Id INTEGER,
         Payment_Type_Description STRING
     )
+OPTIONS(
+    labels=[("data-warehouse","true")]
+)
 AS
 SELECT 1, 'Credit card'
 UNION ALL

diff --git a/modules/data_warehouse/variables.tf b/modules/data_warehouse/variables.tf
@@ -27,7 +27,7 @@ variable "region" {
 variable "labels" {
   type        = map(string)
   description = "A map of labels to apply to contained resources."
-  default     = { "edw-bigquery" = true }
+  default     = { "data-warehouse" = true }
 }
 
 variable "enable_apis" {

diff --git a/modules/data_warehouse/workflows.tf b/modules/data_warehouse/workflows.tf
@@ -52,6 +52,8 @@ resource "google_workflows_workflow" "workflow" {
     raw_bucket = google_storage_bucket.raw_bucket.name
   })
 
+  labels = var.labels
+
   depends_on = [
     google_project_iam_member.workflow_service_account_roles,
   ]