Merge branch 'vvm/cross_test_fix_required_empty_blocks' into vvm/ensu…

…re_bitstream_consumed
pulumi · May 19, 2024 · 5bee956 · 5bee956
2 parents f88fb72 + 76f18cc
commit 5bee956
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/tests/cross-tests/tfwrite.go b/pkg/tests/cross-tests/tfwrite.go
@@ -60,17 +60,25 @@ func writeBlock(body *hclwrite.Body, schemas map[string]*schema.Schema, values m
 					continue
 				}
 
-				newBlock := body.AppendNewBlock(key, nil)
+				if value.LengthInt() == 0 {
+					body.AppendNewBlock(key, nil)
+				}
+
 				for _, v := range value.AsValueSet().Values() {
+					newBlock := body.AppendNewBlock(key, nil)
 					writeBlock(newBlock.Body(), elem.Schema, v.AsValueMap())
 				}
 			} else if sch.Type == schema.TypeList {
 				if value.IsNull() {
 					continue
 				}
 
-				newBlock := body.AppendNewBlock(key, nil)
+				if value.LengthInt() == 0 {
+					body.AppendNewBlock(key, nil)
+				}
+
 				for _, v := range value.AsValueSlice() {
+					newBlock := body.AppendNewBlock(key, nil)
 					writeBlock(newBlock.Body(), elem.Schema, v.AsValueMap())
 				}
 			} else {

diff --git a/pkg/tests/cross-tests/tfwrite_test.go b/pkg/tests/cross-tests/tfwrite_test.go
@@ -168,6 +168,7 @@ resource "res" "ex" {
 }
 `),
 		},
+		// TODO: empty list/set test case
 	}
 
 	for _, tc := range testCases {
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,6 +168,7 @@ resource "res" "ex" { @@
     }
     `),
     		},
+    		// TODO: empty list/set test case
     	}
     	for _, tc := range testCases {
@@ Expand Down @@