Merge pull request #788 from thockin/fix_git_option_parsing_goroutine…

…_leak

Fix goroutine leak in git option parsing

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
+	go.uber.org/goleak v1.2.1 // indirect
 	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )

go.sum

@@ -204,6 +204,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

main.go

@@ -2074,16 +2074,12 @@ type keyVal struct {
 }
 
 func parseGitConfigs(configsFlag string) ([]keyVal, error) {
-	ch := make(chan rune)
-	stop := make(chan bool)
+	// Use a channel as a FIFO.  We don't expect the input strings to be very
+	// large, so this simple model should suffice.
+	ch := make(chan rune, len(configsFlag))
 	go func() {
 		for _, r := range configsFlag {
-			select {
-			case <-stop:
-				break
-			default:
-				ch <- r
-			}
+			ch <- r
 		}
 		close(ch)
 	}()

main_test.go

@@ -23,6 +23,8 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"go.uber.org/goleak"
 )
 
 const (
@@ -378,6 +380,8 @@ func TestParseGitConfigs(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			defer goleak.VerifyNone(t)
+
 			kvs, err := parseGitConfigs(tc.input)
 			if err != nil && !tc.fail {
 				t.Errorf("unexpected error: %v", err)