ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-taint-w-ignorechanges' of https://github.com/sl1pm4t/terraform into sl1pm4t-fix-taint-w-ignorechanges

This commit is contained in:
Mitchell Hashimoto 2016-10-27 08:32:37 -04:00
parent 296ce59f37 dbf04721d2
commit 984cade39f
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
terraform/eval_diff.go
View File

@ -185,6 +185,11 @@ func (n *EvalDiff) processIgnoreChanges(diff *InstanceDiff) error {
return nil return nil
} }
// If the resource has been tainted we shouldn't alter the Diff
if diff.DestroyTainted {
return nil
}
ignorableAttrKeys := make(map[string]bool) ignorableAttrKeys := make(map[string]bool)
for _, ignoredKey := range ignoreChanges { for _, ignoredKey := range ignoreChanges {
for k := range diff.CopyAttributes() { for k := range diff.CopyAttributes() {