Merge branch 'master' of https://github.com/gruntwork-io/git-xargs

Author: Tyler Harris

.circleci/config.yml

@@ -5,13 +5,13 @@ env: &env
     TERRAGRUNT_VERSION: NONE
     PACKER_VERSION: NONE
     GRUNTWORK_INSTALLER_VERSION: v0.0.39
-    MODULE_CI_VERSION: v0.52.6
-    GOLANG_VERSION: 1.18
+    MODULE_CI_VERSION: v0.57.3
+    GOLANG_VERSION: 1.21.1
     GO111MODULE: auto
     CGO_ENABLED: 1
 defaults: &defaults
   docker:
-    - image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.18-tf1.4-tg39.1-pck1.8-ci50.7
+    - image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.21-tf1.5-tg39.1-pck1.8-ci50.7
   <<: *env
 install_gruntwork_utils: &install_gruntwork_utils
   name: Install gruntwork utils
@@ -34,7 +34,7 @@ jobs:
       - run:
           command: |
             pip install pre-commit
-            go get golang.org/x/tools/cmd/goimports
+            go install golang.org/x/tools/cmd/goimports@v0.24.0
             export GOPATH=~/go/bin && export PATH=$PATH:$GOPATH
             pre-commit install
             pre-commit run --all-files
@@ -64,8 +64,8 @@ jobs:
   deploy:
     <<: *env
     macos:
-      xcode: 14.2.0
-    resource_class: macos.x86.medium.gen2
+      xcode: 15.3.0
+    resource_class: macos.m1.medium.gen1
     steps:
       - checkout
       - attach_workspace:
@@ -81,6 +81,9 @@ jobs:
       - run:
           name: Compile and sign the binaries
           command: |
+            export AC_PASSWORD=${MACOS_AC_PASSWORD}
+            export AC_PROVIDER=${MACOS_AC_PROVIDER}
+            
             sign-binary --install-macos-sign-dependencies --os mac .gon_amd64.hcl
             sign-binary --os mac .gon_arm64.hcl
             echo "Done signing the binary"

.gon_amd64.hcl

@@ -7,7 +7,6 @@ bundle_id = "io.gruntwork.app.terragrunt"
 
 apple_id {
   username = "[email protected]"
-  password = "@env:MACOS_AC_PASSWORD"
 }
 
 sign {

.gon_arm64.hcl

@@ -7,7 +7,6 @@ bundle_id = "io.gruntwork.app.terragrunt"
 
 apple_id {
   username = "[email protected]"
-  password = "@env:MACOS_AC_PASSWORD"
 }
 
 sign {

CODEOWNERS

@@ -1 +1 @@
-* @brikis98 @hongil0316
+* @hongil0316

README.md

@@ -42,6 +42,11 @@ func parseGitXargsConfig(c *cli.Context) (*config.GitXargsConfig, error) {
 	config.SecondsToSleepBetweenPRs = c.Int("seconds-between-prs")
 	config.PullRequestRetries = c.Int("max-pr-retries")
 	config.SecondsToSleepWhenRateLimited = c.Int("seconds-to-wait-when-rate-limited")
+	maxConcurrentClones := c.Int("max-concurrent-clones")
+	if maxConcurrentClones > 0 {
+		config.CloneJobsLimiter = make(chan struct{}, maxConcurrentClones)
+	}
+
 	config.NoSkipCI = c.Bool("no-skip-ci")
 	config.RetainLocalRepos = c.Bool("keep-cloned-repositories")
 	// By default, prepend "[skip ci]" to commit messages, unless the user passed --no-skip-ci

cmd/git-xargs.go

@@ -24,9 +24,10 @@ const (
 	DefaultPullRequestDescription        = "git-xargs programmatic pull request"
 	MaxPullRequestRetriesFlagName        = "max-pr-retries"
 	SecondsToWaitWhenRateLimitedFlagName = "seconds-to-wait-when-rate-limited"
+	MaxConcurrentClonesFlagName          = "max-concurrent-clones"
 	NoSkipCIFlagName                     = "no-skip-ci"
 	KeepClonedRepositoriesFlagName       = "keep-cloned-repositories"
-	DefaultMaxConcurrentRepos            = 0
+	DefaultMaxConcurrentClones           = 4
 	DefaultSecondsBetweenPRs             = 1
 	DefaultMaxPullRequestRetries         = 3
 	DefaultSecondsToWaitWhenRateLimited  = 60
@@ -111,6 +112,11 @@ var (
 		Usage: "The number of additional seconds to sleep before attempting to open a PR again, when rate limited by GitHub. Defaults to 60.",
 		Value: DefaultSecondsToWaitWhenRateLimited,
 	}
+	GenericMaxConcurrentClonesFlag = cli.IntFlag{
+		Name:  MaxConcurrentClonesFlagName,
+		Usage: "The maximum number of concurrent clones to run at once. Defaults to 4. If set to 0 no limit will be applied.",
+		Value: DefaultMaxConcurrentClones,
+	}
 	GenericNoSkipCIFlag = cli.BoolFlag{
 		Name:  NoSkipCIFlagName,
 		Usage: "By default, git-xargs prepends \"[skip ci]\" to its commit messages. Pass this flag to prevent \"[skip ci]\" from being prepending to commit messages.",

common/common.go

@@ -39,6 +39,7 @@ type GitXargsConfig struct {
 	SecondsToSleepBetweenPRs      int
 	PullRequestRetries            int
 	SecondsToSleepWhenRateLimited int
+	CloneJobsLimiter              chan struct{}
 	NoSkipCI                      bool
 	RetainLocalRepos              bool
 	Ticker                        *time.Ticker
@@ -72,6 +73,7 @@ func NewGitXargsConfig() *GitXargsConfig {
 		SecondsToSleepBetweenPRs:      common.DefaultSecondsBetweenPRs,
 		SecondsToSleepWhenRateLimited: common.DefaultSecondsToWaitWhenRateLimited,
 		PullRequestRetries:            common.DefaultMaxPullRequestRetries,
+		CloneJobsLimiter:              make(chan struct{}, common.DefaultMaxConcurrentClones),
 		NoSkipCI:                      false,
 		RetainLocalRepos:              false,
 	}

config/config.go

@@ -1,36 +1,37 @@
 module github.com/gruntwork-io/git-xargs
 
-go 1.18
+go 1.21
 
 require (
-	github.com/go-git/go-git/v5 v5.6.1
+	github.com/go-git/go-git/v5 v5.13.0
 	github.com/google/go-github/v43 v43.0.0
 	github.com/gruntwork-io/go-commons v0.8.2
 	github.com/pterm/pterm v0.12.42
-	github.com/sirupsen/logrus v1.7.0
-	github.com/stretchr/testify v1.7.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli v1.22.5
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
 )
 
 require (
 	atomicgo.dev/cursor v0.1.1 // indirect
 	atomicgo.dev/keyboard v0.2.8 // indirect
-	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
-	github.com/acomagu/bufpipe v1.0.4 // indirect
-	github.com/cloudflare/circl v1.1.0 // indirect
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/ProtonMail/go-crypto v1.1.3 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
-	github.com/go-git/gcfg v1.5.0 // indirect
-	github.com/go-git/go-billy/v5 v5.4.1 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.6.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/gookit/color v1.5.0 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/lithammer/fuzzysearch v1.1.5 // indirect
@@ -39,18 +40,21 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/skeema/knownhosts v1.1.0 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
-	golang.org/x/crypto v0.6.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/term v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.25.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )