adding unit tests for pipelineTaskList.Deps

pkg/apis/pipeline/v1beta1/pipeline_types.go

@@ -181,7 +181,6 @@ func (pt PipelineTask) Deps() []string {
  continue
  }
  uniqueDeps.Insert(w)
-
  }
 
  return uniqueDeps.List()
@@ -236,30 +235,24 @@ func (pt PipelineTask) resourceDeps() []string {
 
 func (pt PipelineTask) orderingDeps() []string {
  orderingDeps := []string{}
- resourceDeps := pt.resourceDeps()
  for _, runAfter := range pt.RunAfter {
- if !contains(runAfter, resourceDeps) {
- orderingDeps = append(orderingDeps, runAfter)
- }
+ orderingDeps = append(orderingDeps, runAfter)
  }
  return orderingDeps
 }
 
-func contains(s string, arr []string) bool {
- for _, elem := range arr {
- if elem == s {
- return true
- }
- }
- return false
-}
-
 type PipelineTaskList []PipelineTask
 
+// Deps returns a map with key as name of a pipelineTask and value as a list of its dependencies
 func (l PipelineTaskList) Deps() map[string][]string {
  deps := map[string][]string{}
  for _, pt := range l {
- deps[pt.HashKey()] = pt.Deps()
+ // get the list of deps for this pipelineTask
+ d := pt.Deps()
+ // add the pipelineTask into the map if it has any deps
+ if len(d) > 0 {
+ deps[pt.HashKey()] = d
+ }
  }
  return deps
 }

pkg/apis/pipeline/v1beta1/pipeline_types_test.go

@@ -39,3 +39,182 @@ func TestPipelineTaskList_Names(t *testing.T) {
  t.Fatalf("Failed to get list of pipeline task names, diff: %s", diff.PrintWantGot(d))
  }
 }
