Merge pull request #133 from TerraHubCorp/dev

Added new components and updated dependsOn values
MitocGroup · Oct 24, 2019 · 31e7bb8 · 31e7bb8
2 parents 1874bc2 + 44bb7c1
commit 31e7bb8
Show file tree

Hide file tree

Showing 52 changed files with 680 additions and 133 deletions.
diff --git a/.terrahub.yml b/.terrahub.yml
@@ -10,7 +10,7 @@ project:
 terraform:
   varFile:
     - default.tfvars
-  version: 0.12.10
+  version: 0.12.12
 template:
   provider:
     - aws:

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ To get started, simply include `main.tf` into your terraform codebase:
 ```hcl
 module "landing_zone" {
   source    = "TerraHubCorp/landing-zone/aws"
-  version   = "0.1.7"
+  version   = "0.1.9"
   root_path = path.module
   landing_zone_providers  = var.landing_zone_providers
   landing_zone_components = var.landing_zone_components

diff --git a/components/landing_zone_cloudtrail/.terrahub.yml b/components/landing_zone_cloudtrail/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_cloudtrail
   dependsOn:
-    - ../landing_zone_cloudtrail_s3_bucket
+    - landing_zone_cloudtrail_s3_bucket
   template:
     data:
       terraform_remote_state:

diff --git a/components/landing_zone_cloudtrail_s3_bucket_policy/.terrahub.yml b/components/landing_zone_cloudtrail_s3_bucket_policy/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_cloudtrail_s3_bucket_policy
   dependsOn:
-    - ../landing_zone_cloudtrail_s3_bucket
+    - landing_zone_cloudtrail_s3_bucket
   template:
     data:
       terraform_remote_state:

diff --git a/components/landing_zone_code_build/.terrahub.yml b/components/landing_zone_code_build/.terrahub.yml
@@ -1,8 +1,8 @@
 component:
   name: landing_zone_code_build
   dependsOn:
-    - ../landing_zone_code_build_role
-    - ../landing_zone_pipeline_artifact_s3_bucket
+    - landing_zone_code_build_role
+    - landing_zone_pipeline_artifact_s3_bucket
   template:
     data:
       terraform_remote_state:

diff --git a/components/landing_zone_code_build_role_policy/.terrahub.yml b/components/landing_zone_code_build_role_policy/.terrahub.yml
@@ -1,8 +1,8 @@
 component:
   name: landing_zone_code_build_role_policy
   dependsOn:
-    - ../landing_zone_pipeline_artifact_s3_bucket
-    - ../landing_zone_code_build_role
+    - landing_zone_pipeline_artifact_s3_bucket
+    - landing_zone_code_build_role
   template:
     data:
       terraform_remote_state:

diff --git a/components/landing_zone_code_pipeline/.terrahub.yml b/components/landing_zone_code_pipeline/.terrahub.yml
@@ -1,10 +1,10 @@
 component:
   name: landing_zone_code_pipeline
   dependsOn:
-    - ../landing_zone_code_pipeline_role
-    - ../landing_zone_pipeline_s3_bucket
-    - ../landing_zone_pipeline_artifact_s3_bucket
-    - ../landing_zone_code_build
+    - landing_zone_code_pipeline_role
+    - landing_zone_pipeline_s3_bucket
+    - landing_zone_pipeline_artifact_s3_bucket
+    - landing_zone_code_build
   template:
     data:
       terraform_remote_state:

diff --git a/components/landing_zone_code_pipeline_role_policy/.terrahub.yml b/components/landing_zone_code_pipeline_role_policy/.terrahub.yml
@@ -1,10 +1,10 @@
 component:
   name: landing_zone_code_pipeline_role_policy
   dependsOn:
-    - ../landing_zone_pipeline_s3_bucket
-    - ../landing_zone_pipeline_artifact_s3_bucket
-    - ../landing_zone_code_pipeline_role
-    - ../landing_zone_code_build
+    - landing_zone_pipeline_s3_bucket
+    - landing_zone_pipeline_artifact_s3_bucket
+    - landing_zone_code_pipeline_role
+    - landing_zone_code_build
   template:
     data:
       terraform_remote_state:

diff --git a/components/landing_zone_gateway_attachment_tgw/.terrahub.yml b/components/landing_zone_gateway_attachment_tgw/.terrahub.yml
diff --git a/components/landing_zone_gateway_attachment_tgw/README.md b/components/landing_zone_gateway_attachment_tgw/README.md
diff --git a/components/landing_zone_gateway_cgw/.terrahub.yml b/components/landing_zone_gateway_cgw/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_gateway_cgw
   dependsOn:
-    - ../landing_zone_vpc
+    - landing_zone_vpc
   template:
     locals:
       elements_landing_zone_gateway_cgw_tags_map: >-

diff --git a/components/landing_zone_gateway_igw/.terrahub.yml b/components/landing_zone_gateway_igw/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_gateway_igw
   dependsOn:
-    - ../landing_zone_vpc
+    - landing_zone_vpc
   template:
     locals:
       elements_landing_zone_vpc_data_map: >-

diff --git a/components/landing_zone_gateway_nat/.terrahub.yml b/components/landing_zone_gateway_nat/.terrahub.yml
@@ -1,8 +1,8 @@
 component:
   name: landing_zone_gateway_nat
   dependsOn:
-    - ../landing_zone_eip
-    - ../landing_zone_subnet
+    - landing_zone_eip
+    - landing_zone_subnet
   template:
     locals:
       elements_landing_zone_vpc_data_map: >-

diff --git a/components/landing_zone_gateway_tgw/.terrahub.yml b/components/landing_zone_gateway_tgw/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_gateway_tgw
   dependsOn:
-    - ../landing_zone_vpc
+    - landing_zone_vpc
   template:
     locals:
       elements_landing_zone_gateway_tgw_tags_map: >-

diff --git a/components/landing_zone_gateway_vgw/.terrahub.yml b/components/landing_zone_gateway_vgw/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_gateway_vgw
   dependsOn:
-    - ../landing_zone_vpc
+    - landing_zone_vpc
   template:
     locals:
       elements_landing_zone_vpc_data_map: >-

diff --git a/components/landing_zone_iam_instance_profile/.terrahub.yml b/components/landing_zone_iam_instance_profile/.terrahub.yml
@@ -6,7 +6,7 @@ component:
         var.${tfvar.terrahub["landing_zone_providers"]["0"]}_provider["landing_zone_iam_instance_profile_resource"]
     data:
       aws_iam_role:
-        role_selected:          
+        role_selected:
           provider: 'aws.${tfvar.terrahub["landing_zone_providers"]["0"]}'
           count: >-
             length(var.${tfvar.terrahub["landing_zone_providers"]["0"]}_provider["landing_zone_iam_instance_profile_resource"])
@@ -16,9 +16,11 @@ component:
       aws_iam_instance_profile:
         landing_zone_iam_instance_profile:
           provider: 'aws.${tfvar.terrahub["landing_zone_providers"]["0"]}'
-          count: length(var.${tfvar.terrahub["landing_zone_providers"]["0"]}_provider["landing_zone_iam_instance_profile_resource"])
-          name: local.elements_landing_zone_iam_instance_profile_map["config_${count.index}"]["name"]
-          role: element(data.aws_iam_role.role_selected.*.arn, count.index)
+          count: >-
+            length(var.${tfvar.terrahub["landing_zone_providers"]["0"]}_provider["landing_zone_iam_instance_profile_resource"])
+          name: >-
+            local.elements_landing_zone_iam_instance_profile_map["config_${count.index}"]["name"]
+          role: 'element(data.aws_iam_role.role_selected.*.arn, count.index)'
     output:
       ids:
         value: >-

diff --git a/components/landing_zone_iam_saml_provider/.terrahub.yml b/components/landing_zone_iam_saml_provider/.terrahub.yml
@@ -4,27 +4,34 @@ component:
     locals:
       elements_landing_zone_iam_saml_provider_map: >-
         var.${tfvar.terrahub["landing_zone_providers"]["0"]}_provider["landing_zone_iam_saml_provider_resource"]
-      index_element: ${tfvar.terrahub["landing_zone_providers"]["0"]}
+      index_element: '${tfvar.terrahub["landing_zone_providers"]["0"]}'
     data:
       local_file:
         s3_file_selected:
           count: length(var.landing_zone_providers)
-          filename: '${path.module}/saml-metadata/${element(var.landing_zone_providers, count.index)}.xml'
+          filename: >-
+            ${path.module}/saml-metadata/${element(var.landing_zone_providers,
+            count.index)}.xml
     resource:
       aws_iam_saml_provider:
         landing_zone_iam_saml_provider:
           provider: 'aws.${tfvar.terrahub["landing_zone_providers"]["0"]}'
-          count: length(var.${tfvar.terrahub["landing_zone_providers"]["0"]}_provider["landing_zone_iam_saml_provider_resource"])
-          name: local.elements_landing_zone_iam_saml_provider_map["config_${count.index}"]["name"]
-          saml_metadata_document: data.local_file.s3_file_selected[index(var.landing_zone_providers, "${local.index_element}")].content
+          count: >-
+            length(var.${tfvar.terrahub["landing_zone_providers"]["0"]}_provider["landing_zone_iam_saml_provider_resource"])
+          name: >-
+            local.elements_landing_zone_iam_saml_provider_map["config_${count.index}"]["name"]
+          saml_metadata_document: >-
+            data.local_file.s3_file_selected[index(var.landing_zone_providers,
+            "${local.index_element}")].content
 build:
   env:
     variables:
-      LZ_S3_PATH: 's3://terraform-aws-landing-zone/mycompany/landing_zone_iam_saml_provider/saml-metadata/'
-      LZ_LOCAL_PATH: 'saml-metadata'
+      LZ_S3_PATH: >-
+        s3://terraform-aws-landing-zone/mycompany/landing_zone_iam_saml_provider/saml-metadata/
+      LZ_LOCAL_PATH: saml-metadata
   phases:
     pre_build:
       commands:
         - 'echo "BUILD: Running pre_build step"'
-        - 'mkdir -p $LZ_LOCAL_PATH'
-        - 'aws s3 sync $LZ_S3_PATH $LZ_LOCAL_PATH'
+        - mkdir -p $LZ_LOCAL_PATH
+        - aws s3 sync $LZ_S3_PATH $LZ_LOCAL_PATH
diff --git a/components/landing_zone_network_acl/.terrahub.yml b/components/landing_zone_network_acl/.terrahub.yml
@@ -1,8 +1,8 @@
 component:
   name: landing_zone_network_acl
   dependsOn:
-    - ../landing_zone_vpc
-    - ../landing_zone_subnet
+    - landing_zone_vpc
+    - landing_zone_subnet
   template:
     locals:
       elements_landing_zone_vpc_data_map: >-

diff --git a/components/landing_zone_network_acl_rules/.terrahub.yml b/components/landing_zone_network_acl_rules/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_network_acl_rules
   dependsOn:
-    - ../landing_zone_network_acl
+    - landing_zone_network_acl
   template:
     locals:
       elements_landing_zone_vpc_data_map: >-

diff --git a/components/landing_zone_organization_accounts/.terrahub.yml b/components/landing_zone_organization_accounts/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_organization_accounts
   dependsOn:
-    - ../landing_zone_organization
+    - landing_zone_organization
   template:
     data:
       terraform_remote_state:

diff --git a/components/landing_zone_organization_unit/.terrahub.yml b/components/landing_zone_organization_unit/.terrahub.yml
@@ -1,7 +1,7 @@
 component:
   name: landing_zone_organization_unit
   dependsOn:
-    - ../landing_zone_organization
+    - landing_zone_organization
   template:
     data:
       terraform_remote_state:

diff --git a/components/landing_zone_route/.terrahub.yml b/components/landing_zone_route/.terrahub.yml
@@ -1,8 +1,7 @@
 component:
   name: landing_zone_route
   dependsOn:
-    - ../landing_zone_route_table
-    - ../landing_zone_route_table_association
+    - landing_zone_route_table
   template:
     locals:
       elements_landing_zone_vpc_data_map: >-

diff --git a/components/landing_zone_route_igw/.terrahub.yml b/components/landing_zone_route_igw/.terrahub.yml
@@ -1,9 +1,8 @@
 component:
   name: landing_zone_route_igw
   dependsOn:
-    - ../landing_zone_route_table
-    - ../landing_zone_gateway_igw
-    - ../landing_zone_route_table_association
+    - landing_zone_route_table
+    - landing_zone_gateway_igw
   template:
     locals:
       elements_landing_zone_vpc_data_map: >-

diff --git a/components/landing_zone_route_ipv6/.terrahub.yml b/components/landing_zone_route_ipv6/.terrahub.yml
@@ -1,8 +1,7 @@
 component:
   name: landing_zone_route_ipv6
   dependsOn:
-    - ../landing_zone_route_table
-    - ../landing_zone_route_table_association
+    - landing_zone_route_table
   template:
     locals:
       elements_landing_zone_vpc_data_map: >-