Added implementation for AllOf validation and moved validation functions after checking of an optional element has a value

Author: Thomas Meckel

helper/schema/schema.go

@@ -223,9 +223,13 @@ type Schema struct {
 	//
 	// AtLeastOneOf is a set of schema keys that, when set, at least one of
 	// the keys in that list must be specified.
+	// 
+	// AllOf is a set of schema keys that must be set simultaneously. This 
+	// setting conflicts with ExactlyOneOf or AtLeastOneOf
 	ConflictsWith []string
 	ExactlyOneOf  []string
 	AtLeastOneOf  []string
+	AllOf 		  []string
 
 	// When Deprecated is set, this attribute is deprecated.
 	//
@@ -773,6 +777,16 @@ func (m schemaMap) internalValidate(topSchemaMap schemaMap, attrsOnly bool) erro
 			}
 		}
 
+		if len(v.AllOf) > 0 {
+			if len(v.ExactlyOneOf) > 0 || len(v.AtLeastOneOf) > 0 {
+				return fmt.Errorf("AllOf cannot be used simultaneously with ExactlyOneOf or AtLeastOneOf")
+			}
+			err := checkKeysAgainstSchemaFlags(k, v.AllOf, topSchemaMap)
+			if err != nil {
+				return fmt.Errorf("AllOf: %+v", err)
+			}
+		}
+
 		if len(v.ExactlyOneOf) > 0 {
 			err := checkKeysAgainstSchemaFlags(k, v.ExactlyOneOf, topSchemaMap)
 			if err != nil {
@@ -1390,22 +1404,27 @@ func (m schemaMap) validate(
 		ok = raw != nil
 	}
 
-	err := validateExactlyOneAttribute(k, schema, c)
+	if !ok {
+		if schema.Required {
+			return nil, []error{fmt.Errorf(
+				"%q: required field is not set", k)}
+		}
+		return nil, nil
+	}
+
+	err := validateAllOfAttribute(k, schema, c)
 	if err != nil {
 		return nil, []error{err}
 	}
 
-	err = validateAtLeastOneAttribute(k, schema, c)
+	err = validateExactlyOneAttribute(k, schema, c)
 	if err != nil {
 		return nil, []error{err}
 	}
 
-	if !ok {
-		if schema.Required {
-			return nil, []error{fmt.Errorf(
-				"%q: required field is not set", k)}
-		}
-		return nil, nil
+	err = validateAtLeastOneAttribute(k, schema, c)
+	if err != nil {
+		return nil, []error{err}
 	}
 
 	if !schema.Required && !schema.Optional {
@@ -1494,6 +1513,27 @@ func removeDuplicates(elements []string) []string {
 	return result
 }
 
+func validateAllOfAttribute(
+	k string,
+	schema *Schema,
+	c *terraform.ResourceConfig) error {
+
+	if len(schema.AllOf) == 0 {
+		return nil
+	}
+	
+	allKeys := removeDuplicates(append(schema.AllOf, k))
+	sort.Strings(allKeys)
+
+	for _, allOfKey := range allKeys {
+		if _, ok := c.Get(allOfKey); !ok {
+			return fmt.Errorf("%q: all of `%s` must be specified", k, strings.Join(allKeys, ","))
+		}
+	}
+
+	return nil
+}
+
 func validateExactlyOneAttribute(
 	k string,
 	schema *Schema,