Skip to content

Commit

Permalink
fix: update tests and fix found errors
Browse files Browse the repository at this point in the history
  • Loading branch information
thefirstofthe300 committed Jul 9, 2019
1 parent 377329d commit 5df6aaa
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions examples/simple_example/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ module "dataflow-job" {
name = "wordcount-terraform-example"
on_delete = "cancel"
region = "${var.region}"
zone = "${var.region}-a"
zone = "${var.zone}"
max_workers = 1
template_gcs_path = "gs://dataflow-templates/latest/Word_Count"
temp_gcs_location = "${module.dataflow-bucket.name}"
Expand All @@ -84,7 +84,7 @@ module "dataflow-job-2" {
name = "wordcount-terraform-example-2"
on_delete = "cancel"
region = "${var.region}"
zone = "${var.region}-a"
zone = "${var.zone}"
max_workers = 1
template_gcs_path = "gs://dataflow-templates/latest/Word_Count"
temp_gcs_location = "${module.dataflow-bucket.name}"
Expand Down
6 changes: 5 additions & 1 deletion examples/simple_example/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ variable "project_id" {
}

variable "region" {
description = "The region in which the bucket and the dataflow job will be deployed"
description = "The region in which the bucket will be deployed"
}

variable "zone" {
description = "The zone in which the dataflow job will be deployed"
}

variable "service_account_email" {
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/simple_example/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module "example" {
source = "../../../examples/simple_example"
project_id = "${var.project_id}"
region = "${var.region}"
zone = "${var.zone}"
service_account_email = "${var.service_account_email}"
force_destroy = "true"
}
6 changes: 6 additions & 0 deletions test/fixtures/simple_example/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ variable "project_id" {

variable "region" {
description = "The region to deploy to"
default = "us-east1"
}

variable "zone" {
description = "The zone to deploy to"
default = "us-central1-a"
}

variable "service_account_email" {
Expand Down
7 changes: 1 addition & 6 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ variable "on_delete" {
}

variable "region" {
description = "The region in which the created job should run."
description = "The region in which the created job should run. Also determines the location of the staging bucket if created."
default = "us-central1"
}

Expand All @@ -59,11 +59,6 @@ variable "service_account_email" {
default = ""
}

variable "region" {
description = "The bucket's region location"
default = "us-central1"
}

variable "subnetwork_self_link" {
description = "The subnetwork self link to which VMs will be assigned."
default = ""
Expand Down

0 comments on commit 5df6aaa

Please sign in to comment.