Added view options for BigQuery dataset table

* Fix terraform-google-modules#41

README.md

@@ -119,6 +119,7 @@ This module provisions a dataset and a list of tables with associated JSON schem
 |------|-------------|
 | bigquery\_dataset | Bigquery dataset resource. |
 | bigquery\_tables | Map of bigquery table resources being provisioned. |
+| bigquery\_views | Map of bigquery view resources being provisioned. |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 

examples/basic_bq/README.md

@@ -6,9 +6,9 @@ The basic_bq example uses the root terraform-google-bigquery module to deploy a
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| dataset\_labels | A mapping of labels to assign to the table. | map(string) | n/a | yes |
+| dataset\_labels | A mapping of labels to assign to the table. | map(string) | `<map>` | no |
 | default\_table\_expiration\_ms | Default TTL of tables using the dataset in MS. | string | `"null"` | no |
-| project\_id | Project where the dataset and table are created. | string | n/a | yes |
+| project\_id | Project where the dataset and table are created. | string | `"example-project"` | no |
 | tables | A list of maps that includes table_id, schema, clustering, time_partitioning, expiration_time, labels in each element. | object | `<list>` | no |
 
 ## Outputs
@@ -20,10 +20,7 @@ The basic_bq example uses the root terraform-google-bigquery module to deploy a
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
-## Setup
-Update the contents of `terraform.tfvars` to match your test environment.
-
 ## Run example
 `terraform init`
 `terraform plan`
-`terraform apply -var-file terraform.tfvars`
+`terraform apply`

examples/basic_bq/variables.tf

@@ -21,16 +21,36 @@ variable "default_table_expiration_ms" {
 
 variable "project_id" {
   description = "Project where the dataset and table are created."
+  default     = "example-project"
 }
 
 variable "dataset_labels" {
   description = "A mapping of labels to assign to the table."
-  type        = map(string)
+  default = {
+    env      = "dev"
+    billable = "true"
+    owner    = "janesmith"
+  }
+  type = map(string)
 }
 
 variable "tables" {
   description = "A list of maps that includes table_id, schema, clustering, time_partitioning, expiration_time, labels in each element."
-  default     = []
+  default = [
+    {
+      table_id          = "bar",
+      schema            = "sample_bq_schema.json",
+      time_partitioning = null,
+      expiration_time   = 2524604400000, # 2050/01/01
+      clustering        = [],
+      view              = null
+      labels = {
+        env      = "devops"
+        billable = "true"
+        owner    = "joedoe"
+      },
+    }
+  ]
   type = list(object({
     table_id   = string,
     schema     = string,
@@ -42,6 +62,10 @@ variable "tables" {
       require_partition_filter = bool,
     }),
     expiration_time = string,
-    labels          = map(string),
+    view = object({
+      query          = string,
+      use_legacy_sql = bool,
+    }),
+    labels = map(string),
   }))
 }

examples/multiple_tables/README.md

@@ -8,9 +8,9 @@ This example is a good reference to understand and test the module usage.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| dataset\_labels | A mapping of labels to assign to the table. | map(string) | n/a | yes |
-| default\_table\_expiration\_ms | Default TTL of tables using the dataset in MS. | string | `"null"` | no |
-| project\_id | Project where the dataset and table are created. | string | n/a | yes |
+| dataset\_labels | A mapping of labels to assign to the table. | map(string) | `<map>` | no |
+| default\_table\_expiration\_ms | Default TTL of tables using the dataset in MS. | string | `"3600000"` | no |
+| project\_id | Project where the dataset and table are created. | string | `"example-project"` | no |
 | tables | A list of maps that includes table_id, schema, clustering, time_partitioning, expiration_time, labels in each element. | object | `<list>` | no |
 
 ## Outputs
@@ -19,13 +19,11 @@ This example is a good reference to understand and test the module usage.
 |------|-------------|
 | bigquery\_dataset | Bigquery dataset resource. |
 | bigquery\_tables | Map of bigquery table resources being provisioned. |
+| bigquery\_views | Map of bigquery view resources being provisioned. |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
-## Setup
-Update the contents of `terraform.tfvars` to match your test environment.
-
 ## Run example
 `terraform init`
 `terraform plan`
-`terraform apply -var-file terraform.tfvars`
+`terraform apply`

examples/multiple_tables/outputs.tf

