Merge pull request #28625 from hashicorp/backport/jbardin/schema-valu…

…e-marks/humbly-neat-alpaca Backport of null check in ValueMarks into v0.15
hashicorp · May 6, 2021 · 3c31aad · 3c31aad
2 parents 56b8352 + ab3b94b
commit 3c31aad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/configs/configschema/marks.go b/configs/configschema/marks.go
@@ -24,6 +24,9 @@ func (b *Block) ValueMarks(val cty.Value, path cty.Path) []cty.PathValueMarks {
 		}
 	}
 
+	if val.IsNull() {
+		return pvm
+	}
 	for name, blockS := range b.BlockTypes {
 		// If our block doesn't contain any sensitive attributes, skip inspecting it
 		if !blockS.Block.ContainsSensitive() {

diff --git a/configs/configschema/marks_test.go b/configs/configschema/marks_test.go
@@ -47,6 +47,10 @@ func TestBlockValueMarks(t *testing.T) {
 			cty.UnknownVal(schema.ImpliedType()),
 			cty.UnknownVal(schema.ImpliedType()),
 		},
+		{
+			cty.NullVal(schema.ImpliedType()),
+			cty.NullVal(schema.ImpliedType()),
+		},
 		{
 			cty.ObjectVal(map[string]cty.Value{
 				"sensitive":   cty.UnknownVal(cty.String),