Revert changes to the examples/fixtures, concat patent_type and parent_id for the example invocation

Author: averbuks

examples/simple_example/main.tf

@@ -21,7 +21,7 @@ provider "google" {
 module "folders" {
   source = "../.."
 
-  parent            = var.parent
+  parent            = "${var.parent_type}/${var.parent_id}"
   names             = var.names
   set_roles         = true
   per_folder_admins = var.per_folder_admins

examples/simple_example/variables.tf

@@ -14,9 +14,15 @@
  * limitations under the License.
  */
 
-variable "parent" {
+variable "parent_id" {
   type        = string
-  description = "The resource name of the parent Folder or Organization. Must be of the form folders/folder_id or organizations/org_id"
+  description = "Id of the resource under which the folder will be placed."
+}
+
+variable "parent_type" {
+  type        = string
+  description = "Type of the parent reosurce, defaults to organization."
+  default     = "folders"
 }
 
 variable "names" {

test/fixtures/simple_example/main.tf

@@ -21,7 +21,8 @@ provider "random" {
 module "example" {
   source = "../../../examples/simple_example"
 
-  parent            = var.parent
+  parent_id         = var.parent_id
+  parent_type       = var.parent_type
   names             = var.names
   per_folder_admins = var.per_folder_admins
   all_folder_admins = var.all_folder_admins

test/fixtures/simple_example/outputs.tf

@@ -19,9 +19,14 @@ output "names_and_ids" {
   value       = module.example.names_and_ids
 }
 
-output "parent" {
-  description = "The resource name of the parent Folder or Organization. Must be of the form folders/folder_id or organizations/org_id"
-  value       = var.parent
+output "parent_id" {
+  description = "Id of the resource under which the folder will be placed."
+  value       = var.parent_id
+}
+
+output "parent_type" {
+  description = "Type of the parent reosurce, defaults to organization."
+  value       = var.parent_type
 }
 
 output "names" {

test/fixtures/simple_example/variables.tf

@@ -14,9 +14,15 @@
  * limitations under the License.
  */
 
-variable "parent" {
+variable "parent_id" {
   type        = string
-  description = "The resource name of the parent Folder or Organization. Must be of the form folders/folder_id or organizations/org_id"
+  description = "Id of the resource under which the folder will be placed."
+}
+
+variable "parent_type" {
+  type        = string
+  description = "Type of the parent reosurce, defaults to organization."
+  default     = "folders"
 }
 
 variable "names" {

test/integration/simple_example/controls/gcloud.rb

@@ -15,7 +15,7 @@
 control "gcloud" do
   title "gcloud"
 
-  describe command("gcloud resource-manager folders list --folder=#{attribute("parent").split('/')[1]}") do
+  describe command("gcloud resource-manager folders list --folder=#{attribute("parent_id")}") do
     its(:exit_status) { should eq 0 }
     its(:stderr) { should eq "" }
     its(:stdout) { should include "#{attribute("names")[0]}" }

test/integration/simple_example/inspec.yml

@@ -4,7 +4,7 @@ depends:
     git: https://github.com/inspec/inspec-gcp.git
     tag: v0.10.0
 attributes:
-  - name: parent
+  - name: parent_id
     required: true
     type: string
   - name: names