Merge pull request #1 from bub3n/cherry-pick-my-changes

bub3n · web-flow · commit 4dea465627bf · 2025-02-04T21:07:25.000+01:00
Cherry pick my changes
diff --git a/cmd/server.go b/cmd/server.go
@@ -54,6 +54,8 @@ const (
 	ADTokenFlag                      = "azuredevops-token" // nolint: gosec
 	ADUserFlag                       = "azuredevops-user"
 	ADHostnameFlag                   = "azuredevops-hostname"
+	ADDiffTop                        = "azuredevops-diff-top"
+	ADDiffSkip                       = "azuredevops-diff-skip"
 	AllowCommandsFlag                = "allow-commands"
 	AllowForkPRsFlag                 = "allow-fork-prs"
 	AtlantisURLFlag                  = "atlantis-url"
@@ -164,6 +166,8 @@ const (
 	DefaultADBasicUser                  = ""
 	DefaultADBasicPassword              = ""
 	DefaultADHostname                   = "dev.azure.com"
+	DefaultADDiffTop                    = 100
+	DefaultADDiffSkip                   = 0
 	DefaultAutoDiscoverMode             = "auto"
 	DefaultAutoplanFileList             = "**/*.tf,**/*.tfvars,**/*.tfvars.json,**/terragrunt.hcl,**/.terraform.lock.hcl"
 	DefaultAllowCommands                = "version,plan,apply,unlock,approve_policies"
@@ -637,6 +641,14 @@ var boolFlags = map[string]boolFlag{
 	},
 }
 var intFlags = map[string]intFlag{
+	ADDiffTop: {
+		description:  "Azure DevOps maximum number of changes to return in diff",
+		defaultValue: 100,
+	},
+	ADDiffSkip: {
+		description:  "Azure DevOps number of changes to skip in diff.",
+		defaultValue: 0,
+	},
 	CheckoutDepthFlag: {
 		description: fmt.Sprintf("Used only if --%s=%s.", CheckoutStrategyFlag, CheckoutStrategyMerge) +
 			" How many commits to include in each of base and feature branches when cloning repository." +
@@ -883,6 +895,12 @@ func (s *ServerCmd) setDefaults(c *server.UserConfig, v *viper.Viper) {
 	if c.AzureDevOpsHostname == "" {
 		c.AzureDevOpsHostname = DefaultADHostname
 	}
+	if c.AzureDevOpsDiffTop == 0 {
+		c.AzureDevOpsDiffTop = DefaultADDiffTop
+	}
+	if c.AzureDevOpsDiffSkip == 0 {
+		c.AzureDevOpsDiffSkip = DefaultADDiffSkip
+	}
 	if c.AutoplanFileList == "" {
 		c.AutoplanFileList = DefaultAutoplanFileList
 	}
diff --git a/cmd/server_test.go b/cmd/server_test.go
@@ -58,6 +58,8 @@ var testFlags = map[string]interface{}{
 	ADHostnameFlag:                   "dev.azure.com",
 	ADTokenFlag:                      "ad-token",
 	ADUserFlag:                       "ad-user",
+	ADDiffTop:                        100,
+	ADDiffSkip:                       0,
 	ADWebhookPasswordFlag:            "ad-wh-pass",
 	ADWebhookUserFlag:                "ad-wh-user",
 	AtlantisURLFlag:                  "url",
diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/bradleyfalzon/ghinstallation/v2 v2.13.0
 	github.com/briandowns/spinner v1.23.1
 	github.com/cactus/go-statsd-client/v5 v5.1.0
+	github.com/drmaxgit/go-azuredevops v0.13.1
 	github.com/go-ozzo/ozzo-validation v3.6.0+incompatible
 	github.com/go-playground/validator/v10 v10.23.0
 	github.com/go-test/deep v1.1.1
@@ -27,7 +28,6 @@ require (
 	github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6
 	github.com/jpillora/backoff v1.0.0
 	github.com/kr/pretty v0.3.1
-	github.com/mcdafydd/go-azuredevops v0.12.1
 	github.com/microcosm-cc/bluemonday v1.0.27
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
 	github.com/mitchellh/go-homedir v1.1.0
@@ -108,6 +108,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mcdafydd/go-azuredevops v0.12.1 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
diff --git a/go.sum b/go.sum
@@ -114,6 +114,8 @@ github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454Wv
 github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/drmaxgit/go-azuredevops v0.13.1 h1:mqRxiwnbKraHAtqfTFa+xD75Atf84MgpjKJdA8hJeS4=
+github.com/drmaxgit/go-azuredevops v0.13.1/go.mod h1:m1pO2fW60I9FahzLHMmHYq3bM446ZMZKDpd8+AEKzxc=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
diff --git a/runatlantis.io/docs/server-configuration.md b/runatlantis.io/docs/server-configuration.md
@@ -231,6 +231,26 @@ This flag overrides `--autoplan-modules`. If you wish to disable auto-planning o
 and set `--autoplan-modules` to `false`.
 :::
 
+### `--azuredevops-diff-skip`
+
+  ```bash
+  atlantis server --azuredevops-diff-skip=50
+  # or
+  ATLANTIS_AZUREDEVOPS_DIFF_SKIP="50"
+  ```
+
+  Number of items on a single page in Azure DevOps paged responses. Defaults to `0`.
+
+### `--azuredevops-diff-top`
+
+  ```bash
+  atlantis server --azuredevops-diff-top=1000
+  # or
+  ATLANTIS_AZUREDEVOPS_DIFF_TOP="1000"
+  ```
+
+  Number of items on a single page in Azure DevOps paged responses. Defaults to `100`.
+
 ### `--azuredevops-hostname`
 
   ```bash
diff --git a/server/controllers/events/azuredevops_request_validator.go b/server/controllers/events/azuredevops_request_validator.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 )
 
 //go:generate pegomock generate --package mocks -o mocks/mock_azuredevops_request_validator.go AzureDevopsRequestValidator
diff --git a/server/controllers/events/events_controller.go b/server/controllers/events/events_controller.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/google/go-github/v68/github"
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 	"github.com/microcosm-cc/bluemonday"
 	"github.com/pkg/errors"
 	"github.com/runatlantis/atlantis/server/events"
diff --git a/server/controllers/events/events_controller_test.go b/server/controllers/events/events_controller_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 
 	"github.com/google/go-github/v68/github"
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 	. "github.com/petergtz/pegomock/v4"
 	events_controllers "github.com/runatlantis/atlantis/server/controllers/events"
 	"github.com/runatlantis/atlantis/server/controllers/events/mocks"
diff --git a/server/events/command_runner.go b/server/events/command_runner.go
@@ -17,8 +17,8 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 	"github.com/google/go-github/v68/github"
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
 	"github.com/pkg/errors"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	"github.com/runatlantis/atlantis/server/events/command"
diff --git a/server/events/event_parser.go b/server/events/event_parser.go
@@ -26,7 +26,7 @@ import (
 	"github.com/go-playground/validator/v10"
 	"github.com/google/go-github/v68/github"
 	lru "github.com/hashicorp/golang-lru/v2"
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 	"github.com/pkg/errors"
 	"github.com/runatlantis/atlantis/server/events/command"
 	"github.com/runatlantis/atlantis/server/events/models"
diff --git a/server/events/event_parser_test.go b/server/events/event_parser_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/google/go-github/v68/github"
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 	"github.com/mohae/deepcopy"
 	"github.com/runatlantis/atlantis/server/events"
 	"github.com/runatlantis/atlantis/server/events/command"
diff --git a/server/events/mocks/mock_azuredevops_pull_getter.go b/server/events/mocks/mock_azuredevops_pull_getter.go
diff --git a/server/events/mocks/mock_event_parsing.go b/server/events/mocks/mock_event_parsing.go
diff --git a/server/events/vcs/azuredevops_client.go b/server/events/vcs/azuredevops_client.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 	"github.com/pkg/errors"
 	"github.com/runatlantis/atlantis/server/events/models"
 	"github.com/runatlantis/atlantis/server/events/vcs/common"
@@ -21,10 +21,26 @@ type AzureDevopsClient struct {
 	Client   *azuredevops.Client
 	ctx      context.Context
 	UserName string
+	DiffTop  int
+	DiffSkip int
+}
+
+// Option for setting DiffTop
+func WithDiffTop(diffTop int) func(*AzureDevopsClient) {
+	return func(client *AzureDevopsClient) {
+		client.DiffTop = diffTop
+	}
+}
+
+// Option for setting DiffSkip
+func WithDiffSkip(diffSkip int) func(*AzureDevopsClient) {
+	return func(client *AzureDevopsClient) {
+		client.DiffSkip = diffSkip
+	}
 }
 
 // NewAzureDevopsClient returns a valid Azure DevOps client.
-func NewAzureDevopsClient(hostname string, userName string, token string) (*AzureDevopsClient, error) {
+func NewAzureDevopsClient(hostname string, userName string, token string, options ...func(*AzureDevopsClient)) (*AzureDevopsClient, error) {
 	tp := azuredevops.BasicAuthTransport{
 		Username: "",
 		Password: strings.TrimSpace(token),
@@ -49,6 +65,12 @@ func NewAzureDevopsClient(hostname string, userName string, token string) (*Azur
 		Client:   adClient,
 		UserName: userName,
 		ctx:      context.Background(),
+		DiffTop:  100,
+		DiffSkip: 0,
+	}
+
+	for _, option := range options {
+		option(client)
 	}
 
 	return client, nil
@@ -63,12 +85,17 @@ func (g *AzureDevopsClient) GetModifiedFiles(logger logging.SimpleLogging, repo
 	opts := azuredevops.PullRequestGetOptions{
 		IncludeWorkItemRefs: true,
 	}
+
 	pullRequest, _, _ := g.Client.PullRequests.GetWithRepo(g.ctx, owner, project, repoName, pull.Num, &opts)
 
 	targetRefName := strings.Replace(pullRequest.GetTargetRefName(), "refs/heads/", "", 1)
 	sourceRefName := strings.Replace(pullRequest.GetSourceRefName(), "refs/heads/", "", 1)
 
-	r, resp, err := g.Client.Git.GetDiffs(g.ctx, owner, project, repoName, targetRefName, sourceRefName)
+	diffArguments := azuredevops.GitDiffListOptions{
+		Top:  g.DiffTop,
+		Skip: g.DiffSkip,
+	}
+	r, resp, err := g.Client.Git.GetDiffs(g.ctx, owner, project, repoName, targetRefName, sourceRefName, &diffArguments)
 	if resp.StatusCode != http.StatusOK {
 		return nil, errors.Wrapf(err, "http response code %d getting diff %s to %s", resp.StatusCode, sourceRefName, targetRefName)
 	}
diff --git a/server/events/vcs/azuredevops_client_test.go b/server/events/vcs/azuredevops_client_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 	"github.com/runatlantis/atlantis/server/events/models"
 	"github.com/runatlantis/atlantis/server/events/vcs"
 	"github.com/runatlantis/atlantis/server/events/vcs/testdata"
@@ -273,7 +273,12 @@ func TestAzureDevopsClient_GetModifiedFiles(t *testing.T) {
 			case "/owner/project/_apis/git/repositories/repo/pullrequests/1?api-version=5.1-preview.1&includeWorkItemRefs=true":
 				w.Write([]byte(testdata.ADPullJSON)) // nolint: errcheck
 			// The second should hit this URL.
-			case "/owner/project/_apis/git/repositories/repo/diffs/commits?api-version=5.1&baseVersion=new_feature&targetVersion=npaulk/my_work":
+			case "/owner/project/_apis/git/repositories/repo/diffs/commits?%24top=100&api-version=5.1&baseVersion=new_feature&targetVersion=npaulk%2Fmy_work":
+				// We write a header that means there's an additional page.
+				w.Write([]byte(resp)) // nolint: errcheck
+				return
+			// The third url for test of arguments skip and top in diff endpoint
+			case "/owner/project/_apis/git/repositories/repo/diffs/commits?%24skip=456&%24top=123&api-version=5.1&baseVersion=new_feature&targetVersion=npaulk%2Fmy_work":
 				// We write a header that means there's an additional page.
 				w.Write([]byte(resp)) // nolint: errcheck
 				return
@@ -307,6 +312,29 @@ func TestAzureDevopsClient_GetModifiedFiles(t *testing.T) {
 		})
 	Ok(t, err)
 	Equals(t, []string{"file1.txt", "file2.txt"}, files)
+
+	// Redefined client for test of top and skip arguments in azuredevops diffs endpoint
+	client, err = vcs.NewAzureDevopsClient(testServerURL.Host, "user", "token", vcs.WithDiffTop(123), vcs.WithDiffSkip(456))
+	Ok(t, err)
+	defer disableSSLVerification()()
+
+	files, err = client.GetModifiedFiles(
+		logger,
+		models.Repo{
+			FullName:          "owner/project/repo",
+			Owner:             "owner",
+			Name:              "repo",
+			CloneURL:          "",
+			SanitizedCloneURL: "",
+			VCSHost: models.VCSHost{
+				Type:     models.AzureDevops,
+				Hostname: "dev.azure.com",
+			},
+		}, models.PullRequest{
+			Num: 1,
+		})
+	Ok(t, err)
+	Equals(t, []string{"file1.txt", "file2.txt"}, files)
 }
 
 func TestAzureDevopsClient_PullIsMergeable(t *testing.T) {
diff --git a/server/events/vcs/testdata/fixtures.go b/server/events/vcs/testdata/fixtures.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/google/go-github/v68/github"
-	"github.com/mcdafydd/go-azuredevops/azuredevops"
+	"github.com/drmaxgit/go-azuredevops/azuredevops"
 )
 
 var PullEvent = github.PullRequestEvent{
diff --git a/server/server.go b/server/server.go
@@ -314,7 +314,7 @@ func NewServer(userConfig UserConfig, config Config) (*Server, error) {
 		supportedVCSHosts = append(supportedVCSHosts, models.AzureDevops)
 
 		var err error
-		azuredevopsClient, err = vcs.NewAzureDevopsClient(userConfig.AzureDevOpsHostname, userConfig.AzureDevopsUser, userConfig.AzureDevopsToken)
+		azuredevopsClient, err = vcs.NewAzureDevopsClient(userConfig.AzureDevOpsHostname, userConfig.AzureDevopsUser, userConfig.AzureDevopsToken, vcs.WithDiffTop(userConfig.AzureDevOpsDiffTop), vcs.WithDiffSkip(userConfig.AzureDevOpsDiffSkip))
 		if err != nil {
 			return nil, err
 		}
diff --git a/server/user_config.go b/server/user_config.go
@@ -27,6 +27,8 @@ type UserConfig struct {
 	AzureDevopsWebhookPassword  string `mapstructure:"azuredevops-webhook-password"`
 	AzureDevopsWebhookUser      string `mapstructure:"azuredevops-webhook-user"`
 	AzureDevOpsHostname         string `mapstructure:"azuredevops-hostname"`
+	AzureDevOpsDiffTop          int    `mapstructure:"azuredevops-diff-top"`
+	AzureDevOpsDiffSkip         int    `mapstructure:"azuredevops-diff-skip"`
 	BitbucketBaseURL            string `mapstructure:"bitbucket-base-url"`
 	BitbucketToken              string `mapstructure:"bitbucket-token"`
 	BitbucketUser               string `mapstructure:"bitbucket-user"`

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"io"`
`6`	`6`	`"net/http"`
`7`	`7`
`8`		`- "github.com/mcdafydd/go-azuredevops/azuredevops"`
	`8`	`+ "github.com/drmaxgit/go-azuredevops/azuredevops"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`//go:generate pegomock generate --package mocks -o mocks/mock_azuredevops_request_validator.go AzureDevopsRequestValidator`