ext/typeexpr: Avoid refinements on dynamic values

2 files changed, 18 insertions, 1 deletions

diff --git a/ext/typeexpr/defaults.go b/ext/typeexpr/defaults.go
index 43a2539..d3d6be2 100644
--- a/ext/typeexpr/defaults.go
+++ b/ext/typeexpr/defaults.go
@@ -95,7 +95,7 @@ func (d *Defaults) apply(v cty.Value) cty.Value {
 				}
 				values[key] = defaultValue
 			}
-			if defaultRng := defaultValue.Range(); defaultRng.DefinitelyNotNull() {
+			if defaultRng := defaultValue.Range(); defaultRng.DefinitelyNotNull() && values[key].Type() != cty.DynamicPseudoType {
 				values[key] = values[key].RefineNotNull()
 			}
 		}
diff --git a/ext/typeexpr/defaults_test.go b/ext/typeexpr/defaults_test.go
index 5f0588f..dc3a3f4 100644
--- a/ext/typeexpr/defaults_test.go
+++ b/ext/typeexpr/defaults_test.go
@@ -898,6 +898,23 @@ func TestDefaults_Apply(t *testing.T) {
 				"foo": cty.UnknownVal(cty.String).RefineNotNull(),
 			}),
 		},
+		"optional attribute with dynamic value can be null": {
+			defaults: &Defaults{
+				Type: cty.ObjectWithOptionalAttrs(map[string]cty.Type{
+					"foo": cty.String,
+				}, []string{"foo"}),
+				DefaultValues: map[string]cty.Value{
+					"foo": cty.StringVal("bar"), // Important: default is non-null
+				},
+			},
+			value: cty.ObjectVal(map[string]cty.Value{
+				"foo": cty.DynamicVal,
+			}),
+			want: cty.ObjectVal(map[string]cty.Value{
+				// The default value is itself non-null, but dynamic value cannot be refined.
+				"foo": cty.DynamicVal,
+			}),
+		},
 	}
 
 	for name, tc := range testCases {