Remove pool size option, set default to 15

runatlantis · May 6, 2020 · 741c892 · 741c892
1 parent 526b801
commit 741c892
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/cmd/server.go b/cmd/server.go
@@ -64,7 +64,6 @@ const (
 	GitlabWebhookSecretFlag    = "gitlab-webhook-secret" // nolint: gosec
 	HidePrevPlanComments       = "hide-prev-plan-comments"
 	LogLevelFlag               = "log-level"
-	ParallelPlansPoolSize      = "parallel-plans-pool-size"
 	PortFlag                   = "port"
 	RepoConfigFlag             = "repo-config"
 	RepoConfigJSONFlag         = "repo-config-json"
@@ -84,19 +83,18 @@ 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 = 10
-	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"
+	DefaultPort             = 4141
+	DefaultTFDownloadURL    = "https://releases.hashicorp.com"
+	DefaultTFEHostname      = "app.terraform.io"
+	DefaultVCSStatusName    = "atlantis"
 )
 
 var stringFlags = map[string]stringFlag{
@@ -293,10 +291,6 @@ var boolFlags = map[string]boolFlag{
 	},
 }
 var intFlags = map[string]intFlag{
-	ParallelPlansPoolSize: {
-		description:  "Max size of the wait group that runs parallel plans (if enabled).",
-		defaultValue: DefaultParallelPlansPoolSize,
-	},
 	PortFlag: {
 		description:  "Port to bind to.",
 		defaultValue: DefaultPort,
@@ -400,6 +394,7 @@ func (s *ServerCmd) Init() *cobra.Command {
 	// Set int flags.
 	for name, f := range intFlags {
 		usage := f.description
+		fmt.Printf("default value: %v", f.defaultValue)
 		if f.defaultValue != 0 {
 			usage = fmt.Sprintf("%s (default %d)", usage, f.defaultValue)
 		}

diff --git a/server/events/command_runner.go b/server/events/command_runner.go
@@ -77,9 +77,6 @@ type DefaultCommandRunner struct {
 	Logger                   logging.SimpleLogging
 	// AllowForkPRs controls whether we operate on pull requests from forks.
 	AllowForkPRs bool
-	// ParallelPlansPoolSize controls the size of the wait group used to run
-	// parallel plans (if enabled).
-	ParallelPlansPoolSize int
 	// AllowForkPRsFlag is the name of the flag that controls fork PR's. We use
 	// this in our error message back to the user on a forked PR so they know
 	// how to enable this functionality.
@@ -363,7 +360,7 @@ func (c *DefaultCommandRunner) runProjectCmdsParallel(cmds []models.ProjectComma
 	var results []models.ProjectResult
 	mux := &sync.Mutex{}
 
-	wg := sizedwaitgroup.New(c.ParallelPlansPoolSize)
+	wg := sizedwaitgroup.New(15)
 	for _, pCmd := range cmds {
 		pCmd := pCmd
 		var execute func()

diff --git a/server/server.go b/server/server.go
@@ -322,7 +322,6 @@ func NewServer(userConfig UserConfig, config Config) (*Server, error) {
 		SilenceForkPRErrorsFlag:  config.SilenceForkPRErrorsFlag,
 		SilenceVCSStatusNoPlans:  userConfig.SilenceVCSStatusNoPlans,
 		DisableApplyAll:          userConfig.DisableApplyAll,
-		ParallelPlansPoolSize:    userConfig.ParallelPlansPoolSize,
 		ProjectCommandBuilder: &events.DefaultProjectCommandBuilder{
 			ParserValidator:   validator,
 			ProjectFinder:     &events.DefaultProjectFinder{},

diff --git a/server/user_config.go b/server/user_config.go
@@ -34,7 +34,6 @@ type UserConfig struct {
 	GitlabWebhookSecret        string `mapstructure:"gitlab-webhook-secret"`
 	HidePrevPlanComments       bool   `mapstructure:"hide-prev-plan-comments"`
 	LogLevel                   string `mapstructure:"log-level"`
-	ParallelPlansPoolSize      int    `mapstructure:"parallel-plans-pool-size"`
 	Port                       int    `mapstructure:"port"`
 	RepoConfig                 string `mapstructure:"repo-config"`
 	RepoConfigJSON             string `mapstructure:"repo-config-json"`