Fix: PLR Definition Issue When Provenance is Set in GitLab

Issue: In GitLab, when provenance is set to default_branch,
the API call to get .tekton directory tree is correct and fetching
the tree as per provenance but when each is file is fetched as raw
its using `source` as provenance no matter what value has been set
in Repository CR.

Solution: This pull request use revision correctly in concatAllYamlFiles
func to make it obey provenance settings.

Signed-off-by: Zaki Shaikh <[email protected]>

Author: zakisk

pkg/provider/gitlab/acl_test.go

@@ -108,7 +108,7 @@ func TestIsAllowed(t *testing.T) {
 					thelp.MuxDisallowUserID(mux, tt.fields.targetProjectID, tt.allowMemberID)
 				}
 				if tt.ownerFile != "" {
-					thelp.MuxGetFile(mux, tt.fields.targetProjectID, "OWNERS", tt.ownerFile)
+					thelp.MuxGetFile(mux, tt.fields.targetProjectID, "OWNERS", tt.ownerFile, false)
 				}
 				if tt.commentContent != "" {
 					thelp.MuxDiscussionsNote(mux, tt.fields.targetProjectID,

pkg/provider/gitlab/gitlab.go

@@ -295,16 +295,16 @@ func (v *Provider) GetTektonDir(_ context.Context, event *info.Event, path, prov
 		}
 	}
 
-	return v.concatAllYamlFiles(nodes, event)
+	return v.concatAllYamlFiles(nodes, revision)
 }
 
 // concatAllYamlFiles concat all yaml files from a directory as one big multi document yaml string.
-func (v *Provider) concatAllYamlFiles(objects []*gitlab.TreeNode, runevent *info.Event) (string, error) {
+func (v *Provider) concatAllYamlFiles(objects []*gitlab.TreeNode, revision string) (string, error) {
 	var allTemplates string
 	for _, value := range objects {
 		if strings.HasSuffix(value.Name, ".yaml") ||
 			strings.HasSuffix(value.Name, ".yml") {
-			data, _, err := v.getObject(value.Path, runevent.HeadBranch, v.sourceProjectID)
+			data, _, err := v.getObject(value.Path, revision, v.sourceProjectID)
 			if err != nil {
 				return "", err
 			}

pkg/provider/gitlab/gitlab_test.go

@@ -399,6 +399,8 @@ func TestGetTektonDir(t *testing.T) {
 		args                 args
 		wantStr              string
 		wantErr              string
+		wantTreeAPIErr       bool
+		wantFilesAPIErr      bool
 		wantClient           bool
 		prcontent            string
 		filterMessageSnippet string
@@ -472,6 +474,38 @@ func TestGetTektonDir(t *testing.T) {
 			wantClient: true,
 			wantStr:    "kind: PipelineRun",
 		},
+		{
+			name:      "list tekton dir tree api call error",
+			prcontent: strings.TrimPrefix(string(samplePR), "---"),
+			args: args{
+				path: ".tekton",
+				event: &info.Event{
+					HeadBranch: "main",
+				},
+			},
+			fields: fields{
+				sourceProjectID: 100,
+			},
+			wantClient:     true,
+			wantTreeAPIErr: true,
+			wantErr:        "failed to list .tekton dir",
+		},
+		{
+			name:      "get file raw api call error",
+			prcontent: strings.TrimPrefix(string(samplePR), "---"),
+			args: args{
+				path: ".tekton",
+				event: &info.Event{
+					HeadBranch: "main",
+				},
+			},
+			fields: fields{
+				sourceProjectID: 100,
+			},
+			wantClient:      true,
+			wantFilesAPIErr: true,
+			wantErr:         "failed to get filename from api pr.yaml dir",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -493,7 +527,7 @@ func TestGetTektonDir(t *testing.T) {
 					muxbranch = tt.args.event.DefaultBranch
 				}
 				if tt.args.path != "" && tt.prcontent != "" {
-					thelp.MuxListTektonDir(t, mux, tt.fields.sourceProjectID, muxbranch, tt.prcontent)
+					thelp.MuxListTektonDir(t, mux, tt.fields.sourceProjectID, muxbranch, tt.prcontent, tt.wantTreeAPIErr, tt.wantFilesAPIErr)
 				}
 				defer tearDown()
 			}
@@ -528,7 +562,7 @@ func TestGetFileInsideRepo(t *testing.T) {
 		sourceProjectID: 10,
 		Client:          client,
 	}
-	thelp.MuxListTektonDir(t, mux, v.sourceProjectID, event.HeadBranch, content)
+	thelp.MuxListTektonDir(t, mux, v.sourceProjectID, event.HeadBranch, content, false, false)
 	got, err := v.GetFileInsideRepo(ctx, event, "pr.yaml", "")
 	assert.NilError(t, err)
 	assert.Equal(t, content, got)

pkg/provider/gitlab/test/test.go

@@ -66,8 +66,12 @@ func MuxDisallowUserID(mux *http.ServeMux, projectID, userID int) {
 	})
 }
 
-func MuxListTektonDir(_ *testing.T, mux *http.ServeMux, pid int, ref, prs string) {
+func MuxListTektonDir(_ *testing.T, mux *http.ServeMux, pid int, ref, prs string, wantTreeAPIErr, wantFilesAPIErr bool) {
 	mux.HandleFunc(fmt.Sprintf("/projects/%d/repository/tree", pid), func(rw http.ResponseWriter, r *http.Request) {
+		if wantTreeAPIErr {
+			rw.WriteHeader(http.StatusUnauthorized)
+			return
+		}
 		if r.URL.Query().Get("pagination") == "keyset" {
 			if r.URL.Query().Get("ref") == ref {
 				if r.URL.Query().Get("page_token") != "page2" {
@@ -87,8 +91,8 @@ func MuxListTektonDir(_ *testing.T, mux *http.ServeMux, pid int, ref, prs string
 		}
 	})
 
-	MuxGetFile(mux, pid, "pr.yaml", prs)
-	MuxGetFile(mux, pid, "random.yaml", `foo:bar`)
+	MuxGetFile(mux, pid, "pr.yaml", prs, wantFilesAPIErr)
+	MuxGetFile(mux, pid, "random.yaml", `foo:bar`, wantTreeAPIErr)
 }
 
 func MuxDiscussionsNoteEmpty(mux *http.ServeMux, pid, mrID int) {
@@ -120,8 +124,12 @@ func MuxDiscussionsNote(mux *http.ServeMux, pid, mrID int, author string, author
 	})
 }
 
-func MuxGetFile(mux *http.ServeMux, pid int, fname, content string) {
+func MuxGetFile(mux *http.ServeMux, pid int, fname, content string, wantErr bool) {
 	mux.HandleFunc(fmt.Sprintf("/projects/%d/repository/files/%s/raw", pid, fname), func(rw http.ResponseWriter, _ *http.Request) {
+		if wantErr {
+			rw.WriteHeader(http.StatusUnauthorized)
+			return
+		}
 		fmt.Fprint(rw, content)
 	})
 }