diff --git a/go.mod b/go.mod index 6a6851fd..5f8f76a2 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/jstemmer/go-junit-report/v2 v2.1.0 github.com/kyoh86/richgo v0.3.12 github.com/launchdarkly/api-client-go/v13 v13.0.0 - github.com/launchdarkly/ld-find-code-refs/v2 v2.11.7 + github.com/launchdarkly/ld-find-code-refs/v2 v2.11.8 ) require ( @@ -70,7 +70,7 @@ require ( golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.18.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index e7f1da40..36efbfce 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/launchdarkly/api-client-go/v7 v7.1.1 h1:3VBkFt9xHljMw5KDlVFDUogxfH78Y github.com/launchdarkly/api-client-go/v7 v7.1.1/go.mod h1:GVl1inKsWoKX3yLgdqrjxWw8k4ih0HlSmdnrhi5NNDs= github.com/launchdarkly/json-patch v0.0.0-20180720210516-dd68d883319f h1:jfiPiz2hE/7mHv2NOS4cm07sSJCsKlbxmR7pzPhhvpU= github.com/launchdarkly/json-patch v0.0.0-20180720210516-dd68d883319f/go.mod h1:CHbYdMs8UjvNnS2fatlQvi4UYnBTRYGxRHc/0kQupSQ= -github.com/launchdarkly/ld-find-code-refs/v2 v2.11.7 h1:mW/YIBbtj578DOG4Y5mSIcopE5tSzPi1BRHwsf3nfBE= -github.com/launchdarkly/ld-find-code-refs/v2 v2.11.7/go.mod h1:QYhHLvGvhLQZUQX4b8IjtP5F+ZC3vHoOEfUrJIJ35rk= +github.com/launchdarkly/ld-find-code-refs/v2 v2.11.8 h1:m75tLs4HT1ttB5FuOVAzoldpFgatNzW+JCdMy1XE3Gc= +github.com/launchdarkly/ld-find-code-refs/v2 v2.11.8/go.mod h1:U9rEfu68w3henEzZX7BR6gp1uvHa4DPuGRhXkz1N0Eg= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -425,8 +425,8 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/vendor/github.com/launchdarkly/ld-find-code-refs/v2/flags/flags.go b/vendor/github.com/launchdarkly/ld-find-code-refs/v2/flags/flags.go index 52e44263..82eeda38 100644 --- a/vendor/github.com/launchdarkly/ld-find-code-refs/v2/flags/flags.go +++ b/vendor/github.com/launchdarkly/ld-find-code-refs/v2/flags/flags.go @@ -2,7 +2,6 @@ package flags import ( "fmt" - "os" "github.com/launchdarkly/ld-find-code-refs/v2/internal/helpers" "github.com/launchdarkly/ld-find-code-refs/v2/internal/ld" @@ -32,18 +31,8 @@ func GetFlagKeys(opts options.Options, repoParams ld.RepoParams) map[string][]st if err != nil { helpers.FatalServiceError(fmt.Errorf("could not retrieve flag keys from LaunchDarkly for project `%s`: %w", proj.Key, err), ignoreServiceErrors) } - - filteredFlags, omittedFlags := filterShortFlagKeys(flags) - if len(filteredFlags) == 0 { - log.Info.Printf("no flag keys longer than the minimum flag key length (%v) were found for project: %s, exiting early", - minFlagKeyLen, proj.Key) - os.Exit(0) - } else if len(omittedFlags) > 0 { - log.Warning.Printf("omitting %d flags with keys less than minimum (%d) for project: %s", len(omittedFlags), minFlagKeyLen, proj.Key) - } - flagKeys[proj.Key] = filteredFlags + addFlagKeys(flagKeys, flags, proj.Key) } - return flagKeys } @@ -62,6 +51,18 @@ func filterShortFlagKeys(flags []string) (filtered []string, omitted []string) { return filteredFlags, omittedFlags } +func addFlagKeys(flagKeys map[string][]string, flags []string, projKey string) { + filteredFlags, omittedFlags := filterShortFlagKeys(flags) + if len(filteredFlags) == 0 { + log.Warning.Printf("no flag keys longer than the minimum flag key length (%v) were found for project: %s. Skipping project", + minFlagKeyLen, projKey) + return + } else if len(omittedFlags) > 0 { + log.Warning.Printf("omitting %d flags with keys less than minimum (%d) for project: %s", len(omittedFlags), minFlagKeyLen, projKey) + } + flagKeys[projKey] = filteredFlags +} + func getFlags(ldApi ld.ApiClient, projKey string) ([]string, error) { flags, err := ldApi.GetFlagKeyList(projKey) if err != nil { diff --git a/vendor/github.com/launchdarkly/ld-find-code-refs/v2/internal/version/version.go b/vendor/github.com/launchdarkly/ld-find-code-refs/v2/internal/version/version.go index 4689074e..321f72c5 100644 --- a/vendor/github.com/launchdarkly/ld-find-code-refs/v2/internal/version/version.go +++ b/vendor/github.com/launchdarkly/ld-find-code-refs/v2/internal/version/version.go @@ -1,3 +1,3 @@ package version -const Version = "2.11.7" +const Version = "2.11.8" diff --git a/vendor/modules.txt b/vendor/modules.txt index 71e740b9..e9e38dc8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -86,7 +86,7 @@ github.com/launchdarkly/api-client-go/v7 # github.com/launchdarkly/json-patch v0.0.0-20180720210516-dd68d883319f ## explicit github.com/launchdarkly/json-patch -# github.com/launchdarkly/ld-find-code-refs/v2 v2.11.7 +# github.com/launchdarkly/ld-find-code-refs/v2 v2.11.8 ## explicit; go 1.20 github.com/launchdarkly/ld-find-code-refs/v2/aliases github.com/launchdarkly/ld-find-code-refs/v2/flags @@ -236,7 +236,7 @@ golang.org/x/text/internal/utf8internal golang.org/x/text/runes golang.org/x/text/transform golang.org/x/text/unicode/norm -# golang.org/x/tools v0.17.0 +# golang.org/x/tools v0.18.0 ## explicit; go 1.18 golang.org/x/tools/godoc/util golang.org/x/tools/godoc/vfs