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

Merge pull request #28245 from hashicorp/alisdair/fix-sensitive-value-sensitive-attribute-conflict 

core: Fix sensitive value/attribute conflict
This commit is contained in:
Alisdair McDiarmid 2021-03-31 09:29:53 -04:00 committed by GitHub
parent 7ab4f1fb7d c54c18680e
commit d37c3c597a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
terraform/evaluate.go
View File

@ -758,11 +758,12 @@ func (d *evaluationStateData) GetResource(addr addrs.Resource, rng tfdiags.Sourc
} }
// If our provider schema contains sensitive values, mark those as sensitive // If our provider schema contains sensitive values, mark those as sensitive
afterMarks := change.AfterValMarks
if schema.ContainsSensitive() { if schema.ContainsSensitive() {
val = markProviderSensitiveAttributes(schema, val) afterMarks = append(afterMarks, getValMarks(schema, val, nil)...)
} }
instances[key] = val.MarkWithPaths(change.AfterValMarks) instances[key] = val.MarkWithPaths(afterMarks)
continue continue
} }

13
terraform/evaluate_test.go
View File

@ -357,6 +357,9 @@ func TestEvaluatorGetResource_changes(t *testing.T) {
"id": cty.StringVal("foo"), "id": cty.StringVal("foo"),
"to_mark_val": cty.StringVal("pizza").Mark("sensitive"), "to_mark_val": cty.StringVal("pizza").Mark("sensitive"),
"sensitive_value": cty.StringVal("abc"), "sensitive_value": cty.StringVal("abc"),
"sensitive_collection": cty.MapVal(map[string]cty.Value{
"boop": cty.StringVal("beep"),
}),
}), }),
}, },
} }
@ -382,6 +385,11 @@ func TestEvaluatorGetResource_changes(t *testing.T) {
Computed: true, Computed: true,
Sensitive: true, Sensitive: true,
}, },
"sensitive_collection": {
Type: cty.Map(cty.String),
Computed: true,
Sensitive: true,
},
}, },
}, },
}, },
@ -408,7 +416,7 @@ func TestEvaluatorGetResource_changes(t *testing.T) {
Config: &configs.Config{ Config: &configs.Config{
Module: &configs.Module{ Module: &configs.Module{
ManagedResources: map[string]*configs.Resource{ ManagedResources: map[string]*configs.Resource{
"test_resource.foo": &configs.Resource{ "test_resource.foo": {
Mode: addrs.ManagedResourceMode, Mode: addrs.ManagedResourceMode,
Type: "test_resource", Type: "test_resource",
Name: "foo", Name: "foo",
@ -434,6 +442,9 @@ func TestEvaluatorGetResource_changes(t *testing.T) {
"id": cty.StringVal("foo"), "id": cty.StringVal("foo"),
"to_mark_val": cty.StringVal("pizza").Mark("sensitive"), "to_mark_val": cty.StringVal("pizza").Mark("sensitive"),
"sensitive_value": cty.StringVal("abc").Mark("sensitive"), "sensitive_value": cty.StringVal("abc").Mark("sensitive"),
"sensitive_collection": cty.MapVal(map[string]cty.Value{
"boop": cty.StringVal("beep"),
}).Mark("sensitive"),
}) })
got, diags := scope.Data.GetResource(addr, tfdiags.SourceRange{}) got, diags := scope.Data.GetResource(addr, tfdiags.SourceRange{})