Merge pull request #176 from inspec/fix-tf-ci-org-id

russellseymour · web-flow · commit da01c97042b0 · 2019-08-29T10:45:43.000+01:00
Propagate default empty string for org id.
diff --git a/test/integration/build/gcp-mm.tf b/test/integration/build/gcp-mm.tf
@@ -513,7 +513,7 @@ resource "google_sourcerepo_repository" "gcp-inspec-sourcerepo-repository" {
 }
 
 resource "google_folder" "inspec-gcp-folder" {
-  count = "${var.gcp_organization_id == "none" ? 0 : var.gcp_enable_privileged_resources}"
+  count = "${var.gcp_organization_id == "" ? 0 : var.gcp_enable_privileged_resources}"
   display_name = "${var.folder["display_name"]}"
   parent       = "organizations/${var.gcp_organization_id}"
 }
@@ -559,7 +559,7 @@ resource "google_container_node_pool" "inspec-gcp-regional-node-pool" {
 }
 
 resource "google_logging_organization_sink" "my-sink" {
-  count       = "${var.gcp_organization_id == "none" ? 0 : var.gcp_enable_privileged_resources}"
+  count       = "${var.gcp_organization_id == "" ? 0 : var.gcp_enable_privileged_resources}"
   name        = "${var.org_sink.name}"
   org_id      = "${var.gcp_organization_id}"
 

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ resource "google_sourcerepo_repository" "gcp-inspec-sourcerepo-repository" {`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`resource "google_folder" "inspec-gcp-folder" {`
`516`		`- count = "${var.gcp_organization_id == "none" ? 0 : var.gcp_enable_privileged_resources}"`
	`516`	`+ count = "${var.gcp_organization_id == "" ? 0 : var.gcp_enable_privileged_resources}"`
`517`	`517`	`display_name = "${var.folder["display_name"]}"`
`518`	`518`	`parent = "organizations/${var.gcp_organization_id}"`
`519`	`519`	`}`
`@@ -559,7 +559,7 @@ resource "google_container_node_pool" "inspec-gcp-regional-node-pool" {`
`559`	`559`	`}`
`560`	`560`
`561`	`561`	`resource "google_logging_organization_sink" "my-sink" {`
`562`		`- count = "${var.gcp_organization_id == "none" ? 0 : var.gcp_enable_privileged_resources}"`
	`562`	`+ count = "${var.gcp_organization_id == "" ? 0 : var.gcp_enable_privileged_resources}"`
`563`	`563`	`name = "${var.org_sink.name}"`
`564`	`564`	`org_id = "${var.gcp_organization_id}"`
`565`	`565`