diff --git a/cmd/server.go b/cmd/server.go index 092a49945..9d37fc7db 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -94,19 +94,19 @@ const ( WriteGitCredsFlag = "write-git-creds" // NOTE: Must manually set these as defaults in the setDefaults function. - DefaultADBasicUser = "" - DefaultADBasicPassword = "" - DefaultCheckoutStrategy = "branch" - DefaultBitbucketBaseURL = bitbucketcloud.BaseURL - DefaultDataDir = "~/.atlantis" - DefaultGHHostname = "github.com" - DefaultGitlabHostname = "gitlab.com" - DefaultLogLevel = "info" - DefaultParallelPlansPoolSize = 15 - DefaultPort = 4141 - DefaultTFDownloadURL = "https://releases.hashicorp.com" - DefaultTFEHostname = "app.terraform.io" - DefaultVCSStatusName = "atlantis" + DefaultADBasicUser = "" + DefaultADBasicPassword = "" + DefaultCheckoutStrategy = "branch" + DefaultBitbucketBaseURL = bitbucketcloud.BaseURL + DefaultDataDir = "~/.atlantis" + DefaultGHHostname = "github.com" + DefaultGitlabHostname = "gitlab.com" + DefaultLogLevel = "info" + DefaultParallelPoolSize = 15 + DefaultPort = 4141 + DefaultTFDownloadURL = "https://releases.hashicorp.com" + DefaultTFEHostname = "app.terraform.io" + DefaultVCSStatusName = "atlantis" ) var stringFlags = map[string]stringFlag{ @@ -333,9 +333,9 @@ var boolFlags = map[string]boolFlag{ }, } var intFlags = map[string]intFlag{ - ParallelPlansPoolSize: { + ParallelPoolSize: { description: "Max size of the wait group that runs parallel plans and applies (if enabled).", - defaultValue: DefaultParallelPlansPoolSize, + defaultValue: DefaultParallelPoolSize, }, PortFlag: { description: "Port to bind to.", diff --git a/cmd/server_test.go b/cmd/server_test.go index ea159a618..18d9c48a1 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -80,6 +80,7 @@ var testFlags = map[string]interface{}{ LogLevelFlag: "debug", AllowDraftPRs: true, PortFlag: 8181, + ParallelPoolSize: 15, RepoAllowlistFlag: "github.com/runatlantis/atlantis", RequireApprovalFlag: true, RequireMergeableFlag: true, diff --git a/server/events/command_runner.go b/server/events/command_runner.go index a656cfe95..0e1396b20 100644 --- a/server/events/command_runner.go +++ b/server/events/command_runner.go @@ -407,7 +407,7 @@ func (c *DefaultCommandRunner) runProjectCmdsParallel(cmds []models.ProjectComma var results []models.ProjectResult mux := &sync.Mutex{} - wg := sizedwaitgroup.New(c.ParallelPlansPoolSize) + wg := sizedwaitgroup.New(c.ParallelPoolSize) for _, pCmd := range cmds { pCmd := pCmd var execute func()