terraform: EncodeDepedencies should override dep list

This commit is contained in:
Armon Dadgar 2014-09-18 13:33:05 -07:00
parent a9c4b523db
commit 3b7c987889
2 changed files with 2 additions and 15 deletions

View File

@ -2252,15 +2252,6 @@ func testApplyFn(
if d != nil {
result = result.MergeDiff(d)
}
// TODO(armon): commenting this out to compile, but you're in the
// process of removing this, too anyways. Remove when safe.
/*
if depAttr, ok := d.Attributes["dep"]; ok {
result.Dependencies = []string{depAttr.New}
}
*/
return result, nil
}

View File

@ -209,12 +209,8 @@ func EncodeDependencies(g *depgraph.Graph) {
}
}
// Inject any of the missing depedencies
for _, dep := range inject {
if !strSliceContains(state.Dependencies, dep) {
state.Dependencies = append(state.Dependencies, dep)
}
}
// Update the dependencies
state.Dependencies = inject
}
}