From 04919879945a9d65d42cd5209df254eec509c9e2 Mon Sep 17 00:00:00 2001 From: Rohan Singh Date: Wed, 17 Apr 2024 13:54:43 -0400 Subject: [PATCH] Clean up applet initialization (#1036) * Clean up applet initialization * Previously you would a `runtime.Applet{}`, optionally set some fields on it, and then call its `Load` function. That function would set some other fields, and it was all kind of a mess. Replace all this with a `runtime.NewApplet()` function that accepts various options. * Get rid of the distinction between "filename" and "ID" for an applet. Each applet now only has an ID. * Replace Starlark thread initializers with explicit options or other alternatives. For example, `Run()` now accepts a `context.Context`, and there is a `WithPrintFunc` option. Minor: * Upgrade to Go 1.22.2. * Replace deprecated usages of `io/ioutil` and `pkg/errors`. * Fix lint errors * Add a function for running Starlark tests --- .github/workflows/main.yml | 6 +- .github/workflows/pull-request.yml | 4 +- cmd/community/loadapp.go | 16 +- cmd/community/validateicons.go | 5 +- cmd/profile.go | 16 +- cmd/render.go | 35 +- docs/gen_widget_imgs.go | 14 +- docs/schema/location/example.star | 2 +- docs/schema/locationbased/example.star | 2 +- docs/schema/oauth2/example.star | 2 +- docs/schema/photoselect/example.star | 2 +- encode/encode.go | 4 +- encode/encode_bench_test.go | 7 +- encode/encode_test.go | 33 +- encode/gif.go | 3 +- encode/webp.go | 8 +- examples/bitcoin.star | 4 +- examples/humanize.star | 2 +- examples/qrcode.star | 2 +- examples/sunrise.star | 4 +- go.mod | 8 +- go.sum | 485 +----------------- runtime/applet.go | 227 +++++--- runtime/applet_test.go | 108 ++-- runtime/cache_test.go | 37 +- runtime/httpcache.go | 3 +- runtime/httpcache_test.go | 7 +- runtime/modules/hmac/hmac_test.go | 7 +- runtime/modules/humanize/humanize_test.go | 7 +- runtime/modules/qrcode/qrcode_test.go | 6 +- runtime/modules/random/random.go | 1 - runtime/modules/random/random_test.go | 6 +- .../modules/starlarkhttp/testdata/test.star | 2 +- runtime/modules/sunrise/sunrise_test.go | 6 +- runtime/modules/xpath/xpath_test.go | 6 +- runtime/render_test.go | 21 +- runtime/secret.go | 15 +- runtime/secret_test.go | 17 +- runtime/test.star | 2 +- runtime/testdata/httpcache.star | 4 +- schema/color_test.go | 43 +- schema/datetime_test.go | 6 +- schema/dropdown_test.go | 6 +- schema/generated_test.go | 6 +- schema/handler_test.go | 19 +- schema/location_test.go | 6 +- schema/locationbased_test.go | 6 +- schema/module_test.go | 11 +- schema/oauth2_test.go | 6 +- schema/option_test.go | 6 +- schema/photoselect_test.go | 6 +- schema/schema_test.go | 9 +- schema/text_test.go | 6 +- schema/toggle_test.go | 6 +- schema/typeahead_test.go | 6 +- server/loader/loader.go | 27 +- server/loader/script.go | 15 +- server/loader/script_js.go | 17 +- 58 files changed, 437 insertions(+), 916 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3479704230..4f632823a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22.2" - name: Install buildifier run: make install-buildifier @@ -36,7 +36,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22.2" - name: Install Node uses: actions/setup-node@v3 @@ -158,7 +158,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22.2" - name: Fetch Release Artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index fa82500a69..0a971b1493 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22.2" - name: Install buildifier run: make install-buildifier @@ -34,7 +34,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22.2" - name: Install Node uses: actions/setup-node@v3 diff --git a/cmd/community/loadapp.go b/cmd/community/loadapp.go index b26ad1d437..8217976cb1 100644 --- a/cmd/community/loadapp.go +++ b/cmd/community/loadapp.go @@ -2,11 +2,10 @@ package community import ( "fmt" - "io/ioutil" + "os" "strings" "github.com/spf13/cobra" - "go.starlark.net/starlark" "tidbyt.dev/pixlet/runtime" ) @@ -26,7 +25,7 @@ func LoadApp(cmd *cobra.Command, args []string) error { return fmt.Errorf("script file must have suffix .star: %s", script) } - src, err := ioutil.ReadFile(script) + src, err := os.ReadFile(script) if err != nil { return fmt.Errorf("failed to read file %s: %w", script, err) } @@ -35,16 +34,7 @@ func LoadApp(cmd *cobra.Command, args []string) error { runtime.InitHTTP(cache) runtime.InitCache(cache) - // Remove the print function from the starlark thread. - initializers := []runtime.ThreadInitializer{} - initializers = append(initializers, func(thread *starlark.Thread) *starlark.Thread { - thread.Print = func(thread *starlark.Thread, msg string) {} - return thread - }) - - applet := runtime.Applet{} - err = applet.LoadWithInitializers("", script, src, nil, initializers...) - if err != nil { + if _, err := runtime.NewApplet(script, src, runtime.WithPrintDisabled()); err != nil { return fmt.Errorf("failed to load applet: %w", err) } diff --git a/cmd/community/validateicons.go b/cmd/community/validateicons.go index 3c654f62ad..f6d055afb1 100644 --- a/cmd/community/validateicons.go +++ b/cmd/community/validateicons.go @@ -46,8 +46,7 @@ func ValidateIcons(cmd *cobra.Command, args []string) error { return thread }) - applet := runtime.Applet{} - err = applet.LoadWithInitializers("", args[0], src, nil, initializers...) + applet, err := runtime.NewApplet(args[0], src, runtime.WithPrintDisabled()) if err != nil { return fmt.Errorf("failed to load applet: %w", err) } @@ -69,7 +68,7 @@ func ValidateIcons(cmd *cobra.Command, args []string) error { } if _, ok := icons.IconsMap[field.Icon]; !ok { - return fmt.Errorf("app '%s' contains unknown icon: '%s'", applet.Filename, field.Icon) + return fmt.Errorf("app '%s' contains unknown icon: '%s'", applet.ID, field.Icon) } } diff --git a/cmd/profile.go b/cmd/profile.go index 406b34f458..27d5a9b7e2 100644 --- a/cmd/profile.go +++ b/cmd/profile.go @@ -2,8 +2,8 @@ package cmd import ( "bytes" + "context" "fmt" - "io/ioutil" "os" "strings" "time" @@ -97,7 +97,7 @@ func profile(cmd *cobra.Command, args []string) error { } func ProfileApp(script string, config map[string]string) (*pprof_profile.Profile, error) { - src, err := ioutil.ReadFile(script) + src, err := os.ReadFile(script) if err != nil { return nil, fmt.Errorf("failed to read file %s: %w", script, err) } @@ -106,15 +106,7 @@ func ProfileApp(script string, config map[string]string) (*pprof_profile.Profile runtime.InitHTTP(cache) runtime.InitCache(cache) - // Remove the print function from the starlark thread. - initializers := []runtime.ThreadInitializer{} - initializers = append(initializers, func(thread *starlark.Thread) *starlark.Thread { - thread.Print = func(thread *starlark.Thread, msg string) {} - return thread - }) - - applet := runtime.Applet{} - err = applet.LoadWithInitializers("", script, src, nil, initializers...) + applet, err := runtime.NewApplet(script, src, runtime.WithPrintDisabled()) if err != nil { return nil, fmt.Errorf("failed to load applet: %w", err) } @@ -124,7 +116,7 @@ func ProfileApp(script string, config map[string]string) (*pprof_profile.Profile return nil, fmt.Errorf("error starting profiler: %w", err) } - _, err = applet.Run(config, initializers...) + _, err = applet.RunWithConfig(context.Background(), config) if err != nil { _ = starlark.StopProfile() return nil, fmt.Errorf("error running script: %w", err) diff --git a/cmd/render.go b/cmd/render.go index 004facf77e..d5746ea5ec 100644 --- a/cmd/render.go +++ b/cmd/render.go @@ -4,18 +4,15 @@ import ( "context" "fmt" "image" - "io/ioutil" "os" "strings" "time" "github.com/spf13/cobra" - "go.starlark.net/starlark" "tidbyt.dev/pixlet/encode" "tidbyt.dev/pixlet/globals" "tidbyt.dev/pixlet/runtime" - "tidbyt.dev/pixlet/starlarkutil" ) var ( @@ -106,45 +103,37 @@ func render(cmd *cobra.Command, args []string) error { config[split[0]] = strings.Join(split[1:], "=") } - src, err := ioutil.ReadFile(script) + src, err := os.ReadFile(script) if err != nil { return fmt.Errorf("failed to read file %s: %w", script, err) } // Remove the print function from the starlark thread if the silent flag is // passed. - initializers := []runtime.ThreadInitializer{} + var opts []runtime.AppletOption if silenceOutput { - initializers = append(initializers, func(thread *starlark.Thread) *starlark.Thread { - thread.Print = func(thread *starlark.Thread, msg string) {} - return thread - }) + opts = append(opts, runtime.WithPrintDisabled()) } - // Timeout? + ctx := context.Background() if timeout > 0 { - initializers = append(initializers, func(thread *starlark.Thread) *starlark.Thread { - ctx, _ := context.WithTimeoutCause( - context.Background(), - time.Duration(timeout)*time.Millisecond, - fmt.Errorf("timeout after %dms", timeout), - ) - starlarkutil.AttachThreadContext(ctx, thread) - return thread - }) + ctx, _ = context.WithTimeoutCause( + ctx, + time.Duration(timeout)*time.Millisecond, + fmt.Errorf("timeout after %dms", timeout), + ) } cache := runtime.NewInMemoryCache() runtime.InitHTTP(cache) runtime.InitCache(cache) - applet := runtime.Applet{} - err = applet.LoadWithInitializers("", script, src, nil, initializers...) + applet, err := runtime.NewApplet(script, src, opts...) if err != nil { return fmt.Errorf("failed to load applet: %w", err) } - roots, err := applet.Run(config, initializers...) + roots, err := applet.RunWithConfig(ctx, config) if err != nil { return fmt.Errorf("error running script: %w", err) } @@ -200,7 +189,7 @@ func render(cmd *cobra.Command, args []string) error { if outPath == "-" { _, err = os.Stdout.Write(buf) } else { - err = ioutil.WriteFile(outPath, buf, 0644) + err = os.WriteFile(outPath, buf, 0644) } if err != nil { diff --git a/docs/gen_widget_imgs.go b/docs/gen_widget_imgs.go index b3d82f6fba..4865ac7dc7 100644 --- a/docs/gen_widget_imgs.go +++ b/docs/gen_widget_imgs.go @@ -4,9 +4,10 @@ package main // documentation. import ( + "context" "fmt" "image" - "io/ioutil" + "os" "strings" "tidbyt.dev/pixlet/encode" @@ -40,7 +41,7 @@ func Magnify(input image.Image) (image.Image, error) { } func main() { - files, err := ioutil.ReadDir(".") + files, err := os.ReadDir(".") if err != nil { panic(err) } @@ -51,7 +52,7 @@ func main() { continue } - content, err := ioutil.ReadFile(f.Name()) + content, err := os.ReadFile(f.Name()) if err != nil { panic(err) } @@ -67,13 +68,12 @@ def main(): return render.Root(child=w) `, snippet) - app := runtime.Applet{} - err = app.Load(fmt.Sprintf("id-%s", name), name, []byte(src), nil) + app, err := runtime.NewApplet(name, []byte(src)) if err != nil { panic(err) } - roots, err := app.Run(nil) + roots, err := app.Run(context.Background()) if err != nil { panic(err) } @@ -83,7 +83,7 @@ def main(): panic(err) } - err = ioutil.WriteFile(fmt.Sprintf("img/widget_%s.gif", name), gif, 0644) + err = os.WriteFile(fmt.Sprintf("img/widget_%s.gif", name), gif, 0644) if err != nil { panic(err) } diff --git a/docs/schema/location/example.star b/docs/schema/location/example.star index 32cde8c856..636d80df41 100644 --- a/docs/schema/location/example.star +++ b/docs/schema/location/example.star @@ -1,6 +1,6 @@ +load("encoding/json.star", "json") load("render.star", "render") load("schema.star", "schema") -load("encoding/json.star", "json") DEFAULT_LOCATION = """ { diff --git a/docs/schema/locationbased/example.star b/docs/schema/locationbased/example.star index 973bb400a8..10fc2884da 100644 --- a/docs/schema/locationbased/example.star +++ b/docs/schema/locationbased/example.star @@ -1,6 +1,6 @@ +load("encoding/json.star", "json") load("render.star", "render") load("schema.star", "schema") -load("encoding/json.star", "json") EXAMPLE_LOCATION = """ { diff --git a/docs/schema/oauth2/example.star b/docs/schema/oauth2/example.star index 45c6f793bf..19c8fd80cb 100644 --- a/docs/schema/oauth2/example.star +++ b/docs/schema/oauth2/example.star @@ -1,8 +1,8 @@ +load("encoding/json.star", "json") load("http.star", "http") load("render.star", "render") load("schema.star", "schema") load("secret.star", "secret") -load("encoding/json.star", "json") OAUTH2_CLIENT_SECRET = secret.decrypt("your-client-secret") diff --git a/docs/schema/photoselect/example.star b/docs/schema/photoselect/example.star index 487ebf8ea3..34db4002a7 100644 --- a/docs/schema/photoselect/example.star +++ b/docs/schema/photoselect/example.star @@ -1,6 +1,6 @@ +load("encoding/base64.star", "base64") load("render.star", "render") load("schema.star", "schema") -load("encoding/base64.star", "base64") def main(config): encoded = config.get("photo", DEFAULT_PHOTO) diff --git a/encode/encode.go b/encode/encode.go index 239b973000..7fde7ddce5 100644 --- a/encode/encode.go +++ b/encode/encode.go @@ -2,9 +2,9 @@ package encode import ( "crypto/sha256" + "fmt" "image" - "github.com/pkg/errors" "github.com/vmihailenco/msgpack/v5" "tidbyt.dev/pixlet/render" @@ -77,7 +77,7 @@ func (s *Screens) Hash() ([]byte, error) { j, err := msgpack.Marshal(hashable) if err != nil { - return nil, errors.Wrap(err, "marshaling render tree to JSON") + return nil, fmt.Errorf("marshaling render tree to JSON: %w", err) } h := sha256.Sum256(j) diff --git a/encode/encode_bench_test.go b/encode/encode_bench_test.go index c74c1aac3c..c75d350af9 100644 --- a/encode/encode_bench_test.go +++ b/encode/encode_bench_test.go @@ -1,6 +1,7 @@ package encode import ( + "context" "testing" "tidbyt.dev/pixlet/runtime" @@ -71,15 +72,13 @@ def main(config): ` func BenchmarkRunAndRender(b *testing.B) { - app := &runtime.Applet{} - err := app.Load("benchid", "benchmark.star", []byte(BenchmarkDotStar), nil) + app, err := runtime.NewApplet("benchmark.star", []byte(BenchmarkDotStar)) if err != nil { b.Error(err) } - config := map[string]string{} for i := 0; i < b.N; i++ { - roots, err := app.Run(config) + roots, err := app.Run(context.Background()) if err != nil { b.Error(err) } diff --git a/encode/encode_test.go b/encode/encode_test.go index 0f63c96b37..44633a3449 100644 --- a/encode/encode_test.go +++ b/encode/encode_test.go @@ -2,6 +2,7 @@ package encode import ( "bytes" + "context" "image/gif" "strings" "testing" @@ -144,11 +145,10 @@ def main(): ` func TestFile(t *testing.T) { - app := runtime.Applet{} - err := app.Load("testid", "test.star", []byte(TestDotStar), nil) + app, err := runtime.NewApplet("test.star", []byte(TestDotStar)) assert.NoError(t, err) - roots, err := app.Run(map[string]string{}) + roots, err := app.Run(context.Background()) assert.NoError(t, err) webp, err := ScreensFromRoots(roots).EncodeWebP(15000) @@ -157,11 +157,10 @@ func TestFile(t *testing.T) { } func TestHash(t *testing.T) { - app := runtime.Applet{} - err := app.Load("testid", "test.star", []byte(TestDotStar), nil) + app, err := runtime.NewApplet("test.star", []byte(TestDotStar)) require.NoError(t, err) - roots, err := app.Run(map[string]string{}) + roots, err := app.Run(context.Background()) require.NoError(t, err) // ensure we can calculate a hash @@ -178,11 +177,10 @@ func TestHash(t *testing.T) { // change the app slightly modifiedSource := strings.Replace(TestDotStar, "foo bar", "bar foo", 1) - app2 := runtime.Applet{} - err = app2.Load("testid2", "test.star", []byte(modifiedSource), nil) + app2, err := runtime.NewApplet("test.star", []byte(modifiedSource)) require.NoError(t, err) - roots2, err := app2.Run(map[string]string{}) + roots2, err := app2.Run(context.Background()) require.NoError(t, err) // ensure we can calculate a hash on the new app @@ -237,9 +235,9 @@ load("render.star", "render") def main(): return render.Root(show_full_animation=True, child=render.Box()) ` - app := runtime.Applet{} - require.NoError(t, app.Load("testid", "test.star", []byte(requestFull), nil)) - roots, err := app.Run(map[string]string{}) + app, err := runtime.NewApplet("test.star", []byte(requestFull)) + require.NoError(t, err) + roots, err := app.Run(context.Background()) assert.NoError(t, err) assert.True(t, ScreensFromRoots(roots).ShowFullAnimation) @@ -248,9 +246,9 @@ load("render.star", "render") def main(): return render.Root(child=render.Box()) ` - app = runtime.Applet{} - require.NoError(t, app.Load("testid", "test.star", []byte(dontRequestFull), nil)) - roots, err = app.Run(map[string]string{}) + app, err = runtime.NewApplet("test.star", []byte(dontRequestFull)) + require.NoError(t, err) + roots, err = app.Run(context.Background()) assert.NoError(t, err) assert.False(t, ScreensFromRoots(roots).ShowFullAnimation) } @@ -275,11 +273,10 @@ def main(): ) `) - app := runtime.Applet{} - err := app.Load("testid", "test.star", src, nil) + app, err := runtime.NewApplet("test.star", src) assert.NoError(t, err) - roots, err := app.Run(map[string]string{}) + roots, err := app.Run(context.Background()) assert.NoError(t, err) // Source above will produce a 70 frame animation diff --git a/encode/gif.go b/encode/gif.go index 3b8a162613..fa4dc4ab67 100644 --- a/encode/gif.go +++ b/encode/gif.go @@ -9,7 +9,6 @@ import ( "image/gif" "github.com/ericpauley/go-quantize/quantize" - "github.com/pkg/errors" ) // Renders a screen to GIF. Optionally pass filters for postprocessing @@ -56,7 +55,7 @@ func (s *Screens) EncodeGIF(maxDuration int, filters ...ImageFilter) ([]byte, er buf := &bytes.Buffer{} err = gif.EncodeAll(buf, g) if err != nil { - return nil, errors.Wrap(err, "encoding") + return nil, fmt.Errorf("encoding: %w", err) } return buf.Bytes(), nil diff --git a/encode/webp.go b/encode/webp.go index 9ad09a6e1b..fb3586e1e5 100644 --- a/encode/webp.go +++ b/encode/webp.go @@ -3,9 +3,9 @@ package encode import ( + "fmt" "time" - "github.com/pkg/errors" "github.com/tidbyt/go-libwebp/webp" ) @@ -29,7 +29,7 @@ func (s *Screens) EncodeWebP(maxDuration int, filters ...ImageFilter) ([]byte, e WebPKMax, ) if err != nil { - return nil, errors.Wrap(err, "initializing encoder") + return nil, fmt.Errorf("%s: %w", "initializing encoder", err) } defer anim.Close() @@ -45,7 +45,7 @@ func (s *Screens) EncodeWebP(maxDuration int, filters ...ImageFilter) ([]byte, e } if err := anim.AddFrame(im, frameDuration); err != nil { - return nil, errors.Wrap(err, "adding frame") + return nil, fmt.Errorf("%s: %w", "adding frame", err) } if maxDuration > 0 && remainingDuration <= 0 { @@ -55,7 +55,7 @@ func (s *Screens) EncodeWebP(maxDuration int, filters ...ImageFilter) ([]byte, e buf, err := anim.Assemble() if err != nil { - return nil, errors.Wrap(err, "encoding animation") + return nil, fmt.Errorf("%s: %w", "encoding animation", err) } return buf, nil diff --git a/examples/bitcoin.star b/examples/bitcoin.star index 3a3798b8df..19ea6748a1 100644 --- a/examples/bitcoin.star +++ b/examples/bitcoin.star @@ -1,6 +1,6 @@ -load("render.star", "render") -load("http.star", "http") load("encoding/base64.star", "base64") +load("http.star", "http") +load("render.star", "render") COINDESK_PRICE_URL = "https://api.coindesk.com/v1/bpi/currentprice.json" diff --git a/examples/humanize.star b/examples/humanize.star index 90197c0719..e021a1e93e 100644 --- a/examples/humanize.star +++ b/examples/humanize.star @@ -1,7 +1,7 @@ +load("humanize.star", "humanize") load("render.star", "render") load("schema.star", "schema") load("time.star", "time") -load("humanize.star", "humanize") DEFAULT_COUNTER = "1337" DEFAULT_APPS = "42" diff --git a/examples/qrcode.star b/examples/qrcode.star index 6b54e8d8dc..f812d3f94c 100644 --- a/examples/qrcode.star +++ b/examples/qrcode.star @@ -1,7 +1,7 @@ load("cache.star", "cache") load("encoding/base64.star", "base64") -load("render.star", "render") load("qrcode.star", "qrcode") +load("render.star", "render") def main(config): url = "https://tidbyt.com?utm_source=pixlet_example" diff --git a/examples/sunrise.star b/examples/sunrise.star index 6f70b8fb2b..f920309a30 100644 --- a/examples/sunrise.star +++ b/examples/sunrise.star @@ -1,8 +1,8 @@ +load("encoding/json.star", "json") load("render.star", "render") load("schema.star", "schema") -load("time.star", "time") -load("encoding/json.star", "json") load("sunrise.star", "sunrise") +load("time.star", "time") DEFAULT_LOCATION = """ { diff --git a/go.mod b/go.mod index 5daa2ac7aa..317e8c198c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module tidbyt.dev/pixlet -go 1.21 +go 1.22 + +toolchain go1.22.2 require ( github.com/Code-Hex/Neo-cowsay/v2 v2.0.4 @@ -26,7 +28,6 @@ require ( github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20220510032225-4f9f17eaec4c github.com/nlepage/go-wasm-http-server v1.1.0 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c - github.com/pkg/errors v0.9.1 github.com/qri-io/starlib v0.5.1-0.20220611014110-7fb7ff9ec804 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/spf13/cobra v1.8.0 @@ -52,7 +53,6 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect github.com/PuerkitoBio/goquery v1.5.1 // indirect - github.com/acomagu/bufpipe v1.0.4 // indirect github.com/andybalholm/cascadia v1.1.0 // indirect github.com/antchfx/xpath v1.2.4 // indirect github.com/chzyer/readline v1.5.1 // indirect @@ -82,6 +82,7 @@ require ( github.com/nlepage/go-js-promise v1.0.0 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect @@ -91,7 +92,6 @@ require ( github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect diff --git a/go.sum b/go.sum index 6fc2bf023e..e9dd98c443 100644 --- a/go.sum +++ b/go.sum @@ -1,46 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Code-Hex/Neo-cowsay/v2 v2.0.4 h1:y80Hd9hmB+rsEH/p4c5ti5PbO0PhBmxw4NgbpFZvoHg= github.com/Code-Hex/Neo-cowsay/v2 v2.0.4/go.mod h1:6k40Pwrc2FazLf1BUbmAC36E9LvT+DErjZr30isbXhg= github.com/Code-Hex/go-wordwrap v1.0.0 h1:yl5fLyZEz3+hPGbpTRlTQ8mQJ1HXWcTq1FCNR1ch6zM= @@ -53,16 +15,12 @@ github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCv github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= -github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= -github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= -github.com/antchfx/xmlquery v1.3.16 h1:OCevguHq93z9Y4vb9xpRmU4Cc9lMVoiMkMbBNZVDeBM= -github.com/antchfx/xmlquery v1.3.16/go.mod h1:Afkq4JIeXut75taLSuI31ISJ/zeq+3jG7TunF7noreA= github.com/antchfx/xmlquery v1.3.18 h1:FSQ3wMuphnPPGJOFhvc+cRQ2CT/rUj4cyQXkJcjOwz0= github.com/antchfx/xmlquery v1.3.18/go.mod h1:Afkq4JIeXut75taLSuI31ISJ/zeq+3jG7TunF7noreA= github.com/antchfx/xpath v1.2.4 h1:dW1HB/JxKvGtJ9WyVGJ0sIoEcqftV3SqIstujI+B9XY= @@ -97,21 +55,16 @@ github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -124,23 +77,15 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 h1:BBade+JlV/f7JstZ4pitd4tHhpN+w+6I+LyOS7B4fyU= github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4/go.mod h1:H7chHJglrhPPzetLdzBleF8d22WYOv7UM/lEKYiwlKM= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= @@ -154,17 +99,10 @@ github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66D github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= -github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f h1:Pz0DHeFij3XFhoBRGUDPzSJ+w2UcK5/0JvF8DRI58r8= -github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= -github.com/go-git/go-git/v5 v5.9.0 h1:cD9SFA7sHVRdJ7AYck1ZaAa/yeuBvGPxwXDL8cxrObY= -github.com/go-git/go-git/v5 v5.9.0/go.mod h1:RKIqga24sWdMGZF+1Ekv9kylsDz6LzdTSI2s/OsZWE0= -github.com/go-git/go-git/v5 v5.10.0 h1:F0x3xXrAWmhwtzoCokU4IMPcBdncG+HAAqi9FcOOjbQ= -github.com/go-git/go-git/v5 v5.10.0/go.mod h1:1FOZ/pQnqw24ghP2n7cunVl0ON55BsjPYvhWHvZGhoo= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -190,102 +128,47 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8 h1:gpptm606MZYGaMHMsB4Srmb6EbW/IVHnt04rcMXnkBQ= -github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ= -github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b h1:RMpPgZTSApbPf7xaVel+QkoGPRLFLrwFO89uDUHEGf0= -github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk= -github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/pprof v0.0.0-20240327155427-868f304927ed h1:n8QtJTrwsv3P7dNxPaMeNkMcxvUpqocsHLr8iDLGlQI= -github.com/google/pprof v0.0.0-20240327155427-868f304927ed/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f h1:f00RU+zOX+B3rLAmMMkzHUF2h1z4DeYR9tTCvEq2REY= github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w= github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab h1:BA4a7pe6ZTd9F8kXETBoijjFJ/ntaa//1wiH9BZu4zU= -github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465 h1:KwWnWVWCNtNq/ewIX7HIKnELmEx2nDP42yskD/pi7QE= github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -296,8 +179,6 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= @@ -305,7 +186,6 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -323,13 +203,9 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= -github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= -github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= @@ -362,22 +238,16 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/paulmach/orb v0.1.5/go.mod h1:pPwxxs3zoAyosNSbNKn1jiXV2+oovRDObDKfTvRegDI= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= -github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= -github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= -github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -396,13 +266,10 @@ github.com/qri-io/starlib v0.5.1-0.20220611014110-7fb7ff9ec804/go.mod h1:Geq0MWa github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= -github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= @@ -414,8 +281,6 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM= -github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo= github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -425,33 +290,19 @@ github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9yS github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= -github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= -github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= -github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= -github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= -github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= @@ -467,32 +318,20 @@ github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnR github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= -github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tidbyt/gg v0.0.0-20220808163829-95806fa1d427 h1:br5WYVw/jr4G0PZpBBx2fBAANVUrI8KKHMSs3LVqO9A= github.com/tidbyt/gg v0.0.0-20220808163829-95806fa1d427/go.mod h1:+SCm6iJHe2lfsQzlbLCsd5XsTKYSD0VqtQmWMnNs9OE= -github.com/tidbyt/go-libwebp v0.0.0-20220802221933-1fabc3b46601 h1:W7xhAgRtepnWBTmbzb0R+5ikjEYCX1c55SN8HJv5FcI= -github.com/tidbyt/go-libwebp v0.0.0-20220802221933-1fabc3b46601/go.mod h1:JU6yp7mldR7lmftjHPtaDs+Q8xn7l2tMR1XYx5iJELg= github.com/tidbyt/go-libwebp v0.0.0-20230922075150-fb11063b2a6a h1:zvAhEO3ZB7m1Lc3BwJXLTDrLrHVAbcDByJ7XkL4WR+s= github.com/tidbyt/go-libwebp v0.0.0-20230922075150-fb11063b2a6a/go.mod h1:JU6yp7mldR7lmftjHPtaDs+Q8xn7l2tMR1XYx5iJELg= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= -github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= -github.com/vmihailenco/msgpack/v5 v5.4.0 h1:hRM0digJwyR6vll33NNAwCFguy5JuBD6jxDmQP3l608= -github.com/vmihailenco/msgpack/v5 v5.4.0/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= @@ -501,42 +340,12 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zachomedia/go-bdf v0.0.0-20220611021443-a3af701111be h1:qf05vm7CJA3tcnR42pv2a/+pvCPGylJcg10B9CRFPvg= github.com/zachomedia/go-bdf v0.0.0-20220611021443-a3af701111be/go.mod h1:FWqHpmEj39kZYjkb4y+GkFRwJofD3lP2k8ataoNlo2Y= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -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.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.starlark.net v0.0.0-20210223155950-e043a3d3c984/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0= go.starlark.net v0.0.0-20210602144842-1cdb82c9e17a/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0= -go.starlark.net v0.0.0-20230912135651-745481cf39ed h1:kNt8RXSIU6IRBO9MP3m+6q3WpyBHQQXqSktcyVKDPOQ= -go.starlark.net v0.0.0-20230912135651-745481cf39ed/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= -go.starlark.net v0.0.0-20230921150705-79febcec3f90 h1:XVeSWZcJ+8Bluixg49AIinMVvROaFn+mgmtplhOMGdw= -go.starlark.net v0.0.0-20230921150705-79febcec3f90/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= -go.starlark.net v0.0.0-20230921161717-a9587466d7a5 h1:Hg7PpzzjFq0TBToBkMgmjY0W09rC52nmm+v2ME9ZT5w= -go.starlark.net v0.0.0-20230921161717-a9587466d7a5/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= -go.starlark.net v0.0.0-20230925163745-10651d5192ab h1:7QkXlIVjYdSsKKSGnM0jQdw/2w9W5qcFDGTc00zKqgI= -go.starlark.net v0.0.0-20230925163745-10651d5192ab/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= -go.starlark.net v0.0.0-20231013162135-47c85baa7a64 h1:oEn8uu0f/4jnlInr2y86GrMRux+y9i8XrO8w1jVyVNo= -go.starlark.net v0.0.0-20231013162135-47c85baa7a64/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= -go.starlark.net v0.0.0-20231016134836-22325403fcb3 h1:CKbpFNZNfaNyEWd6C+F1vLZ0WJjukoU45zDErBmRKPs= -go.starlark.net v0.0.0-20231016134836-22325403fcb3/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= -go.starlark.net v0.0.0-20231101134539-556fd59b42f6 h1:+eC0F/k4aBLC4szgOcjd7bDTEnpxADJyWJE0yowgM3E= -go.starlark.net v0.0.0-20231101134539-556fd59b42f6/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= -go.starlark.net v0.0.0-20231121155337-90ade8b19d09 h1:hzy3LFnSN8kuQK8h9tHl4ndF6UruMj47OqwqsS+/Ai4= -go.starlark.net v0.0.0-20231121155337-90ade8b19d09/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= -go.starlark.net v0.0.0-20240307200823-981680b3e495 h1:Ln1SHdenasr/C6gJTSJcxc8L+lFQ+rkA5lwu7ORdWNo= -go.starlark.net v0.0.0-20240307200823-981680b3e495/go.mod h1:MrdO7XaMF3dE3MzuP6mrG0EB3NC7rLWSiEcu9Ii50g8= -go.starlark.net v0.0.0-20240314022150-ee8ed142361c h1:roAjH18hZcwI4hHStHbkXjF5b7UUyZ/0SG3hXNN1SjA= -go.starlark.net v0.0.0-20240314022150-ee8ed142361c/go.mod h1:YKMCv9b1WrfWmeqdV5MAuEHWsu5iC+fe6kYl2sQjdI8= go.starlark.net v0.0.0-20240329153429-e6e8e7ce1b7a h1:Oe+v9w90BBIxQZ4U39+axR8KxrBbxqnRudPPcBIlP3o= go.starlark.net v0.0.0-20240329153429-e6e8e7ce1b7a/go.mod h1:YKMCv9b1WrfWmeqdV5MAuEHWsu5iC+fe6kYl2sQjdI8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -548,70 +357,21 @@ go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTV go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= 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= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -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-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= -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.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.12.0 h1:w13vZbU4o5rKOFFR8y7M+c4A5jXDC0uXTdHYRP8X2DQ= -golang.org/x/image v0.12.0/go.mod h1:Lu90jvHG7GfemOIcldsh9A2hS01ocl6oNO7ype5mEnk= -golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg= -golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk= -golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4= -golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= @@ -621,35 +381,13 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -657,55 +395,17 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= -golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -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.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= -golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= -golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0= -golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= -golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= -golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -714,228 +414,71 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -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.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.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-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -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.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= 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= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -944,12 +487,9 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -959,7 +499,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= @@ -975,12 +514,4 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/runtime/applet.go b/runtime/applet.go index f65d6b39ff..fc8d731cea 100644 --- a/runtime/applet.go +++ b/runtime/applet.go @@ -5,8 +5,9 @@ import ( "crypto/md5" "encoding/json" "fmt" + "strings" + "testing" - "github.com/pkg/errors" starlibgzip "github.com/qri-io/starlib/compress/gzip" starlibbase64 "github.com/qri-io/starlib/encoding/base64" starlibcsv "github.com/qri-io/starlib/encoding/csv" @@ -17,10 +18,10 @@ import ( starlibjson "go.starlark.net/lib/json" starlibmath "go.starlark.net/lib/math" starlibtime "go.starlark.net/lib/time" - "go.starlark.net/resolve" "go.starlark.net/starlark" "go.starlark.net/starlarkstruct" "go.starlark.net/starlarktest" + "go.starlark.net/syntax" "tidbyt.dev/pixlet/render" "tidbyt.dev/pixlet/runtime/modules/animation_runtime" @@ -38,138 +39,163 @@ import ( type ModuleLoader func(*starlark.Thread, string) (starlark.StringDict, error) +type PrintFunc func(thread *starlark.Thread, msg string) + +type AppletOption func(*Applet) error + // ThreadInitializer is called when building a Starlark thread to run an applet // on. It can customize the thread by overriding behavior or attaching thread // local data. type ThreadInitializer func(thread *starlark.Thread) *starlark.Thread -func init() { - resolve.AllowFloat = true - resolve.AllowLambda = true - resolve.AllowNestedDef = true - resolve.AllowSet = true - resolve.AllowRecursion = true -} - type Applet struct { - Filename string - ThreadID string - AppID string - Globals starlark.StringDict - SecretDecryptionKey *SecretDecryptionKey + ID string - src []byte - loader ModuleLoader - predeclared starlark.StringDict - main *starlark.Function + src []byte + loader ModuleLoader + initializers []ThreadInitializer + + globals starlark.StringDict + main *starlark.Function schema *schema.Schema schemaJSON []byte - decrypter decrypter } -func (a *Applet) thread(initializers ...ThreadInitializer) *starlark.Thread { - t := &starlark.Thread{ - Name: a.ThreadID, - Load: a.loadModule, - Print: func(thread *starlark.Thread, msg string) { - fmt.Printf("[%s] %s\n", a.Filename, msg) - }, +func WithModuleLoader(loader ModuleLoader) AppletOption { + return func(a *Applet) error { + a.loader = loader + return nil } +} - if a.decrypter != nil { - a.decrypter.attachToThread(t) +func WithThreadInitializer(initializer ThreadInitializer) AppletOption { + return func(a *Applet) error { + a.initializers = append(a.initializers, initializer) + return nil } +} - random.AttachToThread(t) - - for _, init := range initializers { - t = init(t) +func WithSecretDecryptionKey(key *SecretDecryptionKey) AppletOption { + return func(a *Applet) error { + if decrypter, err := key.decrypterForApp(a); err != nil { + return fmt.Errorf("preparing secret key: %w", err) + } else { + a.initializers = append(a.initializers, func(t *starlark.Thread) *starlark.Thread { + decrypter.attachToThread(t) + return t + }) + return nil + } } +} - return t +func WithPrintFunc(print PrintFunc) AppletOption { + return func(a *Applet) error { + a.initializers = append(a.initializers, func(t *starlark.Thread) *starlark.Thread { + t.Print = print + return t + }) + return nil + } } -// Loads an applet. The script filename is used as a descriptor only, -// and the actual code should be passed in src. Optionally also pass -// loader to make additional starlark modules available to the script. -func (a *Applet) Load(appID string, filename string, src []byte, loader ModuleLoader) (err error) { - return a.LoadWithInitializers(appID, filename, src, loader) +func WithPrintDisabled() AppletOption { + return WithPrintFunc(func(thread *starlark.Thread, msg string) {}) } -func (a *Applet) LoadWithInitializers(appID string, filename string, src []byte, loader ModuleLoader, initializers ...ThreadInitializer) (err error) { - defer func() { - if r := recover(); r != nil { - err = fmt.Errorf("panic while executing %s: %v", a.Filename, r) - } - }() +func NewApplet(id string, src []byte, opts ...AppletOption) (*Applet, error) { + a := &Applet{ + ID: id, + src: src, + } - a.AppID = appID - a.Filename = filename - a.loader = loader + for _, opt := range opts { + if err := opt(a); err != nil { + return nil, err + } + } - a.src = src + if err := a.load(); err != nil { + return nil, err + } - a.ThreadID = fmt.Sprintf("%s/%x", filename, md5.Sum(src)) + return a, nil +} - if a.SecretDecryptionKey != nil { - a.decrypter, err = a.SecretDecryptionKey.decrypterForApp(a) - if err != nil { - return errors.Wrapf(err, "preparing secret key for %s", a.Filename) +func (a *Applet) load() (err error) { + defer func() { + if r := recover(); r != nil { + err = fmt.Errorf("panic while executing %s: %v", a.ID, r) } - } + }() - a.predeclared = starlark.StringDict{ + predeclared := starlark.StringDict{ "struct": starlark.NewBuiltin("struct", starlarkstruct.Make), } - globals, err := starlark.ExecFile(a.thread(initializers...), a.Filename, a.src, a.predeclared) + globals, err := starlark.ExecFileOptions( + &syntax.FileOptions{ + Set: true, + Recursion: true, + }, + a.newThread(context.Background()), + a.ID, + a.src, + predeclared, + ) if err != nil { return fmt.Errorf("starlark.ExecFile: %v", err) } - a.Globals = globals + a.globals = globals mainFun, found := globals["main"] if !found { - return fmt.Errorf("%s didn't export a main() function", filename) + return fmt.Errorf("%s didn't export a main() function", a.ID) } main, ok := mainFun.(*starlark.Function) if !ok { - return fmt.Errorf("%s exported a main() that is not function", filename) + return fmt.Errorf("%s exported a main() that is not function", a.ID) } a.main = main - schemaFun, _ := a.Globals[schema.SchemaFunctionName].(*starlark.Function) + schemaFun, _ := a.globals[schema.SchemaFunctionName].(*starlark.Function) if schemaFun != nil { - schemaVal, err := a.Call(schemaFun, nil) + schemaVal, err := a.Call(context.Background(), schemaFun) if err != nil { - return errors.Wrapf(err, "calling schema function for %s", a.Filename) + return fmt.Errorf("calling schema function for %s: %w", a.ID, err) } - a.schema, err = schema.FromStarlark(schemaVal, a.Globals) + a.schema, err = schema.FromStarlark(schemaVal, a.globals) if err != nil { - return errors.Wrapf(err, "parsing schema for %s", a.Filename) + return fmt.Errorf("parsing schema for %s: %w", a.ID, err) } a.schemaJSON, err = json.Marshal(a.schema) if err != nil { - return errors.Wrapf(err, "serializing schema to JSON for %s", a.Filename) + return fmt.Errorf("serializing schema to JSON for %s: %w", a.ID, err) } } return nil } -// Runs the applet's main function, passing it configuration as a -// starlark dict. -func (a *Applet) Run(config map[string]string, initializers ...ThreadInitializer) (roots []render.Root, err error) { +// Run executes the applet's main function. It returns the render roots that are +// returned by the applet. +func (a *Applet) Run(ctx context.Context) (roots []render.Root, err error) { + return a.RunWithConfig(ctx, nil) +} + +// RunWithConfig exceutes the applet's main function, passing it configuration as a +// starlark dict. It returns the render roots that are returned by the applet. +func (a *Applet) RunWithConfig(ctx context.Context, config map[string]string) (roots []render.Root, err error) { var args starlark.Tuple if a.main.NumParams() > 0 { starlarkConfig := AppletConfig(config) args = starlark.Tuple{starlarkConfig} } - returnValue, err := a.Call(a.main, args, initializers...) + returnValue, err := a.Call(ctx, a.main, args...) if err != nil { return nil, err } @@ -210,9 +236,9 @@ func (app *Applet) CallSchemaHandler(ctx context.Context, handlerName, parameter } resultVal, err := app.Call( + ctx, handler.Function, - starlark.Tuple{starlark.String(parameter)}, - attachContext(ctx), + starlark.String(parameter), ) if err != nil { return "", fmt.Errorf("calling schema handler %s: %v", handlerName, err) @@ -227,14 +253,14 @@ func (app *Applet) CallSchemaHandler(ctx context.Context, handlerName, parameter return options, nil case schema.ReturnSchema: - sch, err := schema.FromStarlark(resultVal, app.Globals) + sch, err := schema.FromStarlark(resultVal, app.globals) if err != nil { return "", err } s, err := json.Marshal(sch) if err != nil { - return "", errors.Wrap(err, "serializing schema to JSON") + return "", fmt.Errorf("serializing schema to JSON: %w", err) } return string(s), nil @@ -258,33 +284,49 @@ func (app *Applet) GetSchema() string { return string(app.schemaJSON) } -func attachContext(ctx context.Context) ThreadInitializer { - return func(thread *starlark.Thread) *starlark.Thread { - starlarkutil.AttachThreadContext(ctx, thread) +// RunTests runs all test functions that are defined in the applet source. +func (app *Applet) RunTests(t *testing.T) { + app.initializers = append(app.initializers, func(thread *starlark.Thread) *starlark.Thread { + starlarktest.SetReporter(thread, t) return thread + }) + + for name, global := range app.globals { + if !strings.HasPrefix(name, "test_") { + continue + } + + fun, ok := global.(*starlark.Function) + if ok && fun != app.main { + t.Run(name, func(t *testing.T) { + if _, err := app.Call(context.Background(), fun); err != nil { + t.Error(err) + } + }) + } } } // Calls any callable from Applet.Globals. Pass args and receive a // starlark Value, or an error if you're unlucky. -func (a *Applet) Call(callable *starlark.Function, args starlark.Tuple, initializers ...ThreadInitializer) (val starlark.Value, err error) { +func (a *Applet) Call(ctx context.Context, callable *starlark.Function, args ...starlark.Value) (val starlark.Value, err error) { defer func() { if r := recover(); r != nil { - err = fmt.Errorf("panic while running %s: %v", a.Filename, r) + err = fmt.Errorf("panic while running %s: %v", a.ID, r) } }() - t := a.thread(initializers...) + t := a.newThread(ctx) - context.AfterFunc(starlarkutil.ThreadContext(t), func() { - t.Cancel(context.Cause(starlarkutil.ThreadContext(t)).Error()) + context.AfterFunc(ctx, func() { + t.Cancel(context.Cause(ctx).Error()) }) resultVal, err := starlark.Call(t, callable, args, nil) if err != nil { evalErr, ok := err.(*starlark.EvalError) if ok { - return nil, errors.New(evalErr.Backtrace()) + return nil, fmt.Errorf(evalErr.Backtrace()) } return nil, fmt.Errorf( "in %s at %s: %s", @@ -397,3 +439,22 @@ func (a *Applet) loadModule(thread *starlark.Thread, module string) (starlark.St return nil, fmt.Errorf("invalid module: %s", module) } } + +func (a *Applet) newThread(ctx context.Context) *starlark.Thread { + t := &starlark.Thread{ + Name: fmt.Sprintf("%s/%x", a.ID, md5.Sum(a.src)), + Load: a.loadModule, + Print: func(thread *starlark.Thread, msg string) { + fmt.Printf("[%s] %s\n", a.ID, msg) + }, + } + + starlarkutil.AttachThreadContext(ctx, t) + random.AttachToThread(t) + + for _, init := range a.initializers { + t = init(t) + } + + return t +} diff --git a/runtime/applet_test.go b/runtime/applet_test.go index 261a53c4c3..7997d03331 100644 --- a/runtime/applet_test.go +++ b/runtime/applet_test.go @@ -3,6 +3,7 @@ package runtime import ( "archive/zip" "bytes" + "context" "fmt" "testing" @@ -13,15 +14,13 @@ import ( ) func TestLoadEmptySrc(t *testing.T) { - app := &Applet{} - err := app.Load("testid", "test.star", []byte{}, nil) + _, err := NewApplet("test.star", []byte{}) assert.Error(t, err) } func TestLoadMalformed(t *testing.T) { src := "this is not valid starlark" - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + _, err := NewApplet("test.star", []byte(src)) assert.Error(t, err) } @@ -32,9 +31,9 @@ load("render.star", "render") def main(): return render.Root(child=render.Box()) ` - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) + assert.NotNil(t, app) // As is this src = ` @@ -44,9 +43,9 @@ def main2(): main = main2 ` - app = &Applet{} - err = app.Load("testid", "test.star", []byte(src), nil) + app, err = NewApplet("test.star", []byte(src)) assert.NoError(t, err) + assert.NotNil(t, app) // And this (a lambda is a function) src = ` @@ -56,9 +55,9 @@ def main2(): main = lambda: main2() ` - app = &Applet{} - err = app.Load("testid", "test.star", []byte(src), nil) + app, err = NewApplet("test.star", []byte(src)) assert.NoError(t, err) + assert.NotNil(t, app) // But not this, because a string is not a function src = ` @@ -68,8 +67,7 @@ def main2(): main = "main2" ` - app = &Applet{} - err = app.Load("testid", "test.star", []byte(src), nil) + _, err = NewApplet("test.star", []byte(src)) assert.Error(t, err) // And not this either, because here main is gone @@ -78,10 +76,8 @@ load("render.star", "render") def main2(): return render.Root(child=render.Box()) ` - app = &Applet{} - err = app.Load("testid", "test.star", []byte(src), nil) + _, err = NewApplet("test.star", []byte(src)) assert.Error(t, err) - } func TestRunMainReturnsFrames(t *testing.T) { @@ -91,10 +87,10 @@ load("render.star", "render") def main(): return [render.Box()] ` - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + assert.NotNil(t, app) + screens, err := app.Run(context.Background()) assert.Error(t, err) assert.Nil(t, screens) @@ -105,10 +101,10 @@ def main(): return render.Root(child=render.Box()) ` - app = &Applet{} - err = app.Load("testid", "test.star", []byte(src), nil) + app, err = NewApplet("test.star", []byte(src)) assert.NoError(t, err) - screens, err = app.Run(map[string]string{}) + assert.NotNil(t, app) + screens, err = app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) @@ -118,10 +114,10 @@ load("render.star", "render") def main(): return [render.Root(child=render.Box()), render.Root(child=render.Text("hi"))] ` - app = &Applet{} - err = app.Load("testid", "test.star", []byte(src), nil) + app, err = NewApplet("test.star", []byte(src)) assert.NoError(t, err) - screens, err = app.Run(map[string]string{}) + assert.NotNil(t, app) + screens, err = app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } @@ -140,10 +136,10 @@ load("render.star", "render") def main(): return render.Root(child=render.Box()) ` - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) - roots, err := app.Run(config) + assert.NotNil(t, app) + roots, err := app.RunWithConfig(context.Background(), config) assert.NoError(t, err) assert.Equal(t, 1, len(roots)) @@ -169,10 +165,10 @@ def main(config): return [render.Root(child=render.Box()) for _ in range(int(config["one"]) + int(config["two"]))] ` - app = &Applet{} - err = app.Load("testid", "test.star", []byte(src), nil) + app, err = NewApplet("test.star", []byte(src)) require.NoError(t, err) - roots, err = app.Run(config) + require.NotNil(t, app) + roots, err = app.RunWithConfig(context.Background(), config) require.NoError(t, err) assert.Equal(t, 3, len(roots)) } @@ -207,10 +203,10 @@ def main(): fail("time broken") return render.Root(child=render.Box()) ` - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) - roots, err := app.Run(map[string]string{}) + assert.NotNil(t, app) + roots, err := app.Run(context.Background()) assert.NoError(t, err) assert.Equal(t, 1, len(roots)) @@ -229,10 +225,9 @@ def main(): fail("something went wrong") return render.Root(child=render.Box()) ` - app = &Applet{} - err = app.Load("testid", "test.star", []byte(src), loader) + app, err = NewApplet("test.star", []byte(src), WithModuleLoader(loader)) assert.NoError(t, err) - roots, err = app.Run(map[string]string{}) + roots, err = app.Run(context.Background()) assert.NoError(t, err) assert.Equal(t, 1, len(roots)) @@ -254,10 +249,10 @@ def main(): return thread } - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src), WithThreadInitializer(initializer)) assert.NoError(t, err) - _, err = app.Run(map[string]string{}, initializer) + assert.NotNil(t, app) + _, err = app.Run(context.Background()) assert.NoError(t, err) // our print function should have been called @@ -274,14 +269,14 @@ def main(): return render.Root(child=render.Box()) ` - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) - _, err = app.Run(map[string]string{}) + assert.NotNil(t, app) + _, err = app.Run(context.Background()) assert.NoError(t, err) } -func TestZipModule(t *testing.T) { +func TestZIPModule(t *testing.T) { // Create a new zip file to read from starlark // https://go.dev/src/archive/zip/example_test.go buf := new(bytes.Buffer) @@ -302,16 +297,6 @@ func TestZipModule(t *testing.T) { err := w.Close() assert.NoError(t, err) - // override the print function of the thread so we can check we got correct - // values from the zip module. - var printedText []string - initializer := func(thread *starlark.Thread) *starlark.Thread { - thread.Print = func(thread *starlark.Thread, msg string) { - printedText = append(printedText, msg) - } - return thread - } - src := ` load("compress/zipfile.star", "zipfile") def main(config): @@ -322,9 +307,20 @@ def main(config): return [] ` - app := &Applet{} - err = app.Load("testid", "test.star", []byte(src), nil) - _, err = app.Run(map[string]string{"ZIP_BYTES": buf.String()}, initializer) + // override the print function of the thread so we can check we got correct + // values from the zip module. + var printedText []string + printFunc := func(thread *starlark.Thread, msg string) { + printedText = append(printedText, msg) + } + + app, err := NewApplet("test.star", []byte(src), WithPrintFunc(printFunc)) + require.NoError(t, err) + require.NotNil(t, app) + _, err = app.RunWithConfig( + context.Background(), + map[string]string{"ZIP_BYTES": buf.String()}, + ) assert.NoError(t, err) assert.Equal(t, []string{ diff --git a/runtime/cache_test.go b/runtime/cache_test.go index f3d039a6b5..c4a272ecf8 100644 --- a/runtime/cache_test.go +++ b/runtime/cache_test.go @@ -1,6 +1,7 @@ package runtime import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -32,10 +33,10 @@ def main(): return [render.Root(child=render.Box()) for i in range(int(one) + int(two) + int(three))] ` InitCache(NewInMemoryCache()) - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) - roots, err := app.Run(map[string]string{}) + assert.NotNil(t, app) + roots, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, roots) assert.Equal(t, 1+2+3, len(roots)) @@ -53,35 +54,35 @@ def main(): return frames ` InitCache(NewInMemoryCache()) - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) + assert.NotNil(t, app) // first time, i == 1 - roots, err := app.Run(map[string]string{}) + roots, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, roots) assert.Equal(t, 1, len(roots)) // i == 2 - roots, err = app.Run(map[string]string{}) + roots, err = app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, roots) assert.Equal(t, 2, len(roots)) // but run the same code using different filename, and cached // data ends up in a different namespace - app = &Applet{} - err = app.Load("testid", "test2.star", []byte(src), nil) + app, err = NewApplet("test2.star", []byte(src)) assert.NoError(t, err) + assert.NotNil(t, app) - roots, _ = app.Run(map[string]string{}) + roots, _ = app.Run(context.Background()) assert.Equal(t, 1, len(roots)) - roots, _ = app.Run(map[string]string{}) + roots, _ = app.Run(context.Background()) assert.Equal(t, 2, len(roots)) - roots, _ = app.Run(map[string]string{}) + roots, _ = app.Run(context.Background()) assert.Equal(t, 3, len(roots)) } @@ -102,10 +103,10 @@ def main(): return render.Root(child=render.Box()) ` InitCache(nil) - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + assert.NotNil(t, app) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } @@ -120,10 +121,10 @@ def main(): return render.Root(child=render.Box()) ` InitCache(nil) - app := &Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + assert.NotNil(t, app) + screens, err := app.Run(context.Background()) assert.Error(t, err) assert.Nil(t, screens) } diff --git a/runtime/httpcache.go b/runtime/httpcache.go index 1eb1d7886d..6c77cef996 100644 --- a/runtime/httpcache.go +++ b/runtime/httpcache.go @@ -14,7 +14,6 @@ import ( "strings" "time" - "github.com/pkg/errors" "tidbyt.dev/pixlet/runtime/modules/starlarkhttp" ) @@ -109,7 +108,7 @@ func (c *cacheClient) RoundTrip(req *http.Request) (*http.Response, error) { func cacheKey(req *http.Request) (string, error) { r, err := httputil.DumpRequest(req, true) if err != nil { - return "", errors.Wrap(err, "failed to serialize request") + return "", fmt.Errorf("%s: %w", "failed to serialize request", err) } h := sha256.Sum256(r) diff --git a/runtime/httpcache_test.go b/runtime/httpcache_test.go index 1f1bb76abb..d4940078a4 100644 --- a/runtime/httpcache_test.go +++ b/runtime/httpcache_test.go @@ -1,6 +1,7 @@ package runtime import ( + "context" "fmt" "math/rand" "net/http" @@ -18,11 +19,11 @@ func TestInitHTTP(t *testing.T) { b, err := os.ReadFile("testdata/httpcache.star") assert.NoError(t, err) - app := &Applet{} - err = app.Load("httpid", "httpcache.star", b, nil) + app, err := NewApplet("httpcache.star", b) assert.NoError(t, err) + assert.NotNil(t, app) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/runtime/modules/hmac/hmac_test.go b/runtime/modules/hmac/hmac_test.go index c193db6dd4..6ac6efdd29 100644 --- a/runtime/modules/hmac/hmac_test.go +++ b/runtime/modules/hmac/hmac_test.go @@ -1,6 +1,7 @@ package hmac_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -25,11 +26,11 @@ def main(): ` func TestHmac(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("hmacid", "hmac_test.star", []byte(hmacSource), nil) + app, err := runtime.NewApplet("hmac_test.star", []byte(hmacSource)) assert.NoError(t, err) + assert.NotNil(t, app) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/runtime/modules/humanize/humanize_test.go b/runtime/modules/humanize/humanize_test.go index e79c1c18f0..95a3c84cd8 100644 --- a/runtime/modules/humanize/humanize_test.go +++ b/runtime/modules/humanize/humanize_test.go @@ -1,6 +1,7 @@ package humanize_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -79,11 +80,11 @@ def main(): ` func TestHumanize(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("humanid", "human.star", []byte(humanSource), nil) + app, err := runtime.NewApplet("human.star", []byte(humanSource)) assert.NoError(t, err) + assert.NotNil(t, app) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/runtime/modules/qrcode/qrcode_test.go b/runtime/modules/qrcode/qrcode_test.go index cf928d4c18..fb5144ca97 100644 --- a/runtime/modules/qrcode/qrcode_test.go +++ b/runtime/modules/qrcode/qrcode_test.go @@ -1,6 +1,7 @@ package qrcode_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -28,11 +29,10 @@ def main(): ` func TestQRCode(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("testid", "test.star", []byte(qrCodeSource), nil) + app, err := runtime.NewApplet("test.star", []byte(qrCodeSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/runtime/modules/random/random.go b/runtime/modules/random/random.go index 24e124ba08..b5b2565bf5 100644 --- a/runtime/modules/random/random.go +++ b/runtime/modules/random/random.go @@ -38,7 +38,6 @@ func AttachToThread(t *starlark.Thread) { func LoadModule() (starlark.StringDict, error) { once.Do(func() { - rand.Seed(time.Now().UnixNano()) module = starlark.StringDict{ ModuleName: &starlarkstruct.Module{ Name: ModuleName, diff --git a/runtime/modules/random/random_test.go b/runtime/modules/random/random_test.go index 6120f59ab8..683ecb4e25 100644 --- a/runtime/modules/random/random_test.go +++ b/runtime/modules/random/random_test.go @@ -1,6 +1,7 @@ package random_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -47,11 +48,10 @@ def main(): ` func TestRandom(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("randomid", "random_test.star", []byte(randomSrc), nil) + app, err := runtime.NewApplet("random_test.star", []byte(randomSrc)) require.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) require.NoError(t, err) assert.NotNil(t, screens) } diff --git a/runtime/modules/starlarkhttp/testdata/test.star b/runtime/modules/starlarkhttp/testdata/test.star index da38e77d4b..bef3b5c4ce 100644 --- a/runtime/modules/starlarkhttp/testdata/test.star +++ b/runtime/modules/starlarkhttp/testdata/test.star @@ -1,5 +1,5 @@ -load("http.star", "http") load("assert.star", "assert") +load("http.star", "http") res_1 = http.get(test_server_url, params = {"a": "b", "c": "d"}) assert.eq(res_1.url, test_server_url + "?a=b&c=d") diff --git a/runtime/modules/sunrise/sunrise_test.go b/runtime/modules/sunrise/sunrise_test.go index d8ff3e88cd..247b3ff372 100644 --- a/runtime/modules/sunrise/sunrise_test.go +++ b/runtime/modules/sunrise/sunrise_test.go @@ -1,6 +1,7 @@ package sunrise_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -51,11 +52,10 @@ def main(): ` func TestSunrise(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("sunid", "sun.star", []byte(sunSource), nil) + app, err := runtime.NewApplet("sun.star", []byte(sunSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/runtime/modules/xpath/xpath_test.go b/runtime/modules/xpath/xpath_test.go index 54fde86b92..25d8fc7168 100644 --- a/runtime/modules/xpath/xpath_test.go +++ b/runtime/modules/xpath/xpath_test.go @@ -1,6 +1,7 @@ package xpath_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -73,10 +74,9 @@ def main(): return [r.Root(child=r.Text("1337"))] ` - app := &runtime.Applet{} - err := app.Load("testid", "test.star", []byte(src), nil) + app, err := runtime.NewApplet("test.star", []byte(src)) require.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) require.NoError(t, err) assert.NotNil(t, screens) } diff --git a/runtime/render_test.go b/runtime/render_test.go index e7cbe18ffd..961c58b3dd 100644 --- a/runtime/render_test.go +++ b/runtime/render_test.go @@ -2,6 +2,7 @@ package runtime import ( "bytes" + "context" "encoding/base64" "fmt" "image" @@ -135,10 +136,9 @@ def main(): ` func TestBigDotStar(t *testing.T) { - app := &Applet{} - err := app.Load("bigid", "big.star", []byte(TestDotStar), nil) + app, err := NewApplet("big.star", []byte(TestDotStar)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } @@ -158,11 +158,10 @@ def main(): ` ) - app := &Applet{} - err := app.Load("boxid", filename, []byte(src), nil) + app, err := NewApplet(filename, []byte(src)) assert.NoError(t, err) - b := app.Globals["b"] + b := app.globals["b"] assert.IsType(t, &render_runtime.Box{}, b) widget := b.(*render_runtime.Box).AsRenderWidget() @@ -194,11 +193,10 @@ def main(): ` ) - app := &Applet{} - err := app.Load("textid", filename, []byte(src), nil) + app, err := NewApplet(filename, []byte(src)) assert.NoError(t, err) - txt := app.Globals["t"] + txt := app.globals["t"] assert.IsType(t, &render_runtime.Text{}, txt) widget := txt.(*render_runtime.Text).AsRenderWidget() @@ -239,11 +237,10 @@ def main(): `, base64.StdEncoding.EncodeToString(p.Bytes())) - app := &Applet{} - err := app.Load("imageid", filename, []byte(src), nil) + app, err := NewApplet(filename, []byte(src)) assert.NoError(t, err) - starlarkP := app.Globals["img"] + starlarkP := app.globals["img"] require.IsType(t, &render_runtime.Image{}, starlarkP) actualIm := render.PaintWidget(starlarkP.(*render_runtime.Image).AsRenderWidget(), image.Rect(0, 0, 64, 32), 0) diff --git a/runtime/secret.go b/runtime/secret.go index f94106006a..e32799d4e9 100644 --- a/runtime/secret.go +++ b/runtime/secret.go @@ -10,7 +10,6 @@ import ( "github.com/google/tink/go/hybrid" "github.com/google/tink/go/keyset" "github.com/google/tink/go/tink" - "github.com/pkg/errors" "go.starlark.net/starlark" "go.starlark.net/starlarkstruct" ) @@ -42,18 +41,18 @@ func (sek *SecretEncryptionKey) Encrypt(appID, plaintext string) (string, error) r := bytes.NewReader(sek.PublicKeysetJSON) kh, err := keyset.ReadWithNoSecrets(keyset.NewJSONReader(r)) if err != nil { - return "", errors.Wrap(err, "reading keyset JSON") + return "", fmt.Errorf("%s: %w", "reading keyset JSON", err) } enc, err := hybrid.NewHybridEncrypt(kh) if err != nil { - return "", errors.Wrap(err, "NewHybridEncrypt") + return "", fmt.Errorf("%s: %w", "NewHybridEncrypt", err) } context := []byte(appID) ciphertext, err := enc.Encrypt([]byte(plaintext), context) if err != nil { - return "", errors.Wrap(err, "encrypting secret") + return "", fmt.Errorf("%s: %w", "encrypting secret", err) } return base64.StdEncoding.EncodeToString(ciphertext), nil @@ -85,21 +84,21 @@ func (sdk *SecretDecryptionKey) decrypterForApp(a *Applet) (decrypter, error) { r := bytes.NewReader(sdk.EncryptedKeysetJSON) kh, err := keyset.Read(keyset.NewJSONReader(r), sdk.KeyEncryptionKey) if err != nil { - return nil, errors.Wrap(err, "reading keyset JSON") + return nil, fmt.Errorf("%s: %w", "reading keyset JSON", err) } dec, err := hybrid.NewHybridDecrypt(kh) if err != nil { - return nil, errors.Wrap(err, "NewHybridDecrypt") + return nil, fmt.Errorf("%s: %w", "NewHybridDecrypt", err) } - context := []byte(a.AppID) + context := []byte(a.ID) return func(s starlark.String) (starlark.String, error) { v := regexp.MustCompile(`\s`).ReplaceAllString(s.GoString(), "") ciphertext, err := base64.StdEncoding.DecodeString(v) if err != nil { - return "", errors.Wrapf(err, "base64 decoding of secret: %s", s) + return "", fmt.Errorf("base64 decoding of secret: %s: %w", s, err) } cleartext, err := dec.Decrypt(ciphertext, context) diff --git a/runtime/secret_test.go b/runtime/secret_test.go index a5a84f64ac..a5749197b1 100644 --- a/runtime/secret_test.go +++ b/runtime/secret_test.go @@ -2,6 +2,7 @@ package runtime import ( "bytes" + "context" "fmt" "testing" @@ -71,14 +72,10 @@ def main(): return render.Root(child=render.Box()) `, plaintext, encrypted) - app := &Applet{ - SecretDecryptionKey: decryptionKey, - } - - err = app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("testid", []byte(src), WithSecretDecryptionKey(decryptionKey)) require.NoError(t, err) - roots, err := app.Run(nil) + roots, err := app.Run(context.Background()) assert.NoError(t, err) assert.Equal(t, 1, len(roots)) } @@ -128,14 +125,10 @@ def main(): return render.Root(child=render.Box()) `, plaintext, encrypted) - app := &Applet{ - SecretDecryptionKey: nil, - } - - err = app.Load("testid", "test.star", []byte(src), nil) + app, err := NewApplet("test.star", []byte(src)) require.NoError(t, err) - roots, err := app.Run(nil) + roots, err := app.Run(context.Background()) assert.NoError(t, err) assert.Equal(t, 1, len(roots)) } diff --git a/runtime/test.star b/runtime/test.star index 72e8f1cce4..b51df76a2c 100644 --- a/runtime/test.star +++ b/runtime/test.star @@ -1,6 +1,6 @@ -load("render.star", "render") load("assert.star", "assert") load("encoding/base64.star", "base64") +load("render.star", "render") # Font tests assert.eq(render.fonts["6x13"], "6x13") diff --git a/runtime/testdata/httpcache.star b/runtime/testdata/httpcache.star index 9805e6be63..0a1cbe18a5 100644 --- a/runtime/testdata/httpcache.star +++ b/runtime/testdata/httpcache.star @@ -5,9 +5,9 @@ Description: It's an app for testing. Author: Test Dev """ -load("render.star", "render") -load("http.star", "http") load("assert.star", "assert") +load("http.star", "http") +load("render.star", "render") def main(config): resp = http.get( diff --git a/schema/color_test.go b/schema/color_test.go index 5cecd4ca32..8a082af24f 100644 --- a/schema/color_test.go +++ b/schema/color_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -55,11 +56,10 @@ assert(s2.palette[3] == "#323334") def main(): return [] ` - app := &runtime.Applet{} - err := app.Load("cid", "colors.star", []byte(src), nil) + app, err := runtime.NewApplet("colors.star", []byte(src)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } @@ -90,48 +90,47 @@ def main(config): return [] ` - app := &runtime.Applet{} - err := app.Load("cid", "colors.star", []byte(src), nil) + app, err := runtime.NewApplet("colors.star", []byte(src)) assert.NoError(t, err) // Well formed input -> success - screens, err := app.Run(map[string]string{"default": "#ffaa77", "palette": "[]"}) + screens, err := app.RunWithConfig(context.Background(), map[string]string{"default": "#ffaa77", "palette": "[]"}) assert.NoError(t, err) assert.NotNil(t, screens) // Bad default - _, err = app.Run(map[string]string{"default": "#nothex", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#nothex", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "0", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "0", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "01", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "01", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "#01", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#01", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "0123", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "0123", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "#0123", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#0123", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "01234", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "01234", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "#01234", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#01234", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "0123456", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "0123456", "palette": "[]"}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "#0123456", "palette": "[]"}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#0123456", "palette": "[]"}) assert.Error(t, err) // Bad palette - _, err = app.Run(map[string]string{"default": "#ffaa77", "palette": `["nothex"]`}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#ffaa77", "palette": `["nothex"]`}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "#ffaa77", "palette": `["fff", "ffaabb", "0"]`}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#ffaa77", "palette": `["fff", "ffaabb", "0"]`}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "#ffaa77", "palette": `["fff", "ffaabb", "#0f"]`}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#ffaa77", "palette": `["fff", "ffaabb", "#0f"]`}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "#ffaa77", "palette": `["fff", "ffaabb", "0123"]`}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#ffaa77", "palette": `["fff", "ffaabb", "0123"]`}) assert.Error(t, err) - _, err = app.Run(map[string]string{"default": "#ffaa77", "palette": `["fff", "ffaabb", "0123456"]`}) + _, err = app.RunWithConfig(context.Background(), map[string]string{"default": "#ffaa77", "palette": `["fff", "ffaabb", "0123456"]`}) assert.Error(t, err) } diff --git a/schema/datetime_test.go b/schema/datetime_test.go index 8189f85834..eae976bec8 100644 --- a/schema/datetime_test.go +++ b/schema/datetime_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -31,11 +32,10 @@ def main(): ` func TestDateTime(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("dtid", "date_time.star", []byte(dateTimeSource), nil) + app, err := runtime.NewApplet("date_time.star", []byte(dateTimeSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/dropdown_test.go b/schema/dropdown_test.go index 08426778d4..5f6d4b708a 100644 --- a/schema/dropdown_test.go +++ b/schema/dropdown_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -51,11 +52,10 @@ def main(): ` func TestDropdown(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("ddid", "dropdown.star", []byte(dropdownSource), nil) + app, err := runtime.NewApplet("dropdown.star", []byte(dropdownSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/generated_test.go b/schema/generated_test.go index 03180d91c1..bf3369a329 100644 --- a/schema/generated_test.go +++ b/schema/generated_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -29,11 +30,10 @@ def main(): ` func TestGenerated(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("gid", "generated.star", []byte(generatedSource), nil) + app, err := runtime.NewApplet("generated.star", []byte(generatedSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/handler_test.go b/schema/handler_test.go index 07aabc4a8c..7749055876 100644 --- a/schema/handler_test.go +++ b/schema/handler_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -30,19 +31,17 @@ def main(): ` func TestHandler(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("hid", "handler.star", []byte(handlerSource), nil) + app, err := runtime.NewApplet("handler.star", []byte(handlerSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } func TestHandlerBadParams(t *testing.T) { // Handler is a string - app := &runtime.Applet{} - err := app.Load("tid", "text.star", []byte(` + app, err := runtime.NewApplet("text.star", []byte(` load("schema.star", "schema") def foobar(param): @@ -55,12 +54,12 @@ h = schema.Handler( def main(): return [] -`), nil) +`)) assert.Error(t, err) + assert.Nil(t, app) // Type is not valid - app = &runtime.Applet{} - err = app.Load("tid", "text.star", []byte(` + app, err = runtime.NewApplet("text.star", []byte(` load("schema.star", "schema") def foobar(param): @@ -73,7 +72,7 @@ h = schema.Handler( def main(): return [] -`), nil) +`)) assert.Error(t, err) - + assert.Nil(t, app) } diff --git a/schema/location_test.go b/schema/location_test.go index fde878d1d4..97ee940e31 100644 --- a/schema/location_test.go +++ b/schema/location_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -31,11 +32,10 @@ def main(): ` func TestLocation(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("lid", "location.star", []byte(locationSource), nil) + app, err := runtime.NewApplet("location.star", []byte(locationSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/locationbased_test.go b/schema/locationbased_test.go index 399538da31..a79468181d 100644 --- a/schema/locationbased_test.go +++ b/schema/locationbased_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -61,11 +62,10 @@ def main(): ` func TestLocationBased(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("lbid", "location_based.star", []byte(locationBasedSource), nil) + app, err := runtime.NewApplet("location_based.star", []byte(locationBasedSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/module_test.go b/schema/module_test.go index 0d4aa8a773..539ea6e59a 100644 --- a/schema/module_test.go +++ b/schema/module_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -41,20 +42,18 @@ def main(): ` func TestStarlarkSchema(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("starlarkid", "starlark.star", []byte(schemaSource), nil) + app, err := runtime.NewApplet("starlark.star", []byte(schemaSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } func TestSchemaModuleLoads(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("sourceid", "source.star", []byte(moduleSource), nil) + app, err := runtime.NewApplet("source.star", []byte(moduleSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/oauth2_test.go b/schema/oauth2_test.go index 4613f4f368..35adcc430a 100644 --- a/schema/oauth2_test.go +++ b/schema/oauth2_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -47,11 +48,10 @@ def main(): ` func TestOAuth2(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("oaid", "oauth2.star", []byte(oauth2Source), nil) + app, err := runtime.NewApplet("oauth2.star", []byte(oauth2Source)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/option_test.go b/schema/option_test.go index aa0216d49a..5eb7f6efa2 100644 --- a/schema/option_test.go +++ b/schema/option_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -27,11 +28,10 @@ def main(): ` func TestOption(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("oid", "option.star", []byte(optionSource), nil) + app, err := runtime.NewApplet("option.star", []byte(optionSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/photoselect_test.go b/schema/photoselect_test.go index 2d9dd1ae4a..c35c9cfa17 100644 --- a/schema/photoselect_test.go +++ b/schema/photoselect_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -31,11 +32,10 @@ def main(): ` func TestPhotoSelect(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("photid", "photo_select.star", []byte(photoSelectSource), nil) + app, err := runtime.NewApplet("photo_select.star", []byte(photoSelectSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/schema_test.go b/schema/schema_test.go index 20753be38d..a356e6cc7f 100644 --- a/schema/schema_test.go +++ b/schema/schema_test.go @@ -5,7 +5,6 @@ import ( "encoding/json" "testing" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "tidbyt.dev/pixlet/runtime" @@ -13,13 +12,7 @@ import ( ) func loadApp(code string) (*runtime.Applet, error) { - app := &runtime.Applet{} - err := app.Load("testid", "test.star", []byte(code), nil) - if err != nil { - return nil, errors.WithStack(err) - } - - return app, nil + return runtime.NewApplet("test.star", []byte(code)) } func TestSchemaAllTypesSuccess(t *testing.T) { diff --git a/schema/text_test.go b/schema/text_test.go index 30fa3315ad..86a26b9a32 100644 --- a/schema/text_test.go +++ b/schema/text_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -33,11 +34,10 @@ def main(): ` func TestText(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("tid", "text.star", []byte(textSource), nil) + app, err := runtime.NewApplet("text.star", []byte(textSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/toggle_test.go b/schema/toggle_test.go index 78afb65485..143a6fb46d 100644 --- a/schema/toggle_test.go +++ b/schema/toggle_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -33,11 +34,10 @@ def main(): ` func TestToggle(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("tid", "toggle.star", []byte(toggleSource), nil) + app, err := runtime.NewApplet("toggle.star", []byte(toggleSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/schema/typeahead_test.go b/schema/typeahead_test.go index fc0af0e6c3..e07742eaa2 100644 --- a/schema/typeahead_test.go +++ b/schema/typeahead_test.go @@ -1,6 +1,7 @@ package schema_test import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -46,11 +47,10 @@ def main(): ` func TestTypeahead(t *testing.T) { - app := &runtime.Applet{} - err := app.Load("tahid", "typeahead.star", []byte(typeaheadSource), nil) + app, err := runtime.NewApplet("typeahead.star", []byte(typeaheadSource)) assert.NoError(t, err) - screens, err := app.Run(map[string]string{}) + screens, err := app.Run(context.Background()) assert.NoError(t, err) assert.NotNil(t, screens) } diff --git a/server/loader/loader.go b/server/loader/loader.go index 2d37cdfd2d..32ae9322b1 100644 --- a/server/loader/loader.go +++ b/server/loader/loader.go @@ -10,12 +10,9 @@ import ( "log" "time" - "go.starlark.net/starlark" - "tidbyt.dev/pixlet/encode" "tidbyt.dev/pixlet/runtime" "tidbyt.dev/pixlet/schema" - "tidbyt.dev/pixlet/starlarkutil" ) // Loader is a structure to provide applet loading when a file changes or on @@ -72,10 +69,12 @@ func NewLoader( runtime.InitCache(cache) if !l.watch { - err := loadScript(&l.applet, "app-id", l.filename) + app, err := loadScript("app-id", l.filename) l.markInitialLoadComplete() if err != nil { return nil, err + } else { + l.applet = *app } } @@ -157,24 +156,22 @@ func (l *Loader) CallSchemaHandler(ctx context.Context, handlerName, parameter s func (l *Loader) loadApplet(config map[string]string) (string, error) { if l.watch { - err := loadScript(&l.applet, "app-id", l.filename) + app, err := loadScript("app-id", l.filename) l.markInitialLoadComplete() if err != nil { return "", err + } else { + l.applet = *app } } - threadInitializer := func(thread *starlark.Thread) *starlark.Thread { - ctx, _ := context.WithTimeoutCause( - context.Background(), - time.Duration(l.timeout)*time.Millisecond, - fmt.Errorf("timeout after %dms", l.timeout), - ) - starlarkutil.AttachThreadContext(ctx, thread) - return thread - } + ctx, _ := context.WithTimeoutCause( + context.Background(), + time.Duration(l.timeout)*time.Millisecond, + fmt.Errorf("timeout after %dms", l.timeout), + ) - roots, err := l.applet.Run(config, threadInitializer) + roots, err := l.applet.RunWithConfig(ctx, config) if err != nil { return "", fmt.Errorf("error running script: %w", err) } diff --git a/server/loader/script.go b/server/loader/script.go index 7874910caf..4a27f3ff97 100644 --- a/server/loader/script.go +++ b/server/loader/script.go @@ -4,21 +4,16 @@ package loader import ( "fmt" - "io/ioutil" + "os" "tidbyt.dev/pixlet/runtime" ) -func loadScript(applet *runtime.Applet, appID string, filename string) error { - src, err := ioutil.ReadFile(filename) +func loadScript(appID string, filename string) (*runtime.Applet, error) { + src, err := os.ReadFile(filename) if err != nil { - return fmt.Errorf("failed to read file %s: %w", filename, err) + return nil, fmt.Errorf("failed to read file %s: %w", filename, err) } - err = applet.Load(appID, filename, src, nil) - if err != nil { - return fmt.Errorf("failed to load applet: %w", err) - } - - return nil + return runtime.NewApplet(appID, src) } diff --git a/server/loader/script_js.go b/server/loader/script_js.go index bca15e3960..c07b9b4fa1 100644 --- a/server/loader/script_js.go +++ b/server/loader/script_js.go @@ -4,28 +4,23 @@ package loader import ( "fmt" - "io/ioutil" + "io" "net/http" "tidbyt.dev/pixlet/runtime" ) -func loadScript(applet *runtime.Applet, appID string, filename string) error { +func loadScript(appID string, filename string) (*runtime.Applet, error) { res, err := http.Get(filename) if err != nil { - return fmt.Errorf("failed to fetch file %s: %w", filename, err) + return nil, fmt.Errorf("failed to fetch file %s: %w", filename, err) } defer res.Body.Close() - src, err := ioutil.ReadAll(res.Body) + src, err := io.ReadAll(res.Body) if err != nil { - return fmt.Errorf("failed to read file %s: %w", filename, err) + return nil, fmt.Errorf("failed to read file %s: %w", filename, err) } - err = applet.Load(appID, filename, src, nil) - if err != nil { - return fmt.Errorf("failed to load applet: %w", err) - } - - return nil + return runtime.NewApplet(appID, src) }