Fix incoming webhook with github apps

When incoming webhook and github apps is set it will try to use the
webhook secret from the incoming webhook instead of the current
namespace.

Remove InfoFromRepo since we don't need and it's GH specific.

Closes #744

Signed-off-by: Chmouel Boudjnah <[email protected]>

Author: chmouel

pkg/params/info/events.go

@@ -63,7 +63,6 @@ type Provider struct {
 	Token                 string
 	URL                   string
 	User                  string
-	InfoFromRepo          bool // whether the provider info come from the repository
 	WebhookSecret         string
 	WebhookSecretFromRepo bool
 }

pkg/pipelineascode/match.go

@@ -57,7 +57,7 @@ func (p *PacRun) matchRepoPR(ctx context.Context) ([]matcher.Match, *v1alpha1.Re
 	// allow webhook providers users to have a global webhook secret to be used,
 	// so instead of having to specify their in Repo each time, they use a
 	// shared one from pac.
-	if repo.Spec.GitProvider != nil {
+	if repo.Spec.GitProvider != nil && p.event.InstallationID <= 0 {
 		err := SecretFromRepository(ctx, p.run, p.k8int, p.vcx.GetConfig(), p.event, repo, p.logger)
 		if err != nil {
 			return nil, nil, err

pkg/pipelineascode/pipelinesascode_github_test.go

@@ -445,9 +445,8 @@ func TestRun(t *testing.T) {
 				Payload: payload,
 			}
 			tt.runevent.Provider = &info.Provider{
-				InfoFromRepo: tt.ProviderInfoFromRepo,
-				URL:          ghTestServerURL,
-				Token:        "NONE",
+				URL:   ghTestServerURL,
+				Token: "NONE",
 			}
 
 			k8int := &kitesthelper.KinterfaceTest{
@@ -456,6 +455,12 @@ func TestRun(t *testing.T) {
 				GetSecretResult:          secrets,
 			}
 
+			// InstallationID > 0 is used to detect if we are a GitHub APP
+			tt.runevent.InstallationID = 12345
+			if tt.ProviderInfoFromRepo {
+				tt.runevent.InstallationID = 0
+			}
+
 			vcx := &ghprovider.Provider{
 				Client: fakeclient,
 				Token:  github.String("None"),

pkg/pipelineascode/secret.go

@@ -47,7 +47,6 @@ func SecretFromRepository(ctx context.Context, cs *params.Run, k8int kubeinterac
 	if event.Provider.Token == "" {
 		return nil
 	}
-	event.Provider.InfoFromRepo = true
 	event.Provider.User = repo.Spec.GitProvider.User
 
 	if repo.Spec.GitProvider.WebhookSecret == nil {

pkg/pipelineascode/secret_test.go

@@ -123,7 +123,6 @@ func TestSecretFromRepository(t *testing.T) {
 			for key, value := range logs {
 				assert.Assert(t, tt.logmatch[key].MatchString(value.Message), "no match on logs %s => %s", tt.logmatch[key], value.Message)
 			}
-			assert.Assert(t, event.Provider.InfoFromRepo)
 			assert.Equal(t, tt.expectedSecret, event.Provider.Token)
 		})
 	}

pkg/provider/github/status.go

@@ -237,8 +237,11 @@ func (v *Provider) CreateStatus(ctx context.Context, tekton versioned.Interface,
 	}
 	statusOpts.Summary = fmt.Sprintf("%s%s %s", pacopts.ApplicationName, onPr, statusOpts.Summary)
 
-	if runevent.Provider.InfoFromRepo {
-		return v.createStatusCommit(ctx, runevent, pacopts, statusOpts)
+	// If we have an installationID which mean we have a github apps and we can use the checkRun API
+	if runevent.InstallationID > 0 {
+		return v.getOrUpdateCheckRunStatus(ctx, tekton, runevent, pacopts, statusOpts)
 	}
-	return v.getOrUpdateCheckRunStatus(ctx, tekton, runevent, pacopts, statusOpts)
+
+	// Otherwise use the update status commit API
+	return v.createStatusCommit(ctx, runevent, pacopts, statusOpts)
 }

pkg/provider/github/status_test.go

@@ -113,6 +113,7 @@ func TestGithubProviderCreateStatus(t *testing.T) {
 		detailsURL         string
 		titleSubstr        string
 		nilCompletedAtDate bool
+		githubApps         bool
 	}
 	tests := []struct {
 		name    string
@@ -130,6 +131,21 @@ func TestGithubProviderCreateStatus(t *testing.T) {
 				text:        "Yay",
 				detailsURL:  "https://cireport.com",
 				titleSubstr: "Success",
+				githubApps:  true,
+			},
+			want:    &github.CheckRun{ID: &resultid},
+			wantErr: false,
+		},
+		{
+			name: "success coming from webhook",
+			args: args{
+				runevent:    runEvent,
+				status:      "completed",
+				conclusion:  "success",
+				text:        "Yay",
+				detailsURL:  "https://cireport.com",
+				titleSubstr: "Success",
+				githubApps:  false,
 			},
 			want:    &github.CheckRun{ID: &resultid},
 			wantErr: false,
@@ -143,6 +159,7 @@ func TestGithubProviderCreateStatus(t *testing.T) {
 				text:               "Yay",
 				detailsURL:         "https://cireport.com",
 				nilCompletedAtDate: true,
+				githubApps:         true,
 			},
 			want:    &github.CheckRun{ID: &resultid},
 			wantErr: false,
@@ -156,6 +173,7 @@ func TestGithubProviderCreateStatus(t *testing.T) {
 				text:        "Nay",
 				detailsURL:  "https://cireport.com",
 				titleSubstr: "Failed",
+				githubApps:  true,
 			},
 			want:    &github.CheckRun{ID: &resultid},
 			wantErr: false,
@@ -169,6 +187,7 @@ func TestGithubProviderCreateStatus(t *testing.T) {
 				text:        "Skipit",
 				detailsURL:  "https://cireport.com",
 				titleSubstr: "Skipped",
+				githubApps:  true,
 			},
 			want:    &github.CheckRun{ID: &resultid},
 			wantErr: false,
@@ -182,6 +201,7 @@ func TestGithubProviderCreateStatus(t *testing.T) {
 				text:        "Je sais pas ce qui se passe wesh",
 				detailsURL:  "https://cireport.com",
 				titleSubstr: "Unknown",
+				githubApps:  true,
 			},
 			want:    &github.CheckRun{ID: &resultid},
 			wantErr: false,
@@ -201,6 +221,7 @@ func TestGithubProviderCreateStatus(t *testing.T) {
 			gcvs := Provider{
 				Client: fakeclient,
 			}
+			mux.HandleFunc("/repos/check/run/statuses/sha", func(rw http.ResponseWriter, r *http.Request) {})
 			mux.HandleFunc(fmt.Sprintf("/repos/check/run/check-runs/%d", checkrunid), func(rw http.ResponseWriter, r *http.Request) {
 				bit, _ := ioutil.ReadAll(r.Body)
 				checkRun := &github.CheckRun{}
@@ -232,13 +253,18 @@ func TestGithubProviderCreateStatus(t *testing.T) {
 			pacopts := &info.PacOpts{
 				LogURL: "https://log",
 			}
-			if !tt.notoken {
+			if tt.notoken {
+				tt.args.runevent = info.NewEvent()
+			} else {
 				tt.args.runevent.Provider = &info.Provider{
 					Token: "hello",
 					URL:   "moto",
 				}
-			} else {
-				tt.args.runevent = info.NewEvent()
+				if tt.args.githubApps {
+					tt.args.runevent.InstallationID = 12345
+				} else {
+					tt.args.runevent.SHA = "sha"
+				}
 			}
 			err := gcvs.CreateStatus(ctx, nil, tt.args.runevent, pacopts, status)
 			if (err != nil) != tt.wantErr {