Merge pull request #165 from MitocGroup/dev

Fixed json null object and added missing dependency
MitocGroup · Dec 30, 2019 · eb18cf7 · eb18cf7
2 parents 74a190c + 133c369
commit eb18cf7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ To get started, simply include `main.tf` into your terraform codebase:
 ```hcl
 module "landing_zone" {
   source  = "MitocGroup/landing-zone/aws"
-  version = "0.2.3"
+  version = "0.2.4"
   landing_zone_providers  = var.landing_zone_providers
   landing_zone_components = var.landing_zone_components
   terraform_backend       = var.terraform_backend

diff --git a/modules/landing_zone/data.tf b/modules/landing_zone/data.tf
@@ -1,4 +1,7 @@
 data "local_file" "landing_zone_output_file" {
-  depends_on = [null_resource.landing_zone_apply]
+  depends_on = [
+    null_resource.terraform_output,
+    null_resource.landing_zone_apply
+  ]
   filename   = pathexpand(var.terraform_output_path)
 }
diff --git a/modules/landing_zone/main.tf b/modules/landing_zone/main.tf
@@ -6,6 +6,8 @@ resource "null_resource" "terraform_output" {
 
 resource "null_resource" "terraform_config" {
   depends_on = [null_resource.terraform_output]
+  count      = length(var.landing_zone_components) == 0 ? 0 : 1
+
   triggers = {
     config = var.terraform_config
     sample = ".terrahub.yml.sample"

diff --git a/modules/landing_zone/output.tf b/modules/landing_zone/output.tf
@@ -1,6 +1,6 @@
 output "landing_zone" {
   depends_on  = [data.local_file.landing_zone_output_file]
   sensitive   = true
-  value       = data.local_file.landing_zone_output_file.content == "" ? jsondecode("\"null\":{\"default\":[\"null\"]}") : jsondecode(data.local_file.landing_zone_output_file.content)
+  value       = data.local_file.landing_zone_output_file.content == "" ? jsondecode("{\"null\":{\"default\":[\"null\"]}}") : jsondecode(data.local_file.landing_zone_output_file.content)
   description = "The map of all output variables from components."
 }
diff --git a/modules/landing_zone/terraform.tf b/modules/landing_zone/terraform.tf
@@ -1,5 +1,5 @@
 terraform {
   backend "local" {
-    path = "/tmp/.terrahub/local_backend/terraform-aws-landing_zone/landing_zone/terraform.tfstate"
+    path = "/tmp/.terrahub/local_backend/terraform-aws-landing-zone/landing_zone/terraform.tfstate"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "terraform-aws-landing-zone",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "author": "Mitoc Group Team",
   "license": "MPL-2.0",
   "private": true,