Handle ref/heads/* for both base branch and target branch

if base branch has refs/heads but target annotation only has branch
name, it use to fails
for eg. target annotation is main and for push rerequested action
the base branch would be refs/heads/main
not this checks both ways if any of base branch or taget branch has refs/heads
and then matches.

Signed-off-by: Shivam Mukhade <[email protected]>

Author: Shivam Mukhade

pkg/matcher/annotation_matcher.go

@@ -40,6 +40,15 @@ func branchMatch(prunBranch, baseBranch string) bool {
 		}
 	}
 
+	// if base is refs/heads/.. and target is without ref (for push rerequested action)
+	if strings.HasPrefix(baseBranch, "refs/heads") && !strings.Contains(prunBranch, "/") {
+		prunRef := "refs/heads/" + prunBranch
+		g := glob.MustCompile(prunRef)
+		if g.Match(baseBranch) {
+			return true
+		}
+	}
+
 	// match globs like refs/tags/0.*
 	g := glob.MustCompile(prunBranch)
 	return g.Match(baseBranch)

pkg/matcher/annotation_matcher_test.go

@@ -911,6 +911,14 @@ func TestMatchPipelinerunByAnnotation(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "ref-heads-main-push-rerequested-case",
+			args: args{
+				pruns:    []*tektonv1beta1.PipelineRun{pipelineGood},
+				runevent: info.Event{TriggerTarget: "pull_request", EventType: "pull_request", BaseBranch: "refs/heads/main"},
+			},
+			wantErr: false,
+		},
 	}
 
 	for _, tt := range tests {