+
+func TestPipelineTaskList_Deps(t *testing.T) {
+ pipelines := []struct {
+ name string
+ tasks PipelineTaskList
+ expectedDeps map[string][]string
+ }{{
+ name: "valid pipeline without any deps",
+ tasks: []PipelineTask{
+ {Name: "task-1"},
+ {Name: "task-2"},
+ },
+ expectedDeps: map[string][]string{},
+ }, {
+ name: "valid pipeline with ordering deps - runAfter",
+ tasks: []PipelineTask{
+ {Name: "task-1"},
+ {Name: "task-2", RunAfter: []string{"task-1"}},
+ },
+ expectedDeps: map[string][]string{
+ "task-2": {"task-1"},
+ },
+ }, {
+ name: "valid pipeline with resource deps - Inputs",
+ tasks: []PipelineTask{{
+ Name: "task-1",
+ }, {
+ Name: "task-2",
+ }, {
+ Name: "task-3",
+ Resources: &PipelineTaskResources{
+ Inputs: []PipelineTaskInputResource{{
+ From: []string{"task-1", "task-2"},
+ }},
+ }},
+ },
+ expectedDeps: map[string][]string{
+ "task-3": {"task-1", "task-2"},
+ },
+ }, {
+ name: "valid pipeline with resource deps - Task Results",
+ tasks: []PipelineTask{{
+ Name: "task-1",
+ }, {
+ Name: "task-2",
+ Params: []Param{{
+ Value: ArrayOrString{
+ Type: "string",
+ StringVal: "$(tasks.task-1.results.result)",
+ }},
+ }},
+ },
+ expectedDeps: map[string][]string{
+ "task-2": {"task-1"},
+ },
+ }, {
+ name: "valid pipeline with resource deps - When Expressions",
+ tasks: []PipelineTask{{
+ Name: "task-1",
+ }, {
+ Name: "task-2",
+ WhenExpressions: WhenExpressions{{
+ Input: "$(tasks.task-1.results.result)",
+ Operator: "in",
+ Values: []string{"foo"},
+ }},
+ }},
+ expectedDeps: map[string][]string{
+ "task-2": {"task-1"},
+ },
+ }, {
+ name: "valid pipeline with ordering deps and resource deps",
+ tasks: []PipelineTask{{
+ Name: "task-1",
+ }, {
+ Name: "task-2", RunAfter: []string{"task-1"},
+ }, {
+ Name: "task-3",
+ RunAfter: []string{"task-1"},
+ Resources: &PipelineTaskResources{
+ Inputs: []PipelineTaskInputResource{{
+ From: []string{"task-1", "task-2"},
+ }},
+ },
+ }, {
+ Name: "task-4",
+ RunAfter: []string{"task-1"},
+ Params: []Param{{
+ Value: ArrayOrString{
+ Type: "string",
+ StringVal: "$(tasks.task-3.results.result)",
+ }},
+ },
+ }, {
+ Name: "task-5",
+ RunAfter: []string{"task-1"},
+ WhenExpressions: WhenExpressions{{
+ Input: "$(tasks.task-4.results.result)",
+ Operator: "in",
+ Values: []string{"foo"},
+ }},
+ }},
+ expectedDeps: map[string][]string{
+ "task-2": {"task-1"},
+ "task-3": {"task-1", "task-2"},
+ "task-4": {"task-1", "task-3"},
+ "task-5": {"task-1", "task-4"},
+ },
+ }, {
+ name: "valid pipeline with ordering deps and resource deps - verify unique dependencies",
+ tasks: []PipelineTask{{
+ Name: "task-1",
+ }, {
+ Name: "task-2", RunAfter: []string{"task-1"},
+ }, {
+ Name: "task-3",
+ RunAfter: []string{"task-1"},
+ Resources: &PipelineTaskResources{
+ Inputs: []PipelineTaskInputResource{{
+ From: []string{"task-1", "task-2"},
+ }},
+ },
+ }, {
+ Name: "task-4",
+ RunAfter: []string{"task-1", "task-3"},
+ Resources: &PipelineTaskResources{
+ Inputs: []PipelineTaskInputResource{{
+ From: []string{"task-1", "task-2"},
+ }},
+ },
+ Params: []Param{{
+ Value: ArrayOrString{
+ Type: "string",
+ StringVal: "$(tasks.task-2.results.result)",
+ }}, {
+ Value: ArrayOrString{
+ Type: "string",
+ StringVal: "$(tasks.task-3.results.result)",
+ }},
+ },
+ }, {
+ Name: "task-5",
+ RunAfter: []string{"task-1", "task-2", "task-3", "task-4"},
+ Resources: &PipelineTaskResources{
+ Inputs: []PipelineTaskInputResource{{
+ From: []string{"task-1", "task-2"},
+ }},
+ },
+ Params: []Param{{
+ Value: ArrayOrString{
+ Type: "string",
+ StringVal: "$(tasks.task-4.results.result)",
+ }},
+ },
+ WhenExpressions: WhenExpressions{{
+ Input: "$(tasks.task-3.results.result)",
+ Operator: "in",
+ Values: []string{"foo"},
+ }, {
+ Input: "$(tasks.task-4.results.result)",
+ Operator: "in",
+ Values: []string{"foo"},
+ }},
+ }},
+ expectedDeps: map[string][]string{
+ "task-2": {"task-1"},
+ "task-3": {"task-1", "task-2"},
+ "task-4": {"task-1", "task-2", "task-3"},
+ "task-5": {"task-1", "task-2", "task-3", "task-4"},
+ },
+ }}
+ for _, tc := range pipelines {
+ t.Run(tc.name, func(t *testing.T) {
+ if d := cmp.Diff(tc.expectedDeps, tc.tasks.Deps()); d != "" {
+ t.Fatalf("Failed to get the right set of dependencies, diff: %s", diff.PrintWantGot(d))
+ }
+ })
+ }
+}