Merge pull request #16 from kiran002/master

Variables for Location and Storage class

Author: aaron-lane

modules/bigquery/main.tf

@@ -38,7 +38,7 @@ resource "google_project_service" "enable_destination_api" {
 resource "google_bigquery_dataset" "dataset" {
   dataset_id = "${var.dataset_name}"
   project    = "${google_project_service.enable_destination_api.project}"
-
+  location   = "${var.location}"
   # Delete all tables in dataset on destroy.
   # This is required because a dataset cannot be deleted if it contains any data.
   provisioner "local-exec" {

modules/bigquery/variables.tf

@@ -25,3 +25,8 @@ variable "log_sink_writer_identity" {
 variable "project_id" {
   description = "The ID of the project in which the bigquery dataset will be created."
 }
+
+variable "location" {
+  description = "The location of the storage bucket."
+  default     = "US"
+}

modules/storage/main.tf

@@ -34,8 +34,8 @@ resource "google_project_service" "enable_destination_api" {
 resource "google_storage_bucket" "bucket" {
   name          = "${var.storage_bucket_name}"
   project       = "${google_project_service.enable_destination_api.project}"
-  storage_class = "MULTI_REGIONAL"
-  location      = "US"
+  storage_class = "${var.storage_class}"
+  location      = "${var.location}"
   force_destroy = true
 }
 

modules/storage/variables.tf

@@ -25,3 +25,13 @@ variable "project_id" {
 variable "storage_bucket_name" {
   description = "The name of the storage bucket to be created and used for log entries matching the filter."
 }
+
+variable "location" {
+  description = "The location of the storage bucket."
+  default     = "US"
+}
+
+variable "storage_class" {
+  description = "The storage class of the storage bucket."
+  default     = "MULTI_REGIONAL"
+}