diff --git a/3p/transform/transform_test.go b/3p/transform/transform_test.go index 3e537fc..f0adbd7 100644 --- a/3p/transform/transform_test.go +++ b/3p/transform/transform_test.go @@ -22,7 +22,7 @@ func Rot13(r io.Reader) *Transformer { if err != nil { return nil, err } - for i := 0; i < n; i++ { + for i := range n { if buf[i] >= 'a' && buf[i] <= 'z' { buf[i] = ((buf[i] - 'a' + 13) % 26) + 'a' } else if buf[i] >= 'A' && buf[i] <= 'Z' { @@ -46,7 +46,7 @@ func TestTransformer(t *testing.T) { // random rand.Seed(time.Now().UnixNano()) buf := make([]byte, 10000) - for i := 0; i < 1000; i++ { + for range 1000 { _, err := rand.Read(buf) if err != nil { t.Fatal(err) @@ -70,7 +70,7 @@ func ExampleTransformer_rot13() { if err != nil { return nil, err } - for i := 0; i < n; i++ { + for i := range n { if buf[i] >= 'a' && buf[i] <= 'z' { buf[i] = ((buf[i] - 'a' + 13) % 26) + 'a' } else if buf[i] >= 'A' && buf[i] <= 'Z' { diff --git a/3p/ulid/go.sum b/3p/ulid/go.sum index a480d79..e69de29 100644 --- a/3p/ulid/go.sum +++ b/3p/ulid/go.sum @@ -1,2 +0,0 @@ -github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30 h1:BHT1/DKsYDGkUgQ2jmMaozVcdk+sVfz0+1ZJq4zkWgw= -github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= diff --git a/auth/jwt/keyfile/keyfile.go b/auth/jwt/keyfile/keyfile.go index 954df02..f9d6682 100644 --- a/auth/jwt/keyfile/keyfile.go +++ b/auth/jwt/keyfile/keyfile.go @@ -28,8 +28,9 @@ import ( "encoding/json" "encoding/pem" "fmt" - "github.com/therootcompany/golib/auth/jwt" "os" + + "github.com/therootcompany/golib/auth/jwt" ) // --- Parse functions (bytes => key) --- diff --git a/cmd/auth-proxy/go.sum b/cmd/auth-proxy/go.sum index 713140d..6d9c8c5 100644 --- a/cmd/auth-proxy/go.sum +++ b/cmd/auth-proxy/go.sum @@ -1,12 +1,4 @@ github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/therootcompany/golib/auth v1.0.0 h1:17hfwcJO/Efc22/8RcCTKUD49mhCc5tyoHiKonA3Slg= -github.com/therootcompany/golib/auth v1.0.0/go.mod h1:DSw8llmDkMtvMZWrzrTRtcaLPpPMsT6Sg+qwGf5O2U8= -github.com/therootcompany/golib/auth/csvauth v1.2.0 h1:EgCT0pft4AhJz1omOntca5axv/B/1686wGIOgAS1++k= -github.com/therootcompany/golib/auth/csvauth v1.2.0/go.mod h1:e4kjRLWD7DWsuUT8+5MvPSYygXY6Is2UVeA9UpDllWU= -github.com/therootcompany/golib/auth/csvauth v1.2.1 h1:iy6S69nj/+Us0nx5pXke7SevgH1YaEM1vgbne7bnq70= -github.com/therootcompany/golib/auth/csvauth v1.2.1/go.mod h1:e4kjRLWD7DWsuUT8+5MvPSYygXY6Is2UVeA9UpDllWU= -github.com/therootcompany/golib/auth/csvauth v1.2.2 h1:t14Y8fSPhUZS6J+gRj0EFjkfE2JdIq93vOiKYcfItE8= -github.com/therootcompany/golib/auth/csvauth v1.2.2/go.mod h1://Iy5nbRa/bSndWa8b/NM4jclPVgkFWWhYUH6Ppelz0= golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= diff --git a/cmd/smsapid/go.mod b/cmd/smsapid/go.mod index ea58096..14fa337 100644 --- a/cmd/smsapid/go.mod +++ b/cmd/smsapid/go.mod @@ -4,7 +4,6 @@ go 1.25.0 require ( github.com/go-chi/chi/v5 v5.2.5 - github.com/joho/godotenv v1.5.1 github.com/jszwec/csvutil v1.10.0 github.com/simonfrey/jsonl v0.0.0-20240904112901-935399b9a740 github.com/therootcompany/golib/auth v1.1.1 diff --git a/cmd/smsapid/go.sum b/cmd/smsapid/go.sum index d0fca37..190f538 100644 --- a/cmd/smsapid/go.sum +++ b/cmd/smsapid/go.sum @@ -2,8 +2,6 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= -github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= -github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= github.com/jszwec/csvutil v1.10.0/go.mod h1:/E4ONrmGkwmWsk9ae9jpXnv9QT8pLHEPcCirMFhxG9I= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= diff --git a/cmd/sql-migrate/main.go b/cmd/sql-migrate/main.go index 61b3eea..804d91a 100644 --- a/cmd/sql-migrate/main.go +++ b/cmd/sql-migrate/main.go @@ -74,7 +74,7 @@ DROP TABLE IF EXISTS _migrations; // Used for detection during auto-upgrade. logMigrationsQueryPrev2_2_0 = `SELECT name FROM _migrations ORDER BY name;` - logMigrationsQueryNote = "-- note: CLI arguments must be passed to the sql command to keep output machine-readable\n" + logMigrationsQueryNote = "-- note: CLI arguments must be passed to the sql command to keep output machine-readable\n" logMigrationsQuerySQLCmdNote = "-- connection: set SQLCMDSERVER, SQLCMDDATABASE, SQLCMDUSER, SQLCMDPASSWORD in .env\n" ) diff --git a/http/androidsmsgateway/go.mod b/http/androidsmsgateway/go.mod index 0c82548..a2cd13d 100644 --- a/http/androidsmsgateway/go.mod +++ b/http/androidsmsgateway/go.mod @@ -2,4 +2,4 @@ module github.com/therootcompany/golib/http/androidsmsgateway go 1.24.6 -require github.com/jszwec/csvutil v1.10.0 // indirect +require github.com/jszwec/csvutil v1.10.0 diff --git a/tools/monorel/main.go b/tools/monorel/main.go index a629b3f..e34ae19 100644 --- a/tools/monorel/main.go +++ b/tools/monorel/main.go @@ -1338,11 +1338,11 @@ func semverLess(a, b string) bool { b = strings.TrimPrefix(b, "v") var aPre, bPre string - if idx := strings.Index(a, "-"); idx >= 0 { - aPre, a = a[idx+1:], a[:idx] + if before, after, ok := strings.Cut(a, "-"); ok { + aPre, a = after, before } - if idx := strings.Index(b, "-"); idx >= 0 { - bPre, b = b[idx+1:], b[:idx] + if before, after, ok := strings.Cut(b, "-"); ok { + bPre, b = after, before } aP, bP := semverInts(a), semverInts(b) @@ -1515,10 +1515,10 @@ func goreleaserYAML(projectName string, bins []binary, opts buildOptions) string wf(" main: %s\n", bin.mainPath) } wf(" env:\n - CGO_ENABLED=0\n") - wf(" ldflags:\n - -s -w"+ - " -X main.version={{.Env.VERSION}}"+ - " -X main.commit={{.Commit}}"+ - " -X main.date={{.Date}}"+ + wf(" ldflags:\n - -s -w" + + " -X main.version={{.Env.VERSION}}" + + " -X main.commit={{.Commit}}" + + " -X main.date={{.Date}}" + " -X main.builtBy=goreleaser\n") w(" goos:\n - windows\n") w(" goarch:\n")