Merge pull request #36 from terraform-google-modules/add-table-expiration-bq

Add table expiration, labels and description to BQ dataset

Author: morgante

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Fields description, labels and default_table_expiration_ms [#36]
+
 ## [3.0.1] - 2019-XX-YY
 
 ### Changed
@@ -64,4 +67,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#19]: https://github.com/terraform-google-modules/terraform-google-log-export/pull/19
 [#18]: https://github.com/terraform-google-modules/terraform-google-log-export/pull/18
 [#16]: https://github.com/terraform-google-modules/terraform-google-log-export/pull/16
-

modules/bigquery/README.md

@@ -37,7 +37,10 @@ so that all dependencies are met.
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
 | dataset\_name | The name of the bigquery dataset to be created and used for log entries matching the filter. | string | n/a | yes |
+| default\_table\_expiration\_ms | Default table expiration time (in ms) | string | `"3600000"` | no |
 | delete\_contents\_on\_destroy | (Optional) If set to true, delete all the tables in the dataset when destroying the resource; otherwise, destroying the resource will fail if tables are present. | string | `"true"` | no |
+| description | A use-friendly description of the dataset | string | `"Log export dataset"` | no |
+| labels | Dataset labels | map | `<map>` | no |
 | location | The location of the storage bucket. | string | `"US"` | no |
 | log\_sink\_writer\_identity | The service account that logging uses to write log entries to the destination. (This is available as an output coming from the root module). | string | n/a | yes |
 | project\_id | The ID of the project in which the bigquery dataset will be created. | string | n/a | yes |

modules/bigquery/main.tf

@@ -39,10 +39,13 @@ resource "google_project_service" "enable_destination_api" {
 # Bigquery dataset #
 #------------------#
 resource "google_bigquery_dataset" "dataset" {
-  dataset_id                 = var.dataset_name
-  project                    = google_project_service.enable_destination_api.project
-  location                   = var.location
-  delete_contents_on_destroy = var.delete_contents_on_destroy
+  dataset_id                  = var.dataset_name
+  project                     = google_project_service.enable_destination_api.project
+  location                    = var.location
+  description                 = var.description
+  delete_contents_on_destroy  = var.delete_contents_on_destroy
+  default_table_expiration_ms = var.default_table_expiration_ms
+  labels                      = var.labels
 }
 
 #--------------------------------#
@@ -53,4 +56,3 @@ resource "google_project_iam_member" "bigquery_sink_member" {
   role    = "roles/bigquery.dataEditor"
   member  = var.log_sink_writer_identity
 }
-

modules/bigquery/variables.tf

@@ -36,3 +36,18 @@ variable "delete_contents_on_destroy" {
   default     = "true"
 }
 
+variable "default_table_expiration_ms" {
+  description = "Default table expiration time (in ms)"
+  default     = 3600000
+}
+
+variable "description" {
+  description = "A use-friendly description of the dataset"
+  default     = "Log export dataset"
+}
+
+variable "labels" {
+  description = "Dataset labels"
+  type        = map
+  default     = {}
+}