Added the outputs.parameters.<NAME>.path placeholder

argoproj · Apr 2, 2019 · 5ad8197 · 5ad8197
1 parent c0ac699
commit 5ad8197
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/docs/variables.md b/docs/variables.md
@@ -30,6 +30,7 @@ The following variables are made available to reference various metadata of a wo
 | `pod.name` | Pod name of the container/script |
 | `inputs.artifacts.<NAME>.path` | Local path of the input artifact |
 | `outputs.artifacts.<NAME>.path` | Local path of the output artifact |
+| `outputs.parameters.<NAME>.path` | Local path of the output parameter |
 
 ## Loops (withItems / withParam)
 | Variable | Description|

diff --git a/workflow/common/util.go b/workflow/common/util.go
@@ -205,6 +205,12 @@ func substituteParams(tmpl *wfv1.Template, globalParams, localParams map[string]
 			replaceMap["outputs.artifacts."+outArt.Name+".path"] = outArt.Path
 		}
 	}
+	for _, param := range globalReplacedTmpl.Outputs.Parameters {
+		if param.ValueFrom != nil && param.ValueFrom.Path != "" {
+			replaceMap["outputs.parameters."+param.Name+".path"] = param.ValueFrom.Path
+		}
+	}
+
 	fstTmpl = fasttemplate.New(globalReplacedTmplStr, "{{", "}}")
 	s, err := Replace(fstTmpl, replaceMap, true)
 	if err != nil {

diff --git a/workflow/validate/validate.go b/workflow/validate/validate.go
@@ -125,6 +125,11 @@ func (ctx *wfValidationCtx) validateTemplate(tmpl *wfv1.Template, args wfv1.Argu
 				scope[fmt.Sprintf("outputs.artifacts.%s.path", art.Name)] = true
 			}
 		}
+		for _, param := range tmpl.Outputs.Parameters {
+			if param.ValueFrom != nil && param.ValueFrom.Path != "" {
+				scope[fmt.Sprintf("outputs.parameters.%s.path", param.Name)] = true
+			}
+		}
 	}
 
 	_, err = common.ProcessArgs(tmpl, args, ctx.globalParams, localParams, true)

diff --git a/workflow/validate/validate_test.go b/workflow/validate/validate_test.go
@@ -195,6 +195,30 @@ func TestResolveIOArtifactPathPlaceholders(t *testing.T) {
 	assert.Nil(t, err)
 }
 
+var outputParameterPath = `
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: get-current-date-
+spec:
+  entrypoint: get-current-date
+  templates:
+  - name: get-current-date
+    outputs:
+      parameters:
+      - name: current-date
+        valueFrom:
+          path: /tmp/current-date
+    container:
+      image: busybox
+      command: [sh, -c, 'date > {{outputs.parameters.current-date.path}}']
+`
+
+func TestResolveOutputParameterPathPlaceholder(t *testing.T) {
+	err := validate(outputParameterPath)
+	assert.Nil(t, err)
+}
+
 var stepOutputReferences = `
 apiVersion: argoproj.io/v1alpha1
 kind: Workflow