Moved validateExactlyOneAttribute and validateAtLeastOneAttribute back to their old positions as requested by review in helper/schema/schema.go

Author: tmeckel

helper/schema/schema.go

@@ -1345,6 +1345,16 @@ func (m schemaMap) validate(
 		ok = raw != nil
 	}
 
+	err := validateExactlyOneAttribute(k, schema, c)
+	if err != nil {
+		return nil, []error{err}
+	}
+
+	err = validateAtLeastOneAttribute(k, schema, c)
+	if err != nil {
+		return nil, []error{err}
+	}
+
 	if !ok {
 		if schema.Required {
 			return nil, []error{fmt.Errorf(
@@ -1359,17 +1369,7 @@ func (m schemaMap) validate(
 			"%q: this field cannot be set", k)}
 	}
 
-	err := validateRequiredWithAttribute(k, schema, c)
-	if err != nil {
-		return nil, []error{err}
-	}
-
-	err = validateExactlyOneAttribute(k, schema, c)
-	if err != nil {
-		return nil, []error{err}
-	}
-
-	err = validateAtLeastOneAttribute(k, schema, c)
+	err = validateRequiredWithAttribute(k, schema, c)
 	if err != nil {
 		return nil, []error{err}
 	}

helper/schema/schema_test.go

@@ -6359,7 +6359,7 @@ func TestValidateAtLeastOneOfAttributes(t *testing.T) {
 			},
 
 			Config: map[string]interface{}{},
-			Err:    false,
+			Err:    true,
 		},
 
 		"Only Unknown Variable Value": {