feat: Provide values of withItems maps as JSON in {{item}}. Fixes #1905…

… (#1906)
argoproj · Jan 7, 2020 · 5d7e918 · 5d7e918
1 parent de3ffd7
commit 5d7e918
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -1989,6 +1989,12 @@ func processItem(fstTmpl *fasttemplate.Template, name string, index int, item wf
  replaceMap[fmt.Sprintf("item.%s", itemKey)] = fmt.Sprintf("%v", itemVal)
  vals = append(vals, fmt.Sprintf("%s:%s", itemKey, itemVal))
  }
+ jsonByteVal, err := json.Marshal(item.MapVal)
+ if err != nil {
+ return "", errors.InternalWrapError(err)
+ }
+ replaceMap["item"] = string(jsonByteVal)
+
  // sort the values so that the name is deterministic
  sort.Strings(vals)
  newName = fmt.Sprintf("%s(%d:%v)", name, index, strings.Join(vals, ","))

diff --git a/workflow/controller/operator_test.go b/workflow/controller/operator_test.go
@@ -897,7 +897,7 @@ spec:
  arguments:
  parameters:
  - name: message
- value: "{{item.os}} {{item.version}}"
+ value: "{{item.os}} {{item.version}} JSON({{item}})"
  withItems:
  - {os: debian, version: 9.1}
  - {os: debian, version: 9.1}
@@ -910,7 +910,7 @@ spec:
  container:
  image: docker/whalesay:latest
  command: [sh, -c]
- args: ["cowsay {{inputs.parameters.message}}"]
+ args: ["cowsay \"{{inputs.parameters.message}}\""]
 `
 
 func TestExpandWithItemsMap(t *testing.T) {
@@ -924,6 +924,7 @@ func TestExpandWithItemsMap(t *testing.T) {
  newSteps, err := woc.expandStep(wf.Spec.Templates[0].Steps[0].Steps[0])
  assert.NoError(t, err)
  assert.Equal(t, 3, len(newSteps))
+ assert.Equal(t, "debian 9.1 JSON({\"os\":\"debian\",\"version\":9.1})", *newSteps[0].Arguments.Parameters[0].Value)
 }
 
 var suspendTemplate = `

diff --git a/workflow/validate/validate_test.go b/workflow/validate/validate_test.go
@@ -1214,6 +1214,8 @@ spec:
  - false
  - string
  - 1.2
+ - os: "debian"
+ version: "9.0"
 
  - name: whalesay
  inputs: