Merge pull request #287 from hashicorp/b-exactly-one-of-unknowns

schema/ExactlyOneOf: Fix handling of unknowns in complex types
hashicorp · Jan 8, 2020 · 0a644c9 · 0a644c9
2 parents 6184b31 + f85f24c
commit 0a644c9
Show file tree

Hide file tree

Showing 2 changed files with 630 additions and 7 deletions.
diff --git a/helper/schema/schema.go b/helper/schema/schema.go
@@ -1508,13 +1508,13 @@ func validateExactlyOneAttribute(
 	specified := make([]string, 0)
 	unknownVariableValueCount := 0
 	for _, exactlyOneOfKey := range allKeys {
-		if raw, ok := c.Get(exactlyOneOfKey); ok {
-			if raw == hcl2shim.UnknownVariableValue {
-				// This aims to do a best effort check that at least one value is specified whether
-				// it's known or not.
-				unknownVariableValueCount++
-				continue
-			}
+		if c.IsComputed(exactlyOneOfKey) {
+			unknownVariableValueCount++
+			continue
+		}
+
+		_, ok := c.Get(exactlyOneOfKey)
+		if ok {
 			specified = append(specified, exactlyOneOfKey)
 		}
 	}