fix: Support terminating with templateRef. Fixes #7214 (#7657)

Signed-off-by: Alex Collins <alex_collins@intuit.com>
argoproj · Jan 27, 2022 · e69f2d7 · e69f2d7
1 parent db7d90a
commit e69f2d7
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/pkg/apis/workflow/v1alpha1/workflow_types.go b/pkg/apis/workflow/v1alpha1/workflow_types.go
@@ -2630,6 +2630,11 @@ func (wf *Workflow) GetTemplateByName(name string) *Template {
 			}
 		}
 	}
+	for _, t := range wf.Status.StoredTemplates {
+		if t.Name == name {
+			return &t
+		}
+	}
 	return nil
 }
 

diff --git a/pkg/apis/workflow/v1alpha1/workflow_types_test.go b/pkg/apis/workflow/v1alpha1/workflow_types_test.go
@@ -32,6 +32,41 @@ func TestWorkflows(t *testing.T) {
 	})
 }
 
+func TestGetTemplateByName(t *testing.T) {
+	t.Run("Spec", func(t *testing.T) {
+		wf := &Workflow{
+			Spec: WorkflowSpec{
+				Templates: []Template{
+					{Name: "my-tmpl"},
+				},
+			},
+		}
+		assert.NotNil(t, wf.GetTemplateByName("my-tmpl"))
+	})
+	t.Run("StoredWorkflowSpec", func(t *testing.T) {
+		wf := &Workflow{
+			Status: WorkflowStatus{
+				StoredWorkflowSpec: &WorkflowSpec{
+					Templates: []Template{
+						{Name: "my-tmpl"},
+					},
+				},
+			},
+		}
+		assert.NotNil(t, wf.GetTemplateByName("my-tmpl"))
+	})
+	t.Run("StoredTemplates", func(t *testing.T) {
+		wf := &Workflow{
+			Status: WorkflowStatus{
+				StoredTemplates: map[string]Template{
+					"": {Name: "my-tmpl"},
+				},
+			},
+		}
+		assert.NotNil(t, wf.GetTemplateByName("my-tmpl"))
+	})
+}
+
 func TestWorkflowCreatedAfter(t *testing.T) {
 	t0 := time.Time{}
 	t1 := t0.Add(time.Second)