Merge pull request #435 from waciumawanjohi/azure-improvements

Azure improvements

scm/driver/azure/pr.go

@@ -17,8 +17,35 @@ type pullService struct {
  *issueService
 }
 
-func (s *pullService) Update(ctx context.Context, s2 string, i int, input *scm.PullRequestInput) (*scm.PullRequest, *scm.Response, error) {
- return nil, nil, scm.ErrNotSupported
+func (s *pullService) Update(ctx context.Context, repo string, number int, input *scm.PullRequestInput) (*scm.PullRequest, *scm.Response, error) {
+ prevPrState, _, _ := s.Find(ctx, repo, number)
+
+ ro, err := decodeRepo(repo)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ // https://learn.microsoft.com/en-us/rest/api/azure/devops/git/pull-requests/update?view=azure-devops-rest-6.0
+ endpoint := fmt.Sprintf("%s/%s/_apis/git/repositories/%s/pullrequests/%d?api-version=6.0",
+ ro.org, ro.project, ro.name, number)
+
+ in := &prUpdate{}
+ if input.Title != "" {
+ in.Title = &input.Title
+ }
+ if input.Body != "" {
+ in.Description = &input.Body
+ }
+ if input.Base != "" {
+ if prevPrState.Base.Ref != input.Base {
+ targetRefName := fmt.Sprintf("refs/heads/%s", input.Base)
+ in.TargetRefName = &targetRefName
+ }
+ }
+
+ out := new(pr)
+ res, err := s.client.do(ctx, "PATCH", endpoint, in, out)
+ return convertPullRequest(out), res, err
 }
 
 func (s *pullService) RequestReview(ctx context.Context, repo string, number int, logins []string) (*scm.Response, error) {
@@ -49,8 +76,12 @@ func (s *pullService) List(ctx context.Context, repo string, opts *scm.PullReque
  return nil, nil, err
  }
 
+ top := opts.Size
+ skip := (opts.Page - 1) * opts.Size
+
  // https://docs.microsoft.com/en-us/rest/api/azure/devops/git/pull-requests/get-pull-request?view=azure-devops-rest-6.0
- endpoint := fmt.Sprintf("%s/%s/_apis/git/repositories/%s/pullrequests?api-version=6.0", ro.org, ro.project, ro.name)
+ endpoint := fmt.Sprintf("%s/%s/_apis/git/repositories/%s/pullrequests?api-version=6.0&$skip=%d&$top=%d",
+ ro.org, ro.project, ro.name, skip, top)
  out := new(prList)
  res, err := s.client.do(ctx, "GET", endpoint, nil, out)
  return convertPullRequests(out), res, err
@@ -148,6 +179,12 @@ type prInput struct {
  } `json:"reviewers"`
 }
 
+type prUpdate struct {
+ Title *string `json:"title"`
+ Description *string `json:"description"`
+ TargetRefName *string `json:"targetRefName"`
+}
+
 type pr struct {
  Repository struct {
  ID string `json:"id"`
@@ -250,22 +287,40 @@ func convertPullRequests(from *prList) []*scm.PullRequest {
 }
 
 func convertPullRequest(from *pr) *scm.PullRequest {
+ var (
+ headSha string
+ baseSha string
+ )
+ if from.LastMergeSourceCommit != nil {
+ headSha = from.LastMergeSourceCommit.CommitID
+ } else {
+ headSha = ""
+ }
+
+ if from.LastMergeTargetCommit != nil {
+ baseSha = from.LastMergeTargetCommit.CommitID
+ } else {
+ baseSha = ""
+ }
+
  return &scm.PullRequest{
  Number: from.PullRequestID,
  Title: from.Title,
  Body: from.Description,
- Sha: from.LastMergeSourceCommit.CommitID,
+ Sha: headSha,
  Source: scm.TrimRef(from.SourceRefName),
  Target: scm.TrimRef(from.TargetRefName),
  Link: fmt.Sprintf("%s/pullrequest/%d", from.Repository.WebURL, from.PullRequestID),
  Closed: from.ClosedDate.Valid,
  Merged: from.Status == "completed",
  Ref: fmt.Sprintf("refs/pull/%d/merge", from.PullRequestID),
  Head: scm.PullRequestBranch{
- Sha: from.LastMergeSourceCommit.CommitID,
+ Sha: headSha,
+ Ref: scm.TrimRef(from.SourceRefName),
  },
  Base: scm.PullRequestBranch{
- Sha: from.LastMergeTargetCommit.CommitID,
+ Sha: baseSha,
+ Ref: scm.TrimRef(from.TargetRefName),
  },
  Author: scm.User{
  Login: from.CreatedBy.UniqueName,

scm/driver/azure/testdata/pr_active.json.golden

@@ -13,14 +13,12 @@
  "Closed": true,
  "Merged": false,
  "Base": {
- "Name": "",
- "Path": "",
- "Sha": "b748ab7eb49b8627214f22f631f878c4af9893b5"
+ "Sha": "b748ab7eb49b8627214f22f631f878c4af9893b5",
+ "Ref": "main"
  },
  "Head": {
- "Name": "",
- "Path": "",
- "Sha": "01768d964c03e97260af0bd8cd9e5cd1f9ac6356"
+ "Sha": "01768d964c03e97260af0bd8cd9e5cd1f9ac6356",
+ "Ref": "pr_branch"
  },
  "Author": {
  "Login": "[email protected]",

scm/factory/factory.go

@@ -9,10 +9,10 @@ import (
  "os"
  "strings"
 
- "github.com/jenkins-x/go-scm/scm/driver/azure"
  "github.com/pkg/errors"
 
  "github.com/jenkins-x/go-scm/scm"
+ "github.com/jenkins-x/go-scm/scm/driver/azure"
  "github.com/jenkins-x/go-scm/scm/driver/bitbucket"
  "github.com/jenkins-x/go-scm/scm/driver/fake"
  "github.com/jenkins-x/go-scm/scm/driver/gitea"
@@ -93,7 +93,11 @@ func newClient(driver, serverURL string, authOptions *AuthOptions, opts ...Clien
 
  switch driver {
  case "azure":
- client = azure.NewDefault()
+ if serverURL != "" {
+ client, err = azure.New(serverURL)
+ } else {
+ client = azure.NewDefault()
+ }
  case "bitbucket", "bitbucketcloud":
  if serverURL != "" {
  client, err = bitbucket.New(ensureBBCEndpoint(serverURL))