@@ -23,3 +23,8 @@ output "bigquery_tables" {
   value       = module.bigquery.bigquery_tables
   description = "Map of bigquery table resources being provisioned."
 }
+
+output "bigquery_views" {
+  value       = module.bigquery.bigquery_views
+  description = "Map of bigquery view resources being provisioned."
+}

examples/multiple_tables/variables.tf

@@ -16,21 +16,59 @@
 
 variable "default_table_expiration_ms" {
   description = "Default TTL of tables using the dataset in MS."
-  default     = null
+  default     = 3600000
 }
 
 variable "project_id" {
   description = "Project where the dataset and table are created."
+  default     = "example-project"
 }
 
 variable "dataset_labels" {
   description = "A mapping of labels to assign to the table."
-  type        = map(string)
+  default = {
+    env      = "dev"
+    billable = "true"
+    owner    = "janesmith"
+  }
+  type = map(string)
 }
 
 variable "tables" {
   description = "A list of maps that includes table_id, schema, clustering, time_partitioning, expiration_time, labels in each element."
-  default     = []
+  default = [
+    {
+      table_id = "foo",
+      schema   = "sample_bq_schema.json",
+      time_partitioning = {
+        type                     = "DAY",
+        field                    = null,
+        require_partition_filter = false,
+        expiration_ms            = null,
+      },
+      expiration_time = null,
+      clustering      = ["fullVisitorId", "visitId"],
+      labels = {
+        env      = "dev"
+        billable = "true"
+        owner    = "joedoe"
+      },
+      view = null
+    },
+    {
+      table_id          = "bar",
+      schema            = "sample_bq_schema.json",
+      time_partitioning = null,
+      expiration_time   = 2524604400000, # 2050/01/01
+      clustering        = [],
+      labels = {
+        env      = "devops"
+        billable = "true"
+        owner    = "joedoe"
+      },
+      view = null
+    }
+  ]
   type = list(object({
     table_id   = string,
     schema     = string,
@@ -42,6 +80,10 @@ variable "tables" {
       require_partition_filter = bool,
     }),
     expiration_time = string,
-    labels          = map(string),
+    view = object({
+      query          = string,
+      use_legacy_sql = bool,
+    }),
+    labels = map(string),
   }))
 }

main.tf

@@ -15,7 +15,8 @@
  */
 
 locals {
-  tables = { for table in var.tables : table["table_id"] => table }
+  tables = { for table in var.tables : table["table_id"] => table if lookup(table, "view", null) == null }
+  views  = { for table in var.tables : table["table_id"] => table if lookup(table, "view", null) != null }
 }
 
 resource "google_bigquery_dataset" "main" {
@@ -49,3 +50,28 @@ resource "google_bigquery_table" "main" {
     }
   }
 }
+
+resource "google_bigquery_table" "view" {
+  for_each        = local.views
+  dataset_id      = google_bigquery_dataset.main.dataset_id
+  friendly_name   = each.key
+  table_id        = each.key
+  labels          = each.value["labels"]
+  clustering      = each.value["clustering"]
+  expiration_time = each.value["expiration_time"]
+  project         = var.project_id
+  depends_on      = [google_bigquery_table.main]
+  view {
+    query          = each.value["view"]["query"]
+    use_legacy_sql = each.value["view"]["use_legacy_sql"]
+  }
+  dynamic "time_partitioning" {
+    for_each = each.value["time_partitioning"] != null ? [each.value["time_partitioning"]] : []
+    content {
+      type                     = time_partitioning.value["type"]
+      expiration_ms            = time_partitioning.value["expiration_ms"]
+      field                    = time_partitioning.value["field"]
+      require_partition_filter = time_partitioning.value["require_partition_filter"]
+    }
+  }
+}

outputs.tf

@@ -23,3 +23,8 @@ output "bigquery_tables" {
   value       = google_bigquery_table.main
   description = "Map of bigquery table resources being provisioned."
 }
+
+output "bigquery_views" {
+  value       = google_bigquery_table.view
+  description = "Map of bigquery view resources being provisioned."
+}

test/fixtures/full/outputs.tf

@@ -23,3 +23,8 @@ output "bigquery_tables" {
   value       = module.example.bigquery_tables
   description = "Map of bigquery table resources being provisioned."
 }
+
+output "bigquery_views" {
+  value       = module.example.bigquery_views
+  description = "Map of bigquery view resources being provisioned."
+}