Skip validation of a nested object values missing in config

hashicorp · Feb 9, 2022 · d687ac5 · d687ac5
1 parent bf0240f
commit d687ac5
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 4 deletions.
diff --git a/tfsdk/config.go b/tfsdk/config.go
@@ -91,11 +91,13 @@ func (c Config) getAttributeValue(ctx context.Context, path *tftypes.AttributePa
 	//       If found, convert this value to an unknown value.
 	// Reference: https://github.com/hashicorp/terraform-plugin-framework/issues/186
 
-	if attrTypeWithValidate, ok := attrType.(attr.TypeWithValidate); ok {
-		diags.Append(attrTypeWithValidate.Validate(ctx, tfValue, path)...)
+	if err == nil {
+		if attrTypeWithValidate, ok := attrType.(attr.TypeWithValidate); ok {
+			diags.Append(attrTypeWithValidate.Validate(ctx, tfValue, path)...)
 
-		if diags.HasError() {
-			return nil, diags
+			if diags.HasError() {
+				return nil, diags
+			}
 		}
 	}
 

diff --git a/tfsdk/config_test.go b/tfsdk/config_test.go
@@ -335,6 +335,28 @@ func TestConfigGetAttribute(t *testing.T) {
 			expected:      &testtypes.String{String: types.String{Value: "namevalue"}, CreatedBy: testtypes.StringTypeWithValidateWarning{}},
 			expectedDiags: diag.Diagnostics{testtypes.TestWarningDiagnostic(tftypes.NewAttributePath().WithAttributeName("name"))},
 		},
+		"Computed-Computed-object": {
+			config: Config{
+				Raw: tftypes.NewValue(tftypes.Object{
+					AttributeTypes: map[string]tftypes.Type{
+						"name": tftypes.String,
+					},
+				}, map[string]tftypes.Value{
+					"name": tftypes.NewValue(tftypes.String, "namevalue"),
+				}),
+				Schema: Schema{
+					Attributes: map[string]Attribute{
+						"name": {
+							Type:     testtypes.StringTypeWithValidateWarning{},
+							Required: true,
+						},
+					},
+				},
+			},
+			target:        new(testtypes.String),
+			expected:      &testtypes.String{String: types.String{Value: "namevalue"}, CreatedBy: testtypes.StringTypeWithValidateWarning{}},
+			expectedDiags: diag.Diagnostics{testtypes.TestWarningDiagnostic(tftypes.NewAttributePath().WithAttributeName("name"))},
+		},
 	}
 
 	for name, tc := range testCases {
@@ -1585,6 +1607,35 @@ func TestConfigGetAttributeValue(t *testing.T) {
 			expected:      testtypes.String{String: types.String{Value: "value"}, CreatedBy: testtypes.StringTypeWithValidateWarning{}},
 			expectedDiags: diag.Diagnostics{testtypes.TestWarningDiagnostic(tftypes.NewAttributePath().WithAttributeName("test"))},
 		},
+		"AttrTypeInt64WithValidateError-nested-missing-in-config": {
+			config: Config{
+				Raw: tftypes.NewValue(tftypes.Object{
+					AttributeTypes: map[string]tftypes.Type{
+						"parent": tftypes.Object{},
+					},
+				}, map[string]tftypes.Value{
+					"parent": tftypes.NewValue(tftypes.Object{}, nil),
+				}),
+				Schema: Schema{
+					Attributes: map[string]Attribute{
+						"parent": {
+							Attributes: SingleNestedAttributes(map[string]Attribute{
+								"test": {
+									Type:     types.Int64Type,
+									Optional: true,
+									Computed: true,
+								},
+							}),
+							Computed: true,
+							Optional: true,
+						},
+					},
+				},
+			},
+			path:          tftypes.NewAttributePath().WithAttributeName("parent").WithAttributeName("test"),
+			expected:      types.Int64{Null: true},
+			expectedDiags: nil,
+		},
 	}
 
 	for name, tc := range testCases {