fix(cli): Added validatation for StartAt, FinishedAt and ID (#6661)

* fix(cli): Added validatation for StartAt, FinishedAt and ID Signed-off-by: Saravanan Balasubramanian <sarabala1979@gmail.com> * update Signed-off-by: Saravanan Balasubramanian <sarabala1979@gmail.com>
argoproj · Sep 3, 2021 · 117e85f · 117e85f
1 parent 01083d1
commit 117e85f
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 0 deletions.
diff --git a/workflow/validate/validate.go b/workflow/validate/validate.go
@@ -844,6 +844,9 @@ func addItemsToScope(withItems []wfv1.Item, withParam string, withSequence *wfv1
 }
 
 func (ctx *templateValidationCtx) addOutputsToScope(tmpl *wfv1.Template, prefix string, scope map[string]interface{}, aggregate bool, isAncestor bool) {
+	scope[fmt.Sprintf("%s.id", prefix)] = true
+	scope[fmt.Sprintf("%s.startedAt", prefix)] = true
+	scope[fmt.Sprintf("%s.finishedAt", prefix)] = true
 	if tmpl.Daemon != nil && *tmpl.Daemon {
 		scope[fmt.Sprintf("%s.ip", prefix)] = true
 	}

diff --git a/workflow/validate/validate_dag_test.go b/workflow/validate/validate_dag_test.go
@@ -140,6 +140,9 @@ spec:
     inputs:
       parameters:
       - name: message
+      - name: startedat
+      - name: finishedat
+      - name: id
     container:
       image: alpine:3.7
       command: [echo, "{{inputs.parameters.message}}"]
@@ -157,20 +160,38 @@ spec:
           parameters:
           - name: message
             value: val
+          - name: startedat
+            value: "test"
+          - name: finishedat
+            value: "test"
+          - name: id
+            value: "1"
       - name: B
         dependencies: [A]
         template: echo
         arguments:
           parameters:
           - name: message
             value: "{{tasks.A.outputs.parameters.hosts}}"
+          - name: startedat
+            value: "{{tasks.A.startedAt}}"
+          - name: finishedat
+            value: "{{tasks.A.finishedAt}}"
+          - name: id
+            value: "{{tasks.A.id}}"
       - name: C
         dependencies: [B]
         template: echo
         arguments:
           parameters:
           - name: message
             value: "{{tasks.A.outputs.parameters.hosts}}"
+          - name: startedat
+            value: "{{tasks.A.startedAt}}"
+          - name: finishedat
+            value: "{{tasks.A.finishedAt}}"
+          - name: id
+            value: "{{tasks.A.id}}"
 `
 
 var dagResolvedVarNotAncestor = `

diff --git a/workflow/validate/validate_test.go b/workflow/validate/validate_test.go
@@ -2869,3 +2869,45 @@ spec:
 	}
 	assert.Equal(t, expectedOrder, taskOrderAfterSort)
 }
+
+func TestValidateStartedATVariable(t *testing.T) {
+	wf := `apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: steps-timing-
+spec:
+  entrypoint: steps-timing
+  templates:
+    
+    - name: steps-timing
+      steps:
+        - - name: one
+            template: wait
+        - - name: print-processing-time
+            template: printer
+            arguments:
+              parameters:
+                - name: startedat
+                  value: "{{steps.one.startedAt}}"
+                - name: finishedat
+                  value: "{{steps.one.finishedAt}}"
+                - name: id
+                  value: "{{steps.one.id}}"
+    
+    - name: wait
+      container:
+        image: alpine:3.7
+        command: [sleep, "5"]
+    
+    - name: printer
+      inputs:
+        parameters:
+          - name: startedat
+          - name: finishedat
+          - name: id
+      container:
+        image: alpine:3.7
+        command: [echo, "{{inputs.parameters.startedat}}"]`
+	_, err := validate(wf)
+	assert.NoError(t, err)
+}