Merge pull request #31236 from hashicorp/alisdair/json-plan-fix-tuple…

…-set-unknown json-output: Fix unknowns for tuples and sets
hashicorp · Jun 17, 2022 · 7fcf973 · 7fcf973
2 parents b0b69d3 + 9497b2c
commit 7fcf973
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/internal/command/jsonplan/plan.go b/internal/command/jsonplan/plan.go
@@ -566,8 +566,9 @@ func omitUnknowns(val cty.Value) cty.Value {
 			newVal := omitUnknowns(v)
 			if newVal != cty.NilVal {
 				vals = append(vals, newVal)
-			} else if newVal == cty.NilVal && ty.IsListType() {
-				// list length may be significant, so we will turn unknowns into nulls
+			} else if newVal == cty.NilVal {
+				// element order is how we correlate unknownness, so we must
+				// replace unknowns with nulls
 				vals = append(vals, cty.NullVal(v.Type()))
 			}
 		}

diff --git a/internal/command/jsonplan/plan_test.go b/internal/command/jsonplan/plan_test.go
@@ -65,6 +65,18 @@ func TestOmitUnknowns(t *testing.T) {
 				"hello": cty.True,
 			}),
 		},
+		{
+			cty.TupleVal([]cty.Value{
+				cty.StringVal("alpha"),
+				cty.UnknownVal(cty.String),
+				cty.StringVal("charlie"),
+			}),
+			cty.TupleVal([]cty.Value{
+				cty.StringVal("alpha"),
+				cty.NullVal(cty.String),
+				cty.StringVal("charlie"),
+			}),
+		},
 		{
 			cty.SetVal([]cty.Value{
 				cty.StringVal("dev"),
@@ -76,6 +88,7 @@ func TestOmitUnknowns(t *testing.T) {
 				cty.StringVal("dev"),
 				cty.StringVal("foo"),
 				cty.StringVal("stg"),
+				cty.NullVal(cty.String),
 			}),
 		},
 		{