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

Merge pull request #27903 from hashicorp/jbardin/plan-valid-computed 

objchange: catch invalidly planned attributes earlier
This commit is contained in:
James Bardin 2021-02-24 12:44:35 -05:00 committed by GitHub
parent 326583bb6e cd7fb9bd5a
commit 8c9083d880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plans/objchange/plan_valid.go
View File

@ -255,10 +255,23 @@ func assertPlannedValueValid(attrS *configschema.Attribute, priorV, configV, pla
// the configuration value in favor of the prior. // the configuration value in favor of the prior.
return errs return errs
} }
if attrS.Computed && configV.IsNull() {
// The provider is allowed to change the value of any computed // the provider is allowed to insert values when the config is
// attribute that isn't explicitly set in the config. // null, but only if the attribute is computed.
return errs if configV.IsNull() {
if attrS.Computed {
return errs
}
// if the attribute is not computed, then any planned value is incorrect
if !plannedV.IsNull() {
if attrS.Sensitive {
errs = append(errs, path.NewErrorf("sensitive planned value for a non-computed attribute"))
} else {
errs = append(errs, path.NewErrorf("planned value %#v for a non-computed attribute", plannedV))
}
return errs
}
} }
// If this attribute has a NestedType, validate the nested object // If this attribute has a NestedType, validate the nested object
@ -276,11 +289,13 @@ func assertPlannedValueValid(attrS *configschema.Attribute, priorV, configV, pla
} }
return errs return errs
} }
if attrS.Sensitive { if attrS.Sensitive {
errs = append(errs, path.NewErrorf("sensitive planned value does not match config value nor prior value")) errs = append(errs, path.NewErrorf("sensitive planned value does not match config value nor prior value"))
} else { } else {
errs = append(errs, path.NewErrorf("planned value %#v does not match config value %#v nor prior value %#v", plannedV, configV, priorV)) errs = append(errs, path.NewErrorf("planned value %#v does not match config value %#v nor prior value %#v", plannedV, configV, priorV))
} }
return errs return errs
} }

4
plans/objchange/plan_valid_test.go
View File

@ -1077,7 +1077,7 @@ func TestAssertPlanValid(t *testing.T) {
}), }),
}), }),
}), }),
[]string{".bloop: planned for existence but config wants absense"}, []string{`.bloop: planned value cty.ListVal([]cty.Value{cty.ObjectVal(map[string]cty.Value{"blop":cty.StringVal("ok")})}) for a non-computed attribute`},
}, },
"NestedType nested set attribute to null": { "NestedType nested set attribute to null": {
&configschema.Block{ &configschema.Block{
@ -1116,7 +1116,7 @@ func TestAssertPlanValid(t *testing.T) {
}), }),
}), }),
}), }),
[]string{".bloop: planned for existence but config wants absense"}, []string{`.bloop: planned value cty.ListVal([]cty.Value{cty.ObjectVal(map[string]cty.Value{"blop":cty.StringVal("ok")})}) for a non-computed attribute`},
}, },
} }