(feat): Add iterator to child metadata

Signed-off-by: florian.cazals <florian.cazals@ovhcloud.com>
ovh · Feb 20, 2023 · e2212aa · e2212aa
1 parent e630bb9
commit e2212aa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/engine/engine.go b/engine/engine.go
@@ -791,6 +791,12 @@ func contractStep(s *step.Step, res *resolution.Resolution) {
 				if child.Metadata != nil {
 					childM[values.MetadataKey] = child.Metadata
 				}
+				childMMetadata := childM[values.MetadataKey].(map[string]interface{})
+				if childMMetadata == nil {
+					childMMetadata = make(map[string]interface{})
+				}
+				childMMetadata[values.IteratorKey] = child.Item
+				childM[values.MetadataKey] = childMMetadata
 				childM[values.StateKey] = child.State
 				var i interface{} = childM
 				collectedChildren = append(collectedChildren, i)

diff --git a/engine/engine_test.go b/engine/engine_test.go
@@ -672,6 +672,19 @@ func TestForeach(t *testing.T) {
 	firstItem := concatList[0].(map[string]interface{})
 	firstItemOutput := firstItem[values.OutputKey].(map[string]interface{})
 	assert.Equal(t, "foo-b-bar-b", firstItemOutput["concat"])
+
+	outputExpected := map[string]string{"foo": "foo-b", "bar": "bar-b"}
+	metadata, ok := firstItem[values.MetadataKey].(map[string]interface{})
+	require.True(t, ok)
+	iterator, ok := metadata[values.IteratorKey].(map[string]interface{})
+	require.True(t, ok)
+	outputInterface, ok := iterator["output"].(map[string]interface{})
+	require.True(t, ok)
+	output := make(map[string]string)
+	for key, value := range outputInterface {
+		output[key] = fmt.Sprintf("%v", value)
+	}
+	assert.Equal(t, outputExpected, output)
 }
 
 func TestForeachWithChainedIterations(t *testing.T) {