Merge branch 'master' into project-iam-policy

CHANGELOG.md

@@ -1,10 +1,20 @@
 # Change Log
-<!-- latest_release 0.13.0 -->
+<!-- latest_release 0.13.2 -->
+## [v0.13.2](https://github.com/inspec/inspec-gcp/tree/v0.13.2) (2019-08-29)
+
+#### Merged Pull Requests
+- Propagate default empty string for org id. [#176](https://github.com/inspec/inspec-gcp/pull/176) ([skpaterson](https://github.com/skpaterson))
+<!-- latest_release -->
+
+## [v0.13.1](https://github.com/inspec/inspec-gcp/tree/v0.13.1) (2019-08-29)
+
+#### Merged Pull Requests
+- Ensure an agreeable default value for gcp_organization_id for skipping affected tests. [#175](https://github.com/inspec/inspec-gcp/pull/175) ([skpaterson](https://github.com/skpaterson))
+
 ## [v0.13.0](https://github.com/inspec/inspec-gcp/tree/v0.13.0) (2019-08-27)
 
 #### Merged Pull Requests
 - Add organization log sink resource [#173](https://github.com/inspec/inspec-gcp/pull/173) ([slevenick](https://github.com/slevenick))
-<!-- latest_release -->
 
 ## [v0.12.4](https://github.com/inspec/inspec-gcp/tree/v0.12.4) (2019-08-23)
 

VERSION

@@ -1 +1 @@
-0.13.0
+0.13.2

inspec.yml

@@ -4,7 +4,7 @@ maintainer: [email protected],[email protected]
 summary: This resource pack provides compliance resources_old_ignore for Google Cloud Platform
 copyright: [email protected],[email protected]
 copyright_email: [email protected],[email protected]
-version: 0.13.0
+version: 0.13.2
 license: Apache-2.0
 inspec_version: '>= 4.7.3' 
 supports:

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}"
 

test/integration/configuration/gcp_inspec_config.rb

@@ -17,6 +17,7 @@ def self.add_random_string(length = 25)
   # Config for terraform / inspec in the below hash
   @config = {
       # Generic GCP resource parameters
+      :gcp_organization_id => '',
       :gcp_project_name => "SPaterson Project",
       :gcp_project_id => "spaterson-project",
       :gcp_project_number => "1041358276233",