From a286ef6d9cdf1397e8d19c6a02728058817ac842 Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Thu, 14 May 2020 15:57:16 -0400
Subject: [PATCH] remove depends_on from helper test shims

---
 helper/resource/state_shim.go      |  4 ----
 helper/resource/state_shim_test.go | 36 ------------------------------
 2 files changed, 40 deletions(-)

diff --git a/helper/resource/state_shim.go b/helper/resource/state_shim.go
index 1a98c36615..aa2231b289 100644
--- a/helper/resource/state_shim.go
+++ b/helper/resource/state_shim.go
@@ -87,10 +87,6 @@ func shimNewState(newState *states.State, providers map[string]terraform.Resourc
 						resState.Primary.Meta["schema_version"] = i.Current.SchemaVersion
 					}
 
-					for _, dep := range i.Current.DependsOn {
-						resState.Dependencies = append(resState.Dependencies, dep.String())
-					}
-
 					// convert the indexes to the old style flapmap indexes
 					idx := ""
 					switch key.(type) {
diff --git a/helper/resource/state_shim_test.go b/helper/resource/state_shim_test.go
index 2e9bc58fd0..789e1295f4 100644
--- a/helper/resource/state_shim_test.go
+++ b/helper/resource/state_shim_test.go
@@ -31,15 +31,6 @@ func TestStateShim(t *testing.T) {
 			Status:        states.ObjectReady,
 			AttrsFlat:     map[string]string{"id": "foo", "bazzle": "dazzle"},
 			SchemaVersion: 7,
-			DependsOn: []addrs.Referenceable{
-				addrs.ResourceInstance{
-					Resource: addrs.Resource{
-						Mode: 'M',
-						Type: "test_thing",
-						Name: "baz",
-					},
-				},
-			},
 		},
 		addrs.AbsProviderConfig{
 			Provider: addrs.NewDefaultProvider("test"),
@@ -55,7 +46,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectReady,
 			AttrsFlat: map[string]string{"id": "baz", "bazzle": "dazzle"},
-			DependsOn: []addrs.Referenceable{},
 		},
 		addrs.AbsProviderConfig{
 			Provider: addrs.NewDefaultProvider("test"),
@@ -74,7 +64,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectReady,
 			AttrsJSON: []byte(`{"id": "bar", "fuzzle":"wuzzle"}`),
-			DependsOn: []addrs.Referenceable{},
 		},
 		addrs.AbsProviderConfig{
 			Provider: addrs.NewDefaultProvider("test"),
@@ -90,15 +79,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectReady,
 			AttrsJSON: []byte(`{"id": "bar", "fizzle":"wizzle"}`),
-			DependsOn: []addrs.Referenceable{
-				addrs.ResourceInstance{
-					Resource: addrs.Resource{
-						Mode: 'D',
-						Type: "test_data_thing",
-						Name: "foo",
-					},
-				},
-			},
 		},
 		addrs.AbsProviderConfig{
 			Provider: addrs.NewDefaultProvider("test"),
@@ -116,15 +96,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectReady,
 			AttrsFlat: map[string]string{"id": "old", "fizzle": "wizzle"},
-			DependsOn: []addrs.Referenceable{
-				addrs.ResourceInstance{
-					Resource: addrs.Resource{
-						Mode: 'D',
-						Type: "test_data_thing",
-						Name: "foo",
-					},
-				},
-			},
 		},
 		addrs.AbsProviderConfig{
 			Provider: addrs.NewDefaultProvider("test"),
@@ -141,7 +112,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectReady,
 			AttrsFlat: map[string]string{"id": "0", "bazzle": "dazzle"},
-			DependsOn: []addrs.Referenceable{},
 		},
 		addrs.AbsProviderConfig{
 			Provider: addrs.NewDefaultProvider("test"),
@@ -157,7 +127,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectTainted,
 			AttrsFlat: map[string]string{"id": "1", "bazzle": "dazzle"},
-			DependsOn: []addrs.Referenceable{},
 		},
 		addrs.AbsProviderConfig{
 			Provider: addrs.NewDefaultProvider("test"),
@@ -174,7 +143,6 @@ func TestStateShim(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:    states.ObjectReady,
 			AttrsJSON: []byte(`{"id": "single", "bazzle":"dazzle"}`),
-			DependsOn: []addrs.Referenceable{},
 		},
 		addrs.AbsProviderConfig{
 			Provider: addrs.NewDefaultProvider("test"),
@@ -223,7 +191,6 @@ func TestStateShim(t *testing.T) {
 								"schema_version": 7,
 							},
 						},
-						Dependencies: []string{"test_thing.baz"},
 					},
 				},
 			},
@@ -249,7 +216,6 @@ func TestStateShim(t *testing.T) {
 								},
 							},
 						},
-						Dependencies: []string{"data.test_data_thing.foo"},
 					},
 					"data.test_data_thing.foo": &terraform.ResourceState{
 						Type:     "test_data_thing",
@@ -386,7 +352,6 @@ func TestShimLegacyState(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:       states.ObjectReady,
 			AttrsFlat:    map[string]string{"id": "baz", "bazzle": "dazzle"},
-			DependsOn:    []addrs.Referenceable{},
 			Dependencies: []addrs.ConfigResource{},
 		},
 		addrs.AbsProviderConfig{
@@ -404,7 +369,6 @@ func TestShimLegacyState(t *testing.T) {
 		&states.ResourceInstanceObjectSrc{
 			Status:       states.ObjectReady,
 			AttrsFlat:    map[string]string{"id": "bar", "fizzle": "wizzle"},
-			DependsOn:    []addrs.Referenceable{},
 			Dependencies: []addrs.ConfigResource{},
 		},
 		addrs.AbsProviderConfig{