Pass requiredwith validation if defaultfunc present

hashicorp · Feb 20, 2023 · d7b35c8 · d7b35c8
1 parent 868827a
commit d7b35c8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/helper/schema/schema.go b/helper/schema/schema.go
@@ -1817,7 +1817,7 @@ func validateRequiredWithAttribute(
 	schema *Schema,
 	c *terraform.ResourceConfig) error {
 
-	if len(schema.RequiredWith) == 0 {
+	if len(schema.RequiredWith) == 0 || schema.DefaultFunc != nil {
 		return nil
 	}
 

diff --git a/helper/schema/schema_test.go b/helper/schema/schema_test.go
@@ -8798,6 +8798,26 @@ func TestValidateRequiredWithAttributes(t *testing.T) {
 
 			Err: true,
 		},
+		"default func and required with": {
+			Schema: map[string]*Schema{
+				"foo": {
+					Type:     TypeBool,
+					Optional: true,
+				},
+				"bar": {
+					Type:         TypeBool,
+					Optional:     true,
+					RequiredWith: []string{"foo"},
+					DefaultFunc:  func() (interface{}, error) { return true, nil },
+				},
+			},
+
+			Config: map[string]interface{}{
+				"foo": true,
+			},
+
+			Err: false,
+		},
 	}
 
 	for tn, tc := range cases {