From 2d1f3e3819fa54a3e71d7a582bbbf23b71f8d32b Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Mon, 8 Apr 2024 23:37:04 +0200 Subject: [PATCH] Bump pkglib to go1.22 version --- cmd/blind_update.go | 2 +- cmd/info.go | 3 ++- go.mod | 12 +++++----- go.sum | 24 +++++++++---------- .../dis/component/exporter/logger/logger.go | 2 +- internal/phpx/marshal.go | 3 ++- internal/phpx/server.go | 6 ++--- .../wisski/ingredient/php/extras/prefixes.go | 2 +- pkg/compose/env.go | 13 +++------- 9 files changed, 31 insertions(+), 36 deletions(-) diff --git a/cmd/blind_update.go b/cmd/blind_update.go index b3f7788..fdb2303 100644 --- a/cmd/blind_update.go +++ b/cmd/blind_update.go @@ -47,7 +47,7 @@ func (bu blindUpdate) Run(context wisski_distillery.Context) (err error) { return err } if !bu.Force { - wissKIs = collection.Filter(wissKIs, func(instance *wisski.WissKI) bool { + wissKIs = collection.KeepFunc(wissKIs, func(instance *wisski.WissKI) bool { return bool(instance.AutoBlindUpdateEnabled) }) } diff --git a/cmd/info.go b/cmd/info.go index 1494590..83a8628 100644 --- a/cmd/info.go +++ b/cmd/info.go @@ -103,8 +103,9 @@ func (i info) Run(context wisski_distillery.Context) (err error) { } context.Printf("Pathbuilders: (count %d)\n", len(info.Pathbuilders)) - collection.IterateSorted(info.Pathbuilders, func(name, data string) { + collection.IterateSorted(info.Pathbuilders, func(name, data string) bool { context.Printf("- %s (%d bytes)\n", name, len(data)) + return true }) context.Printf("Users: (count %d)\n", len(info.Users)) diff --git a/go.mod b/go.mod index 0366979..e5029cf 100644 --- a/go.mod +++ b/go.mod @@ -13,16 +13,16 @@ require ( github.com/julienschmidt/httprouter v1.3.0 github.com/pkg/errors v0.9.1 github.com/pquerna/otp v1.4.0 - github.com/rs/zerolog v1.31.0 + github.com/rs/zerolog v1.32.0 github.com/tkw1536/goprogram v0.5.0 - github.com/tkw1536/pkglib v0.0.0-20231127091902-1ede10f3370e + github.com/tkw1536/pkglib v0.0.0-20240405094335-7587fbd14dcb github.com/yuin/goldmark v1.6.0 github.com/yuin/goldmark-meta v1.1.0 - golang.org/x/crypto v0.16.0 + golang.org/x/crypto v0.22.0 golang.org/x/exp v0.0.0-20231127185646-65229373498e - golang.org/x/net v0.19.0 + golang.org/x/net v0.24.0 golang.org/x/sync v0.5.0 - golang.org/x/term v0.15.0 + golang.org/x/term v0.19.0 gopkg.in/yaml.v3 v3.0.1 gorm.io/driver/mysql v1.5.2 gorm.io/gorm v1.25.5 @@ -63,7 +63,7 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.16.0 // indirect diff --git a/go.sum b/go.sum index 10d6234..648a4c3 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,8 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= -github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -117,8 +117,8 @@ github.com/tdewolff/test v1.0.7 h1:8Vs0142DmPFW/bQeHRP3MV19m1gvndjUb1sn8yy74LM= github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tkw1536/goprogram v0.5.0 h1:7vcIjmMdcZPJyRhgdlCaGfHAoOG3oYlFrno1pWXy1Bs= github.com/tkw1536/goprogram v0.5.0/go.mod h1:MDCwqLmvcc2QryMm6oSC9h/QAdE9PewZ2Mp2Lm7MmAg= -github.com/tkw1536/pkglib v0.0.0-20231127091902-1ede10f3370e h1:MnXtQ6JJwo29XkONrzrFRgJym48kWWTNa5lG4+uLyuQ= -github.com/tkw1536/pkglib v0.0.0-20231127091902-1ede10f3370e/go.mod h1:Qi/vpuxuxo5D40O9jLUSmcUF01B5LmJqDxs8o8Lc6bg= +github.com/tkw1536/pkglib v0.0.0-20240405094335-7587fbd14dcb h1:FblAz7MB6T+cuWViTEokBcvXcjzZXe8GlgVDTTTDL9Y= +github.com/tkw1536/pkglib v0.0.0-20240405094335-7587fbd14dcb/go.mod h1:A5DbN3900aj/necUqbUQlVjYLU69uMIg0EaBf80b1cY= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -136,8 +136,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No= golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -150,8 +150,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -170,13 +170,13 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/internal/dis/component/exporter/logger/logger.go b/internal/dis/component/exporter/logger/logger.go index 2ed896e..7460131 100644 --- a/internal/dis/component/exporter/logger/logger.go +++ b/internal/dis/component/exporter/logger/logger.go @@ -42,7 +42,7 @@ func (log *Logger) For(ctx context.Context, slug string) (exports []models.Expor return nil, err } - return collection.Filter(exports, func(s models.Export) bool { + return collection.KeepFunc(exports, func(s models.Export) bool { return s.Slug == slug }), nil } diff --git a/internal/phpx/marshal.go b/internal/phpx/marshal.go index d944739..6b60cfa 100644 --- a/internal/phpx/marshal.go +++ b/internal/phpx/marshal.go @@ -138,11 +138,12 @@ func MarshalMap(m map[string]any) string { var builder strings.Builder builder.WriteString("array(") - collection.IterateSorted(m, func(k string, v any) { + collection.IterateSorted(m, func(k string, v any) bool { builder.WriteString(MarshalString(k)) builder.WriteString("=>") builder.WriteString(MarshalJSON(v)) builder.WriteString(",") + return true }) builder.WriteString(")") diff --git a/internal/phpx/server.go b/internal/phpx/server.go index bcce6cc..9111a6f 100644 --- a/internal/phpx/server.go +++ b/internal/phpx/server.go @@ -9,12 +9,12 @@ import ( "io" "os" "regexp" + "slices" "strings" "sync" _ "embed" - "github.com/tkw1536/pkglib/collection" "github.com/tkw1536/pkglib/lazy" "github.com/tkw1536/pkglib/status" "github.com/tkw1536/pkglib/stream" @@ -285,8 +285,8 @@ func init() { } // remove comment lines - lines = collection.Filter(lines, func(line string) bool { - return !strings.HasPrefix(line, "//") + lines = slices.DeleteFunc(lines, func(line string) bool { + return strings.HasPrefix(line, "//") }) serverPHP = minifier.ReplaceAllString(strings.Join(lines, ""), "$1") diff --git a/internal/wisski/ingredient/php/extras/prefixes.go b/internal/wisski/ingredient/php/extras/prefixes.go index afbf18a..547f078 100644 --- a/internal/wisski/ingredient/php/extras/prefixes.go +++ b/internal/wisski/ingredient/php/extras/prefixes.go @@ -88,7 +88,7 @@ func (prefixes *Prefixes) getLivePrefixes(ctx context.Context, server *phpx.Serv } // filter out blocked prefixes - return collection.Filter(pfs, func(uri string) bool { return !hasAnyPrefix(uri, blocks) }), nil + return slices.DeleteFunc(pfs, func(uri string) bool { return hasAnyPrefix(uri, blocks) }), nil } func (wisski *Prefixes) getAdapterPrefixes(ctx context.Context, server *phpx.Server) (pfs []string, err error) { diff --git a/pkg/compose/env.go b/pkg/compose/env.go index 715eb53..72e4bc2 100644 --- a/pkg/compose/env.go +++ b/pkg/compose/env.go @@ -43,24 +43,17 @@ func WriteEnvFile(writer io.Writer, env map[string]string) (count int, err error return } - collection.IterateSorted(env, func(key, value string) { - // if we already had an error, break - if err != nil { - return - } - + collection.IterateSorted(env, func(key, value string) bool { // if we don't have a valid name, break if !isValidVariable(key) { err = errInvalidName(key) - return + return false } // write write key = EscapeEnvValue(value) followed by a new line n, err = fmt.Fprintf(writer, "%s%s%s\n", key, string(EnvEqualChar), EscapeEnvValue(value)) count += n - if err != nil { - return - } + return err == nil }) return }