jfrog · omerzi · Aug 13, 2023 · Aug 8, 2023 · Aug 8, 2023 · Aug 8, 2023
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
 - [ ] All [tests](https://github.com/jfrog/froggit-go/actions/workflows/test.yml) passed. If this feature is not already covered by the tests, I added new tests.
 - [ ] I used `go fmt ./...` for formatting the code before submitting the pull request.
-- [ ] This feature is included on all supported VCS providers - GitHub, Bitbucket cloud, Bitbucket server, and GitLab.
+- [ ] This feature is included on all supported VCS providers - GitHub, Bitbucket cloud, Bitbucket server, GitLab and Azure Repos.
 
 ---
diff --git a/go.mod b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/stretchr/testify v1.8.4
 	github.com/xanzy/go-gitlab v0.88.0
+	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
 	golang.org/x/oauth2 v0.10.0
 )
 
@@ -40,7 +41,6 @@ require (
 	github.com/skeema/knownhosts v1.2.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
 	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.13.0 // indirect
 	golang.org/x/sys v0.10.0 // indirect

diff --git a/go.sum b/go.sum
@@ -1079,7 +1079,6 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
 golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
 golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=

diff --git a/vcsclient/azurerepos.go b/vcsclient/azurerepos.go
@@ -586,7 +586,7 @@ func parsePullRequestDetails(client *AzureReposClient, pullRequest git.GitPullRe
 		prBody = *bodyPtr
 	}
 
-	// When a pull request is from a forked repository,extract the owner.
+	// When a pull request is from a forked repository, extract the owner.
 	sourceRepoOwner := owner
 	if pullRequest.ForkSource != nil {
 		if sourceRepoOwner = extractOwnerFromForkedRepoUrl(pullRequest.ForkSource); sourceRepoOwner == "" {
@@ -597,6 +597,7 @@ func parsePullRequestDetails(client *AzureReposClient, pullRequest git.GitPullRe
 	return PullRequestInfo{
 		ID:   int64(*pullRequest.PullRequestId),
 		Body: prBody,
+		URL:  vcsutils.DefaultIfNotNil(pullRequest.Url),
 		Source: BranchInfo{
 			Name:       shortSourceName,
 			Repository: repository,

diff --git a/vcsclient/azurerepos_test.go b/vcsclient/azurerepos_test.go
@@ -185,13 +185,15 @@ func TestAzureRepos_TestListOpenPullRequests(t *testing.T) {
 		Count int
 	}
 	pullRequestId := 1
+	url := "https://dev.azure.com/owner/project/_git/repo/pullrequest/47"
 	res := ListOpenPullRequestsResponse{
 		Value: []git.GitPullRequest{
 			{
 				PullRequestId: &pullRequestId,
 				Repository:    &git.GitRepository{Name: &repo1},
 				SourceRefName: &branch1,
 				TargetRefName: &branch2,
+				Url:           &url,
 			},
 		},
 		Count: 1,
@@ -203,7 +205,14 @@ func TestAzureRepos_TestListOpenPullRequests(t *testing.T) {
 	defer cleanUp()
 	pullRequestsInfo, err := client.ListOpenPullRequests(ctx, "", repo1)
 	assert.NoError(t, err)
-	assert.EqualValues(t, pullRequestsInfo, []PullRequestInfo{{ID: 1, Source: BranchInfo{Name: branch1, Repository: repo1}, Target: BranchInfo{Name: branch2, Repository: repo1}}})
+	assert.EqualValues(t, pullRequestsInfo, []PullRequestInfo{
+		{
+			ID:     1,
+			Source: BranchInfo{Name: branch1, Repository: repo1},
+			Target: BranchInfo{Name: branch2, Repository: repo1},
+			URL:    url,
+		},
+	})
 
 	badClient, cleanUp := createBadAzureReposClient(t, []byte{})
 	defer cleanUp()
@@ -217,6 +226,7 @@ func TestAzureRepos_TestListOpenPullRequests(t *testing.T) {
 			{
 				PullRequestId: &pullRequestId,
 				Description:   &prBody,
+				Url:           &url,
 				Repository:    &git.GitRepository{Name: &repo1},
 				SourceRefName: &branch1,
 				TargetRefName: &branch2,
@@ -231,7 +241,15 @@ func TestAzureRepos_TestListOpenPullRequests(t *testing.T) {
 	defer cleanUp()
 	pullRequestsInfo, err = client.ListOpenPullRequestsWithBody(ctx, "", repo1)
 	assert.NoError(t, err)
-	assert.EqualValues(t, pullRequestsInfo, []PullRequestInfo{{ID: 1, Body: prBody, Source: BranchInfo{Name: branch1, Repository: repo1}, Target: BranchInfo{Name: branch2, Repository: repo1}}})
+	assert.EqualValues(t, pullRequestsInfo, []PullRequestInfo{
+		{
+			ID:     1,
+			Body:   prBody,
+			Source: BranchInfo{Name: branch1, Repository: repo1},
+			Target: BranchInfo{Name: branch2, Repository: repo1},
+			URL:    url,
+		},
+	})
 
 	badClient, cleanUp = createBadAzureReposClient(t, []byte{})
 	defer cleanUp()
@@ -246,13 +264,15 @@ func TestAzureReposClient_GetPullRequest(t *testing.T) {
 	targetName := "master"
 	forkedOwner := "jfrogForked"
 	forkedSourceUrl := fmt.Sprintf("https://dev.azure.com/%s/201f2c7f-305a-446c-a1d6-a04ec811093b/_apis/git/repositories/82d33a66-8971-4279-9687-19c69e66e114", forkedOwner)
+	url := "https://dev.azure.com/owner/project/_git/repo/pullrequest/47"
 	res := git.GitPullRequest{
 		SourceRefName: &sourceName,
 		TargetRefName: &targetName,
 		PullRequestId: &pullRequestId,
 		ForkSource: &git.GitForkRef{
 			Repository: &git.GitRepository{Url: &forkedSourceUrl},
 		},
+		Url: &url,
 	}
 	jsonRes, err := json.Marshal(res)
 	assert.NoError(t, err)
@@ -261,9 +281,12 @@ func TestAzureReposClient_GetPullRequest(t *testing.T) {
 	defer cleanUp()
 	pullRequestsInfo, err := client.GetPullRequestByID(ctx, owner, repoName, pullRequestId)
 	assert.NoError(t, err)
-	assert.EqualValues(t, pullRequestsInfo, PullRequestInfo{ID: 1,
+	assert.EqualValues(t, pullRequestsInfo, PullRequestInfo{
+		ID:     1,
 		Source: BranchInfo{Name: sourceName, Repository: repoName, Owner: forkedOwner},
-		Target: BranchInfo{Name: targetName, Repository: repoName, Owner: owner}})
+		Target: BranchInfo{Name: targetName, Repository: repoName, Owner: owner},
+		URL:    url,
+	})
 
 	// Fail source repository owner extraction, should be empty string and not fail the process.
 	res = git.GitPullRequest{
@@ -273,15 +296,20 @@ func TestAzureReposClient_GetPullRequest(t *testing.T) {
 		ForkSource: &git.GitForkRef{
 			Repository: &git.GitRepository{Url: &repoName},
 		},
+		Url: &url,
 	}
 	jsonRes, err = json.Marshal(res)
 	assert.NoError(t, err)
 	client, _ = createServerAndClient(t, vcsutils.AzureRepos, true, jsonRes, fmt.Sprintf("getPullRequests/%d", pullRequestId), createAzureReposHandler)
 	pullRequestsInfo, err = client.GetPullRequestByID(ctx, owner, repoName, pullRequestId)
 	assert.NoError(t, err)
-	assert.EqualValues(t, pullRequestsInfo, PullRequestInfo{ID: 1,
+	assert.EqualValues(t, pullRequestsInfo, PullRequestInfo{
+		ID:     1,
 		Source: BranchInfo{Name: sourceName, Repository: repoName, Owner: ""},
-		Target: BranchInfo{Name: targetName, Repository: repoName, Owner: owner}})
+		Target: BranchInfo{Name: targetName, Repository: repoName, Owner: owner},
+		URL:    url,
+	},
+	)
 
 	// Bad client
 	badClient, cleanUp := createBadAzureReposClient(t, []byte{})

diff --git a/vcsclient/bitbucketserver.go b/vcsclient/bitbucketserver.go
@@ -345,30 +345,12 @@ func (client *BitbucketServerClient) getOpenPullRequests(ctx context.Context, ow
 			return nil, err
 		}
 		for _, pullRequest := range pullRequests {
-			var body string
-			if withBody {
-				body = pullRequest.Description
-			}
 			if pullRequest.Open {
-				var sourceOwner string
-				sourceOwner, err = getSourceRepositoryOwner(pullRequest)
-				if err != nil {
+				var pullRequestInfo PullRequestInfo
+				if pullRequestInfo, err = mapBitbucketServerPullRequestToPullRequestInfo(pullRequest, withBody, owner); err != nil {
 					return nil, err
 				}
-				results = append(results, PullRequestInfo{
-					ID:   int64(pullRequest.ID),
-					Body: body,
-					Source: BranchInfo{
-						Name:       pullRequest.FromRef.DisplayID,
-						Repository: pullRequest.FromRef.Repository.Slug,
-						Owner:      sourceOwner,
-					},
-					Target: BranchInfo{
-						Name:       pullRequest.ToRef.DisplayID,
-						Repository: pullRequest.ToRef.Repository.Slug,
-						Owner:      owner,
-					},
-				})
+				results = append(results, pullRequestInfo)
 			}
 		}
 	}
@@ -392,16 +374,26 @@ func (client *BitbucketServerClient) GetPullRequestByID(ctx context.Context, own
 	if err != nil {
 		return
 	}
+	pullRequestInfo, err = mapBitbucketServerPullRequestToPullRequestInfo(pullRequest, false, owner)
+	return
+}
+
+func mapBitbucketServerPullRequestToPullRequestInfo(pullRequest bitbucketv1.PullRequest, withBody bool, owner string) (PullRequestInfo, error) {
 	sourceOwner, err := getSourceRepositoryOwner(pullRequest)
 	if err != nil {
-		return
+		return PullRequestInfo{}, err
 	}
-	pullRequestInfo = PullRequestInfo{
-		ID:     int64(pullRequest.ID),
-		Source: BranchInfo{Name: pullRequest.FromRef.ID, Repository: pullRequest.ToRef.Repository.Slug, Owner: sourceOwner},
-		Target: BranchInfo{Name: pullRequest.ToRef.ID, Repository: pullRequest.ToRef.Repository.Slug, Owner: owner},
+	var body string
+	if withBody {
+		body = pullRequest.Description
 	}
-	return
+	return PullRequestInfo{
+		ID:     int64(pullRequest.ID),
+		Source: BranchInfo{Name: pullRequest.FromRef.DisplayID, Repository: pullRequest.ToRef.Repository.Slug, Owner: sourceOwner},
+		Target: BranchInfo{Name: pullRequest.ToRef.DisplayID, Repository: pullRequest.ToRef.Repository.Slug, Owner: owner},
+		Body:   body,
+		URL:    pullRequest.Links.Self[0].Href,
+	}, nil
 }
 
 // AddPullRequestComment on Bitbucket server

diff --git a/vcsclient/bitbucketserver_test.go b/vcsclient/bitbucketserver_test.go
@@ -225,6 +225,7 @@ func TestBitbucketServer_ListOpenPullRequests(t *testing.T) {
 		ID:     101,
 		Source: BranchInfo{Name: "feature-ABC-123", Repository: repo1, Owner: forkedOwner},
 		Target: BranchInfo{Name: "master", Repository: repo1, Owner: owner},
+		URL:    "https://link/to/pullrequest",
 	}, result[0])
 
 	// With body:
@@ -237,6 +238,7 @@ func TestBitbucketServer_ListOpenPullRequests(t *testing.T) {
 		Body:   "hello world",
 		Source: BranchInfo{Name: "feature-ABC-123", Repository: repo1, Owner: forkedOwner},
 		Target: BranchInfo{Name: "master", Repository: repo1, Owner: owner},
+		URL:    "https://link/to/pullrequest",
 	}, result[0])
 }
 
@@ -254,8 +256,9 @@ func TestBitbucketServerClient_GetPullRequest(t *testing.T) {
 	assert.NoError(t, err)
 	assert.EqualValues(t, PullRequestInfo{
 		ID:     int64(pullRequestId),
-		Source: BranchInfo{Name: "refs/heads/new_vul_2", Repository: "repoName", Owner: "~fromOwner"},
-		Target: BranchInfo{Name: "refs/heads/master", Repository: "repoName", Owner: owner},
+		Source: BranchInfo{Name: "new_vul_2", Repository: "repoName", Owner: "~fromOwner"},
+		Target: BranchInfo{Name: "master", Repository: "repoName", Owner: owner},
+		URL:    "https://git.bbServerHost.info/users/owner/repos/repoName/pull-requests/6",
 	}, result)
 
 	// Failed owner extraction

diff --git a/vcsclient/github.go b/vcsclient/github.go
@@ -336,27 +336,61 @@ func (client *GitHubClient) GetPullRequestByID(ctx context.Context, owner, repos
 		}
 	}
 
-	sourceBranch, err1 := extractBranchFromLabel(vcsutils.DefaultIfNotNil(pullRequest.Head.Label))
-	targetBranch, err2 := extractBranchFromLabel(vcsutils.DefaultIfNotNil(pullRequest.Base.Label))
-	err = errors.Join(err1, err2)
-	if err != nil {
-		return PullRequestInfo{}, err
+	return mapGitHubPullRequestToPullRequestInfo(pullRequest, false)
+}
+
+func mapGitHubPullRequestToPullRequestInfo(ghPullRequest *github.PullRequest, withBody bool) (PullRequestInfo, error) {
+	var sourceBranch, targetBranch string
+	var err1, err2 error
+	if ghPullRequest != nil && ghPullRequest.Head != nil && ghPullRequest.Base != nil {
+		sourceBranch, err1 = extractBranchFromLabel(vcsutils.DefaultIfNotNil(ghPullRequest.Head.Label))
+		targetBranch, err2 = extractBranchFromLabel(vcsutils.DefaultIfNotNil(ghPullRequest.Base.Label))
+		err := errors.Join(err1, err2)
+		if err != nil {
+			return PullRequestInfo{}, err
+		}
+	}
+
+	var sourceRepoName, sourceRepoOwner string
+	if ghPullRequest.Head.Repo == nil {
+		return PullRequestInfo{}, errors.New("the source repository information is missing when fetching the pull request details")
 	}
+	if ghPullRequest.Head.Repo.Owner == nil {
+		return PullRequestInfo{}, errors.New("the source repository owner name is missing when fetching the pull request details")
+	}
+	sourceRepoName = vcsutils.DefaultIfNotNil(ghPullRequest.Head.Repo.Name)
+	sourceRepoOwner = vcsutils.DefaultIfNotNil(ghPullRequest.Head.Repo.Owner.Login)
 
-	prInfo := PullRequestInfo{
-		ID: int64(pullRequestId),
+	var targetRepoName, targetRepoOwner string
+	if ghPullRequest.Base.Repo == nil {
+		return PullRequestInfo{}, errors.New("the target repository information is missing when fetching the pull request details")
+	}
+	if ghPullRequest.Base.Repo.Owner == nil {
+		return PullRequestInfo{}, errors.New("the target repository owner name is missing when fetching the pull request details")
+	}
+	targetRepoName = vcsutils.DefaultIfNotNil(ghPullRequest.Base.Repo.Name)
+	targetRepoOwner = vcsutils.DefaultIfNotNil(ghPullRequest.Base.Repo.Owner.Login)
+
+	var body string
+	if withBody {
+		body = vcsutils.DefaultIfNotNil(ghPullRequest.Body)
+	}
+
+	return PullRequestInfo{
+		ID:   vcsutils.DefaultIfNotNil(ghPullRequest.ID),
+		URL:  vcsutils.DefaultIfNotNil(ghPullRequest.HTMLURL),
+		Body: body,
 		Source: BranchInfo{
 			Name:       sourceBranch,
-			Repository: vcsutils.DefaultIfNotNil(pullRequest.Head.Repo.Name),
-			Owner:      vcsutils.DefaultIfNotNil(pullRequest.Head.Repo.Owner.Login),
+			Repository: sourceRepoName,
+			Owner:      sourceRepoOwner,
 		},
 		Target: BranchInfo{
 			Name:       targetBranch,
-			Repository: vcsutils.DefaultIfNotNil(pullRequest.Base.Repo.Name),
-			Owner:      vcsutils.DefaultIfNotNil(pullRequest.Base.Repo.Owner.Login),
+			Repository: targetRepoName,
+			Owner:      targetRepoOwner,
 		},
-	}
-	return prInfo, nil
+	}, nil
 }
 
 // Extracts branch name from the following expected label format repo:branch
@@ -830,25 +864,13 @@ func mapGitHubCommentToCommentInfoList(commentsList []*github.IssueComment) (res
 }
 
 func mapGitHubPullRequestToPullRequestInfoList(pullRequestList []*github.PullRequest, withBody bool) (res []PullRequestInfo, err error) {
+	var mappedPullRequest PullRequestInfo
 	for _, pullRequest := range pullRequestList {
-		var body string
-		if withBody {
-			body = *pullRequest.Body
+		mappedPullRequest, err = mapGitHubPullRequestToPullRequestInfo(pullRequest, withBody)
+		if err != nil {
+			return
 		}
-		res = append(res, PullRequestInfo{
-			ID:   int64(vcsutils.DefaultIfNotNil(pullRequest.Number)),
-			Body: body,
-			Source: BranchInfo{
-				Name:       vcsutils.DefaultIfNotNil(pullRequest.Head.Ref),
-				Repository: vcsutils.DefaultIfNotNil(pullRequest.Head.Repo.Name),
-				Owner:      vcsutils.DefaultIfNotNil(pullRequest.Head.Repo.Owner.Login),
-			},
-			Target: BranchInfo{
-				Name:       vcsutils.DefaultIfNotNil(pullRequest.Base.Ref),
-				Repository: vcsutils.DefaultIfNotNil(pullRequest.Base.Repo.Name),
-				Owner:      vcsutils.DefaultIfNotNil(pullRequest.Base.Repo.Owner.Login),
-			},
-		})
+		res = append(res, mappedPullRequest)
 	}
 	return
 }

diff --git a/vcsclient/github_test.go b/vcsclient/github_test.go
@@ -534,9 +534,10 @@ func TestGitHubClient_ListOpenPullRequests(t *testing.T) {
 	assert.Len(t, result, 1)
 	assert.NoError(t, err)
 	assert.EqualValues(t, PullRequestInfo{
-		ID:     1,
+		ID:     1347,
 		Source: BranchInfo{Name: "new-topic", Repository: "Hello-World", Owner: owner},
 		Target: BranchInfo{Name: "master", Repository: "Hello-World", Owner: owner},
+		URL:    "https://github.com/octocat/Hello-World/pull/1347",
 	}, result[0])
 
 	_, err = createBadGitHubClient(t).ListPullRequestComments(ctx, owner, repo1, 1)
@@ -548,10 +549,11 @@ func TestGitHubClient_ListOpenPullRequests(t *testing.T) {
 	assert.Len(t, result, 1)
 	assert.NoError(t, err)
 	assert.EqualValues(t, PullRequestInfo{
-		ID:     1,
+		ID:     1347,
 		Body:   "hello world",
 		Source: BranchInfo{Name: "new-topic", Repository: "Hello-World", Owner: owner},
 		Target: BranchInfo{Name: "master", Repository: "Hello-World", Owner: owner},
+		URL:    "https://github.com/octocat/Hello-World/pull/1347",
 	}, result[0])
 
 	_, err = createBadGitHubClient(t).ListPullRequestComments(ctx, owner, repo1, 1)
@@ -577,6 +579,7 @@ func TestGitHubClient_GetPullRequestByID(t *testing.T) {
 		ID:     int64(pullRequestId),
 		Source: BranchInfo{Name: "new-topic", Repository: "Hello-World", Owner: owner},
 		Target: BranchInfo{Name: "master", Repository: "Hello-World", Owner: forkedOwner},
+		URL:    "https://github.com/octocat/Hello-World/pull/1347",
 	}, result)
 
 	// Bad Labels