From 54e32652f72740907eefba18efecaef0c4ca36ad Mon Sep 17 00:00:00 2001
From: Cameron Stitt <cstitt@hashicorp.com>
Date: Thu, 20 Aug 2020 07:38:55 +1000
Subject: [PATCH] Ensure depends_on is in module calls for config

---
 command/jsonconfig/config.go                  | 15 ++++
 .../show-json/module-depends-on/foo/main.tf   |  3 +
 .../show-json/module-depends-on/main.tf       | 11 +++
 .../show-json/module-depends-on/output.json   | 76 +++++++++++++++++++
 4 files changed, 105 insertions(+)
 create mode 100644 command/testdata/show-json/module-depends-on/foo/main.tf
 create mode 100644 command/testdata/show-json/module-depends-on/main.tf
 create mode 100644 command/testdata/show-json/module-depends-on/output.json

diff --git a/command/jsonconfig/config.go b/command/jsonconfig/config.go
index 5d402089b..bbb56231a 100644
--- a/command/jsonconfig/config.go
+++ b/command/jsonconfig/config.go
@@ -48,6 +48,7 @@ type moduleCall struct {
 	ForEachExpression *expression            `json:"for_each_expression,omitempty"`
 	Module            module                 `json:"module,omitempty"`
 	VersionConstraint string                 `json:"version_constraint,omitempty"`
+	DependsOn         []string               `json:"depends_on,omitempty"`
 }
 
 // variables is the JSON representation of the variables provided to the current
@@ -270,6 +271,20 @@ func marshalModuleCall(c *configs.Config, mc *configs.ModuleCall, schemas *terra
 	module, _ := marshalModule(c, schemas, mc.Name)
 	ret.Module = module
 
+	if len(mc.DependsOn) > 0 {
+		dependencies := make([]string, len(mc.DependsOn))
+		for i, d := range mc.DependsOn {
+			ref, diags := addrs.ParseRef(d)
+			// we should not get an error here, because `terraform validate`
+			// would have complained well before this point, but if we do we'll
+			// silenty skip it.
+			if !diags.HasErrors() {
+				dependencies[i] = ref.Subject.String()
+			}
+		}
+		ret.DependsOn = dependencies
+	}
+
 	return ret
 }
 
diff --git a/command/testdata/show-json/module-depends-on/foo/main.tf b/command/testdata/show-json/module-depends-on/foo/main.tf
new file mode 100644
index 000000000..50e1c1227
--- /dev/null
+++ b/command/testdata/show-json/module-depends-on/foo/main.tf
@@ -0,0 +1,3 @@
+variable "test_var" {
+  default = "foo-var"
+}
diff --git a/command/testdata/show-json/module-depends-on/main.tf b/command/testdata/show-json/module-depends-on/main.tf
new file mode 100644
index 000000000..f71851490
--- /dev/null
+++ b/command/testdata/show-json/module-depends-on/main.tf
@@ -0,0 +1,11 @@
+module "foo" {
+    source = "./foo"
+
+    depends_on = [
+        test_instance.test
+    ]
+}
+
+resource "test_instance" "test" {
+    ami   = "foo-bar"
+}
diff --git a/command/testdata/show-json/module-depends-on/output.json b/command/testdata/show-json/module-depends-on/output.json
new file mode 100644
index 000000000..26e7e218b
--- /dev/null
+++ b/command/testdata/show-json/module-depends-on/output.json
@@ -0,0 +1,76 @@
+{
+    "format_version": "0.1",
+    "terraform_version": "0.13.1-dev",
+    "planned_values": {
+        "root_module": {
+            "resources": [
+                {
+                    "address": "test_instance.test",
+                    "mode": "managed",
+                    "type": "test_instance",
+                    "name": "test",
+                    "provider_name": "registry.terraform.io/hashicorp/test",
+                    "schema_version": 0,
+                    "values": {
+                        "ami": "foo-bar"
+                    }
+                }
+            ]
+        }
+    },
+    "resource_changes": [
+        {
+            "address": "test_instance.test",
+            "mode": "managed",
+            "type": "test_instance",
+            "name": "test",
+            "provider_name": "registry.terraform.io/hashicorp/test",
+            "change": {
+                "actions": [
+                    "create"
+                ],
+                "before": null,
+                "after": {
+                    "ami": "foo-bar"
+                },
+                "after_unknown": {
+                    "id": true
+                }
+            }
+        }
+    ],
+    "configuration": {
+        "root_module": {
+            "resources": [
+                {
+                    "address": "test_instance.test",
+                    "mode": "managed",
+                    "type": "test_instance",
+                    "name": "test",
+                    "provider_config_key": "test",
+                    "expressions": {
+                        "ami": {
+                            "constant_value": "foo-bar"
+                        }
+                    },
+                    "schema_version": 0
+                }
+            ],
+            "module_calls": {
+                "foo": {
+                    "depends_on": [
+                        "test_instance.test"
+                    ],
+                    "source": "./foo",
+                    "module": {
+                        "variables": {
+                            "test_var": {
+                                "default": "foo-var"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}