fix: Use pull request number from issue comment payload

this uses the pull request number from issue commnet
payload instead of doing hack to getting the number from
pull request URL.

Signed-off-by: Zaki Shaikh <zashaikh@redhat.com>

Author: zakisk

pkg/provider/github/acl.go

@@ -142,14 +142,14 @@ func (v *Provider) aclAllowedOkToTestFromAnOwner(ctx context.Context, event *inf
 		if !v.pacInfo.RememberOKToTest {
 			return v.aclAllowedOkToTestCurrentComment(ctx, revent, event.Comment.GetID())
 		}
-		revent.URL = event.Issue.GetPullRequestLinks().GetHTMLURL()
+		revent.PullRequestNumber = event.GetIssue().GetNumber()
 	case *github.PullRequestEvent:
 		// if we don't need to check old comments, then on push event we don't need
 		// to check anything for the non-allowed user
 		if !v.pacInfo.RememberOKToTest {
 			return false, nil
 		}
-		revent.URL = event.GetPullRequest().GetHTMLURL()
+		revent.PullRequestNumber = event.GetPullRequest().GetNumber()
 	default:
 		return false, nil
 	}
@@ -330,10 +330,6 @@ func (v *Provider) getFileFromDefaultBranch(ctx context.Context, path string, ru
 // the comments text of a pull request.
 func (v *Provider) GetStringPullRequestComment(ctx context.Context, runevent *info.Event) ([]*github.IssueComment, error) {
 	var ret []*github.IssueComment
-	prNumber, err := convertPullRequestURLtoNumber(runevent.URL)
-	if err != nil {
-		return nil, err
-	}
 
 	opt := &github.IssueListCommentsOptions{
 		ListOptions: github.ListOptions{PerPage: v.PaginedNumber},
@@ -344,7 +340,7 @@ func (v *Provider) GetStringPullRequestComment(ctx context.Context, runevent *in
 	for page := 0; page < maxCommentPages; page++ {
 		comments, resp, err := wrapAPI(v, "list_issue_comments", func() ([]*github.IssueComment, *github.Response, error) {
 			return v.Client().Issues.ListComments(ctx, runevent.Organization, runevent.Repository,
-				prNumber, opt)
+				runevent.PullRequestNumber, opt)
 		})
 		if err != nil {
 			return nil, err

pkg/provider/github/acl_test.go

@@ -125,6 +125,7 @@ func TestOkToTestComment(t *testing.T) {
 						PullRequestLinks: &github.PullRequestLinks{
 							HTMLURL: github.Ptr("http://url.com/owner/repo/1"),
 						},
+						Number: github.Ptr(1),
 					},
 				},
 			},
@@ -142,6 +143,7 @@ func TestOkToTestComment(t *testing.T) {
 				Event: &github.PullRequestEvent{
 					PullRequest: &github.PullRequest{
 						HTMLURL: github.Ptr("http://url.com/owner/repo/1"),
+						Number:  github.Ptr(1),
 					},
 				},
 			},
@@ -178,6 +180,7 @@ func TestOkToTestComment(t *testing.T) {
 						PullRequestLinks: &github.PullRequestLinks{
 							HTMLURL: github.Ptr("http://url.com/owner/repo/1"),
 						},
+						Number: github.Ptr(1),
 					},
 				},
 			},
@@ -197,6 +200,7 @@ func TestOkToTestComment(t *testing.T) {
 						PullRequestLinks: &github.PullRequestLinks{
 							HTMLURL: github.Ptr("http://url.com/owner/repo/1"),
 						},
+						Number: github.Ptr(1),
 					},
 				},
 			},
@@ -308,6 +312,7 @@ func TestOkToTestComment(t *testing.T) {
 						PullRequestLinks: &github.PullRequestLinks{
 							HTMLURL: github.Ptr("http://url.com/owner/repo/1"),
 						},
+						Number: github.Ptr(1),
 					},
 				},
 			},

pkg/provider/github/github_test.go

@@ -870,13 +870,13 @@ func TestGetStringPullRequestComment(t *testing.T) {
 	}{
 		{
 			name:      "Get String from comments",
-			runevent:  info.Event{URL: "http://1"},
+			runevent:  info.Event{URL: "http://1", PullRequestNumber: 1},
 			apiReturn: `[{"body": "/ok-to-test"}]`,
 			wantRet:   true,
 		},
 		{
 			name:      "Not matching string in comments",
-			runevent:  info.Event{URL: "http://1"},
+			runevent:  info.Event{URL: "http://1", PullRequestNumber: 1},
 			apiReturn: `[{"body": ""}]`,
 			wantRet:   false,
 		},

pkg/provider/github/parse_payload.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"path"
 	"strconv"
 	"strings"
 	"time"
@@ -593,14 +592,6 @@ func (v *Provider) handleCheckSuites(ctx context.Context, event *github.CheckSui
 	return v.getPullRequest(ctx, runevent)
 }
 
-func convertPullRequestURLtoNumber(pullRequest string) (int, error) {
-	prNumber, err := strconv.Atoi(path.Base(pullRequest))
-	if err != nil {
-		return -1, fmt.Errorf("bad pull request number html_url number: %w", err)
-	}
-	return prNumber, nil
-}
-
 const (
 	errSHANotProvided        = "a SHA is required in `/ok-to-test` comments, but none was provided"
 	errSHANotProvidedComment = "The `/ok-to-test` needs to be followed by a SHA to verify which commit to test. Try again with:\n\n`/ok-to-test %s`"