From f66ea270f9e80e6c480e048d10ea0d46781835bc Mon Sep 17 00:00:00 2001 From: a Date: Wed, 7 Feb 2024 17:43:18 -0600 Subject: [PATCH] fx --- LICENSE | 21 ++ LICENSE.old | 21 ++ README.md | 110 +------ app/darktile/cmd/root.go | 140 ++------- app/darktile/config/config.go | 56 +--- app/darktile/config/default.go | 139 --------- app/darktile/config/errors.go | 3 + app/darktile/config/lark.go | 191 ++++++++++++ app/darktile/config/theme.go | 84 ----- app/darktile/gui/draw.go | 15 +- app/darktile/gui/gui.go | 76 +++-- app/darktile/gui/render/render.go | 30 +- app/darktile/gui/resize.go | 16 +- app/darktile/termutil/ansi.go | 6 +- app/darktile/termutil/csi.go | 6 +- app/darktile/termutil/options.go | 14 - app/darktile/termutil/terminal.go | 42 ++- app/darktile/termutil/theme.go | 43 +++ cmd/erm/main.go | 66 ---- go.mod | 49 ++- go.sum | 496 ++++-------------------------- 21 files changed, 513 insertions(+), 1111 deletions(-) create mode 100644 LICENSE create mode 100644 LICENSE.old delete mode 100644 app/darktile/config/default.go create mode 100644 app/darktile/config/lark.go delete mode 100644 app/darktile/config/theme.go diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..30897da --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 tuxpa.in + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/LICENSE.old b/LICENSE.old new file mode 100644 index 0000000..06f5241 --- /dev/null +++ b/LICENSE.old @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 Liam Galvin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 3b85e30..09fb8cb 100644 --- a/README.md +++ b/README.md @@ -1,111 +1,3 @@ # erm -a fork of Darktile - -https://github.com/liamg/darktile - - -original readme below - -# Darktile - -Darktile is a GPU rendered terminal emulator designed for tiling window managers. - -![Demo](demo.gif) - -## Features - -- GPU rendering -- Unicode support -- Variety of themes available (or build your own!) -- Compiled-in powerline font -- Works with your favourite monospaced TTF/OTF fonts -- Font ligatures (turn it off if you're not a ligature fan) -- Hints: Context-aware overlays e.g. hex colour viewer, octal permission annotation -- Take screenshots with a single key-binding -- Sixels -- Window transparency (0-100%) -- Customisable cursor (most popular image formats supported) - -

- -

- -## Installation - -Install dependencies: - -- `xorg-dev` -- `libgl1-mesa-dev` - -Grab a binary from the [latest release](https://github.com/liamg/darktile/releases/latest), `chmod +x` it and place it in your `$PATH`. - -If you're too lazy to do the above and you like to live life on the edge, you can pipe this script to sudo: - -```bash -curl -s "https://raw.githubusercontent.com/liamg/darktile/main/scripts/install.sh" | sudo bash -``` - -## Configuration - -Configuration files should be created in `$XDG_CONFIG_HOME/darktile/` if the variable is defined, otherwise in `$HOME/.config/darktile/`. - -If you wish, you can create an example config file as a starting point using `darktile --rewrite-config`. - -Darktile will use sensible defaults if no config/theme files are available. The same applies when you omit settings from config/theme files, meaning it is perfectly valid to start with empty config/theme files and add to them as required to override the default behaviour. - -### Config File - -Found in the config directory (see above) inside `config.yaml`. - -```yaml -opacity: 1.0 # Window opacity: 0.0 is fully transparent, 1.0 is fully opaque -font: - family: "" # Font family. Find possible values for this by running 'darktile list-fonts' - size: 16 # Font size - dpi: 72 # DPI - ligatures: true # Enable font ligatures e.g. render '≡' instead of '===' -cursor: - image: "" # Path to an image to render as your cursor (defaults to standard rectangular cursor) -``` - -### Example Theme - -Found in the config directory (see above) inside `theme.yaml`. You can replace this file with a symlink or any theme file from [darktile-themes](https://github.com/liamg/darktile-themes). - - -```yaml -black: '#1d1f21' -red: '#cc6666' -green: '#b5bd68' -yellow: '#f0c674' -blue: '#81a2be' -magenta: '#b294bb' -cyan: '#8abeb7' -white: '#c5c8c6' -brightblack: '#666666' -brightred: '#d54e53' -brightgreen: '#b9ca4a' -brightyellow: '#e7c547' -brightblue: '#7aa6da' -brightmagenta: '#c397d8' -brightcyan: '#70c0b1' -brightwhite: '#eaeaea' -background: '#1d1f21' -foreground: '#c5c8c6' -selectionbackground: '#aa8800' -selectionforeground: '#ffffff' -cursorforeground: '#1d1f21' -cursorbackground: '#c5c8c6' -``` - -## Key Bindings - -| Action | Binding | -|-----------------------------|---------| -| Copy | `ctrl + shift + C` -| Paste | `ctrl + shift + V` -| Decrease font size | `ctrl + -` -| Increase font size | `ctrl + =` -| Take screenshot | `ctrl + shift + [` -| Open URL | `ctrl + click` +a fork of [Darktile](https://github.com/liamg/darktile) diff --git a/app/darktile/cmd/root.go b/app/darktile/cmd/root.go index f83dc38..76076c2 100644 --- a/app/darktile/cmd/root.go +++ b/app/darktile/cmd/root.go @@ -2,16 +2,17 @@ package cmd import ( "context" - "errors" "fmt" "image" + "log/slog" "os" - "time" - config2 "tuxpa.in/t/erm/app/darktile/config" - gui2 "tuxpa.in/t/erm/app/darktile/gui" - "tuxpa.in/t/erm/app/darktile/hinters" - termutil2 "tuxpa.in/t/erm/app/darktile/termutil" + "gfx.cafe/util/go/fxplus" + "github.com/lmittmann/tint" + "go.uber.org/fx" + "tuxpa.in/t/erm/app/darktile/config" + "tuxpa.in/t/erm/app/darktile/gui" + "tuxpa.in/t/erm/app/darktile/termutil" "tuxpa.in/t/erm/app/darktile/version" ) @@ -25,116 +26,41 @@ type Root struct { } type Term struct { - ShowVersion bool `name:"version" help:"Show erm version information and exit"` - RewriteConfig bool `name:"rewrite-config" help:"Write the resultant config after parsing config files and merging with defauls back to the config file"` - LogFile string `name:"log-file" help:"Debug log file"` - Shell string `name:"shell" short:"s" help:"Shell to launch terminal with - defaults to configured user shell"` - Command string `name:"command" short:"c" help:"Command to run when shell starts - use this with caution"` - ScreenshotAfterMs int `name:"screenshot-after-ms" help:"Take a screenshot after this many milliseconds"` - ScreenshotFilename string `name:"screenshot-filename" help:"Filename to store screenshot taken by --screenshot-after-ms"` - ThemePath string `name:"theme-path" help:"Path to a theme file to use instead of the default"` + ShowVersion bool `name:"version" help:"Show erm version information and exit"` } func (r *Term) Run(ctx *Context) error { if r.ShowVersion { fmt.Println(version.Version) - os.Exit(0) - } - - var startupErrors []error - var fileNotFound *config2.ErrorFileNotFound - - conf, err := config2.LoadConfig() - if err != nil { - if !errors.As(err, &fileNotFound) { - startupErrors = append(startupErrors, err) - } - conf = config2.DefaultConfig() - } - - if r.RewriteConfig { - if _, err := conf.Save(); err != nil { - return fmt.Errorf("failed to write config file: %w", err) - } - fmt.Println("Config written.") return nil } - var theme *termutil2.Theme - - if r.ThemePath != "" { - theme, err = config2.LoadThemeFromPath(conf, r.ThemePath) - if err != nil { - return fmt.Errorf("failed to load theme: %s", err) - } - } else { - theme, err = config2.LoadTheme(conf) - if err != nil { - if !errors.As(err, &fileNotFound) { - startupErrors = append(startupErrors, err) - } - theme, err = config2.DefaultTheme(conf) - if err != nil { - return fmt.Errorf("failed to load default theme: %w", err) - } - } - } - - termOpts := []termutil2.Option{ - termutil2.WithTheme(theme), - } - - if r.LogFile != "" { - termOpts = append(termOpts, termutil2.WithLogFile(r.LogFile)) - } - if r.Shell != "" { - termOpts = append(termOpts, termutil2.WithShell(r.Shell)) - } - if r.Command != "" { - termOpts = append(termOpts, termutil2.WithInitialCommand(r.Command)) - } - - terminal := termutil2.New(termOpts...) - - options := []gui2.Option{ - gui2.WithFontDPI(conf.Font.DPI), - gui2.WithFontSize(conf.Font.Size), - gui2.WithFontFamily(conf.Font.Family), - gui2.WithOpacity(conf.Opacity), - gui2.WithLigatures(conf.Font.Ligatures), - } - - if conf.Cursor.Image != "" { - img, err := getImageFromFilePath(conf.Cursor.Image) - if err != nil { - startupErrors = append(startupErrors, err) - } else { - options = append(options, gui2.WithCursorImage(img)) - } - } - - if r.ScreenshotAfterMs > 0 { - options = append(options, gui2.WithStartupFunc(func(g *gui2.GUI) { - <-time.After(time.Duration(r.ScreenshotAfterMs) * time.Millisecond) - g.RequestScreenshot(r.ScreenshotFilename) + fxApp := fx.New( + fxplus.WithLogger, + fx.Provide( + func() *slog.Logger { + return slog.New(tint.NewHandler(os.Stdout, &tint.Options{ + AddSource: true, + Level: slog.LevelInfo.Level(), + })) + }, + fxplus.Context, + // + config.NewLark, + termutil.New, + gui.New, + ), + fx.Invoke(func(g *gui.GUI, s fx.Shutdowner, l *slog.Logger) { + go func() { + if err := g.Run(s); err != nil && !fxplus.IsShutdownOrCancel(err) { + l.Error("fatal error running gui", "err", err) + s.Shutdown(fx.ExitCode(1)) + } + s.Shutdown(fx.ExitCode(0)) + }() })) - } - - // load all hinters - for _, hinter := range hinters.All() { - options = append(options, gui2.WithHinter(hinter)) - } - - g, err := gui2.New(terminal, options...) - if err != nil { - return err - } - - for _, err := range startupErrors { - g.ShowError(err.Error()) - } - - return g.Run(conf) + fxApp.Run() + return nil } func getImageFromFilePath(filePath string) (image.Image, error) { f, err := os.Open(filePath) diff --git a/app/darktile/config/config.go b/app/darktile/config/config.go index a8ae556..4da2d51 100644 --- a/app/darktile/config/config.go +++ b/app/darktile/config/config.go @@ -2,21 +2,10 @@ package config import ( "fmt" - "io/ioutil" "os" "path" - - "sigs.k8s.io/yaml" ) -type Config struct { - Opacity float64 `json:"opacity"` - Font Font `json:"font"` - Cursor Cursor `json:"cursor"` - - Vsync bool `json:"vsync"` -} - type Font struct { Family string `json:"family"` Style string `json:"style"` @@ -38,7 +27,7 @@ func (e *ErrorFileNotFound) Error() string { } func getConfigPath() (string, error) { - return getPath("config.yaml") + return getPath("term.star") } func getPath(filename string) (string, error) { @@ -47,46 +36,5 @@ func getPath(filename string) (string, error) { return "", fmt.Errorf("config directory missing: %w", err) } - return path.Join(baseDir, "darktile", filename), nil -} - -func LoadConfig() (*Config, error) { - configPath, err := getConfigPath() - if err != nil { - return nil, fmt.Errorf("failed to locate config path: %w", err) - } - - if _, err := os.Stat(configPath); os.IsNotExist(err) { - return nil, &ErrorFileNotFound{Path: configPath} - } - - configData, err := ioutil.ReadFile(configPath) - if err != nil { - return nil, fmt.Errorf("failed to read config file at '%s': %w", configPath, err) - } - - config := defaultConfig - if err := yaml.Unmarshal(configData, &config); err != nil { - return nil, fmt.Errorf("invalid config file at '%s': %w", configPath, err) - } - - return &config, nil -} - -func (c *Config) Save() (string, error) { - configPath, err := getConfigPath() - if err != nil { - return "", fmt.Errorf("failed to locate config path: %w", err) - } - - if err := os.MkdirAll(path.Dir(configPath), 0700); err != nil { - return "", err - } - - data, err := yaml.Marshal(c) - if err != nil { - return "", err - } - - return configPath, ioutil.WriteFile(configPath, data, 0600) + return path.Join(baseDir, "term", filename), nil } diff --git a/app/darktile/config/default.go b/app/darktile/config/default.go deleted file mode 100644 index 3709838..0000000 --- a/app/darktile/config/default.go +++ /dev/null @@ -1,139 +0,0 @@ -package config - -import ( - "encoding/hex" - "fmt" - "image/color" - - termutil2 "tuxpa.in/t/erm/app/darktile/termutil" -) - -var defaultConfig = Config{ - Opacity: 1.0, - Font: Font{ - Family: "", // internally packed font will be loaded by default - Style: "Regular", - Size: 18.0, - DPI: 72.0, - Ligatures: true, - }, -} - -var defaultTheme = Theme{ - Black: "#1d1f21", - Red: "#cc6666", - Green: "#b5bd68", - Yellow: "#f0c674", - Blue: "#81a2be", - Magenta: "#b294bb", - Cyan: "#8abeb7", - White: "#c5c8c6", - BrightBlack: "#666666", - BrightRed: "#d54e53", - BrightGreen: "#b9ca4a", - BrightYellow: "#e7c547", - BrightBlue: "#7aa6da", - BrightMagenta: "#c397d8", - BrightCyan: "#70c0b1", - BrightWhite: "#eaeaea", - Background: "#000000", - Foreground: "#c5c8c6", - SelectionBackground: "#33aa33", - SelectionForeground: "#ffffff", - CursorForeground: "#1d1f21", - CursorBackground: "#c5c8c6", -} - -func DefaultConfig() *Config { - copiedConf := defaultConfig - return &copiedConf -} - -func DefaultTheme(conf *Config) (*termutil2.Theme, error) { - return loadThemeFromConf(conf, &defaultTheme) -} - -func LoadTheme(conf *Config) (*termutil2.Theme, error) { - - themeConf, err := loadTheme("") - if err != nil { - return nil, err - } - - return loadThemeFromConf(conf, themeConf) -} - -func LoadThemeFromPath(conf *Config, path string) (*termutil2.Theme, error) { - - themeConf, err := loadTheme(path) - if err != nil { - return nil, err - } - - return loadThemeFromConf(conf, themeConf) -} - -func loadThemeFromConf(conf *Config, themeConf *Theme) (*termutil2.Theme, error) { - - factory := termutil2.NewThemeFactory() - - colours := map[termutil2.Colour]string{ - termutil2.ColourBlack: themeConf.Black, - termutil2.ColourRed: themeConf.Red, - termutil2.ColourGreen: themeConf.Green, - termutil2.ColourYellow: themeConf.Yellow, - termutil2.ColourBlue: themeConf.Blue, - termutil2.ColourMagenta: themeConf.Magenta, - termutil2.ColourCyan: themeConf.Cyan, - termutil2.ColourWhite: themeConf.White, - termutil2.ColourBrightBlack: themeConf.BrightBlack, - termutil2.ColourBrightRed: themeConf.BrightRed, - termutil2.ColourBrightGreen: themeConf.BrightGreen, - termutil2.ColourBrightYellow: themeConf.BrightYellow, - termutil2.ColourBrightBlue: themeConf.BrightBlue, - termutil2.ColourBrightMagenta: themeConf.BrightMagenta, - termutil2.ColourBrightCyan: themeConf.BrightCyan, - termutil2.ColourBrightWhite: themeConf.BrightWhite, - termutil2.ColourBackground: themeConf.Background, - termutil2.ColourForeground: themeConf.Foreground, - termutil2.ColourSelectionBackground: themeConf.SelectionBackground, - termutil2.ColourSelectionForeground: themeConf.SelectionForeground, - termutil2.ColourCursorForeground: themeConf.CursorForeground, - termutil2.ColourCursorBackground: themeConf.CursorBackground, - } - - for key, colHex := range colours { - col, err := colourFromHex(colHex, conf.Opacity) - if err != nil { - return nil, fmt.Errorf("invalid hex value '%s' in theme", colHex) - } - factory.WithColour( - key, - col, - ) - } - - return factory.Build(), nil - -} - -func colourFromHex(hexadecimal string, opacity float64) (color.Color, error) { - if len(hexadecimal) == 0 { - return nil, fmt.Errorf("colour value cannot be empty") - } - if hexadecimal[0] != '#' || len(hexadecimal) != 7 { - return nil, fmt.Errorf("colour values should start with '#' and contain an RGB value encoded in hex, for example #ffffff") - } - - decoded, err := hex.DecodeString(hexadecimal[1:]) - if err != nil { - return nil, err - } - - return color.RGBA{ - R: decoded[0], - G: decoded[1], - B: decoded[2], - A: uint8(opacity * 0xff), - }, nil -} diff --git a/app/darktile/config/errors.go b/app/darktile/config/errors.go index 38cf972..2ae3b63 100644 --- a/app/darktile/config/errors.go +++ b/app/darktile/config/errors.go @@ -5,6 +5,9 @@ import ( "fmt" ) +var ErrWrongType = errors.New("wrong type") +var ErrNotFound = errors.New("not found") + type RecoverableError struct { msg string inner error diff --git a/app/darktile/config/lark.go b/app/darktile/config/lark.go new file mode 100644 index 0000000..7ed07c8 --- /dev/null +++ b/app/darktile/config/lark.go @@ -0,0 +1,191 @@ +package config + +import ( + "bytes" + "encoding/json" + "fmt" + "image/color" + "log" + + "github.com/mazznoer/csscolorparser" + mjson "go.starlark.net/lib/json" + "go.starlark.net/starlark" + "go.starlark.net/syntax" +) + +type Lark struct { + t *starlark.Thread + g starlark.StringDict +} + +var colorSchemes = map[string]string{"default": `{ + "foreground":"#e5dae5", + "background":"#151515", + "cursorColor2": "#e5dae5", + "color0": "#202020", + "color8": "#735264", + "color1": "#e84f4f", + "color9": "#d43131", + "color2": "#b8d68c", + "color10": "#578d3b", + "color3": "#e2a959", + "color11": "#f39713", + "color4": "#7dc1cf", + "color12": "#4e9fb1", + "color5": "#9b64fb", + "color13": "#7c1ede", + "color6": "#6d878d", + "color14": "#42717b", + "color7": "#dddddd", + "color15": "#dddddd" +}`} + +var defaultConfig = fmt.Sprintf(` +config = { + "title": "tebit", + "initialWidth": 600, + "startHeight": 600, + "font": { + "style": "Fira Mono", + "size": 12.0, + }, +} +config.update({"colors": json.decode('%s')}) +`, compact(colorSchemes["default"])) + +func NewLark() (*Lark, error) { + t := &starlark.Thread{ + Name: "config thread", + } + + preConfig := starlark.StringDict{ + "json": mjson.Module, + "config": starlark.NewDict(0), + } + gb, err := starlark.ExecFileOptions(syntax.LegacyFileOptions(), t, "preload.star", defaultConfig, preConfig) + if err != nil { + if evalErr, ok := err.(*starlark.EvalError); ok { + log.Fatal(evalErr.Backtrace()) + } + return nil, err + } + // TODO: search for config file + return &Lark{ + t: t, + g: gb, + }, nil +} + +func Must[T any](value T, err error) T { + if err != nil { + panic(err) + } + return value +} + +func Default[T any](x T) func(value T, err error) T { + return func(value T, err error) T { + if err != nil { + return x + } + return value + + } +} + +func (l *Lark) Truthy(path ...string) bool { + val, err := l.Val(path...) + if err != nil { + return false + } + + return bool(val.Truth()) +} + +func (l *Lark) Val(path ...string) (starlark.Value, error) { + val := l.g["config"].(*starlark.Dict) + for idx, item := range path { + tmpVal, ok, err := val.Get(starlark.String(item)) + if err != nil { + return nil, err + } + if !ok { + return nil, ErrNotFound + } + if len(path)-1 == idx { + return tmpVal, nil + } + val, ok = tmpVal.(*starlark.Dict) + if !ok { + return nil, ErrWrongType + } + } + return val, nil +} + +func (l *Lark) Float64(path ...string) (float64, error) { + val, err := l.Val(path...) + if err != nil { + return 0, err + } + str, ok := val.(starlark.Float) + if !ok { + return 0, ErrWrongType + } + return float64(str), nil +} + +func (l *Lark) Str(path ...string) (string, error) { + val, err := l.Val(path...) + if err != nil { + return "", err + } + str, ok := val.(starlark.String) + if !ok { + return "", ErrWrongType + } + return str.GoString(), nil +} +func (l *Lark) Color(path ...string) (color.Color, error) { + str, err := l.Str(path...) + if err != nil { + return nil, err + } + clor, err := csscolorparser.Parse(str) + if err != nil { + return nil, err + } + return clor, nil +} + +func (l *Lark) Font(path ...string) (*Font, error) { + // make sure the parent element exists + _, err := l.Val(path...) + if err != nil { + return nil, err + } + fill := &Font{} + if x, err := l.Str(append(path, "family")...); err == nil { + fill.Family = x + } + if x, err := l.Str(append(path, "style")...); err == nil { + fill.Style = x + } + if x, err := l.Float64(append(path, "size")...); err == nil { + fill.Size = x + } + if x, err := l.Float64(append(path, "dpi")...); err == nil { + fill.DPI = x + } + fill.Ligatures = l.Truthy(append(path, "ligatures")...) + return fill, nil +} + +func compact(x string) string { + dst := &bytes.Buffer{} + if err := json.Compact(dst, []byte(x)); err != nil { + panic(err) + } + log.Println(string(dst.String())) + return dst.String() +} diff --git a/app/darktile/config/theme.go b/app/darktile/config/theme.go deleted file mode 100644 index c31078f..0000000 --- a/app/darktile/config/theme.go +++ /dev/null @@ -1,84 +0,0 @@ -package config - -import ( - "fmt" - "io/ioutil" - "os" - "path" - - "sigs.k8s.io/yaml" -) - -type Theme struct { - Black string - Red string - Green string - Yellow string - Blue string - Magenta string - Cyan string - White string - BrightBlack string - BrightRed string - BrightGreen string - BrightYellow string - BrightBlue string - BrightMagenta string - BrightCyan string - BrightWhite string - Background string - Foreground string - SelectionBackground string - SelectionForeground string - CursorForeground string - CursorBackground string -} - -func getThemePath() (string, error) { - return getPath("theme.yaml") -} - -func loadTheme(themePath string) (*Theme, error) { - - if themePath == "" { - var err error - themePath, err = getThemePath() - if err != nil { - return nil, fmt.Errorf("failed to locate theme path: %w", err) - } - } - - if _, err := os.Stat(themePath); os.IsNotExist(err) { - return nil, &ErrorFileNotFound{Path: themePath} - } - - themeData, err := ioutil.ReadFile(themePath) - if err != nil { - return nil, fmt.Errorf("failed to read theme file at '%s': %w", themePath, err) - } - - theme := defaultTheme - if err := yaml.Unmarshal(themeData, &theme); err != nil { - return nil, fmt.Errorf("invalid theme file at '%s': %w", themePath, err) - } - - return &theme, nil -} - -func (t *Theme) Save() (string, error) { - themePath, err := getThemePath() - if err != nil { - return "", fmt.Errorf("failed to locate theme path: %w", err) - } - - if err := os.MkdirAll(path.Dir(themePath), 0700); err != nil { - return "", err - } - - data, err := yaml.Marshal(t) - if err != nil { - return "", err - } - - return themePath, ioutil.WriteFile(themePath, data, 0600) -} diff --git a/app/darktile/gui/draw.go b/app/darktile/gui/draw.go index c124ee3..5ad030c 100644 --- a/app/darktile/gui/draw.go +++ b/app/darktile/gui/draw.go @@ -7,7 +7,20 @@ import ( // Draw renders the terminal GUI to the ebtien window. Required to implement the ebiten interface. func (g *GUI) Draw(screen *ebiten.Image) { - render.New(screen, g.terminal, g.fontManager, g.popupMessages, g.opacity, g.enableLigatures, g.cursorImage). + //select { + //case <-g.updateChan: + // if g.keyState.AnythingPressed() { + // go func() { + // time.Sleep(time.Millisecond * 10) + // g.updateChan <- struct{}{} + // }() + // } + //default: + // return + //} + + screen.Clear() + render.New(screen, g.c, g.theme, g.terminal, g.fontManager, g.popupMessages, g.opacity, g.enableLigatures, g.cursorImage). Draw() if g.screenshotRequested { diff --git a/app/darktile/gui/gui.go b/app/darktile/gui/gui.go index 2708dae..2c9deb4 100644 --- a/app/darktile/gui/gui.go +++ b/app/darktile/gui/gui.go @@ -3,23 +3,21 @@ package gui import ( "fmt" "image" - "math/rand" + "log/slog" "os" "strings" "time" "github.com/hajimehoshi/ebiten/v2" + "go.uber.org/fx" "tuxpa.in/t/erm/app/darktile/config" "tuxpa.in/t/erm/app/darktile/font" "tuxpa.in/t/erm/app/darktile/gui/popup" "tuxpa.in/t/erm/app/darktile/hinters" + "tuxpa.in/t/erm/app/darktile/termutil" termutil2 "tuxpa.in/t/erm/app/darktile/termutil" ) -func init() { - rand.Seed(time.Now().UnixNano()) -} - type GUI struct { mouseStateLeft MouseState mouseStateRight MouseState @@ -42,6 +40,10 @@ type GUI struct { opacity float64 enableLigatures bool cursorImage *ebiten.Image + + log *slog.Logger + theme *termutil.Theme + c *config.Lark } type MouseState uint8 @@ -51,8 +53,7 @@ const ( MouseStatePressed ) -func New(terminal *termutil2.Terminal, options ...Option) (*GUI, error) { - +func New(terminal *termutil2.Terminal, c *config.Lark, log *slog.Logger) (*GUI, error) { g := &GUI{ terminal: terminal, size: image.Point{80, 30}, @@ -61,62 +62,57 @@ func New(terminal *termutil2.Terminal, options ...Option) (*GUI, error) { activeHinter: -1, keyState: newKeyState(), enableLigatures: true, + c: c, + log: log, + theme: termutil.ThemeFromLark(c), } - - for _, option := range options { - if err := option(g); err != nil { - return nil, err - } - } - terminal.SetWindowManipulator(NewManipulator(g)) - return g, nil } -func (g *GUI) Run(c *config.Config) error { - +func (g *GUI) Run(s fx.Shutdowner) error { go func() { if err := g.terminal.Run(g.updateChan, uint16(g.size.X), uint16(g.size.Y)); err != nil { fmt.Fprintf(os.Stderr, "Fatal error: %s", err) - os.Exit(1) + s.Shutdown(fx.ExitCode(1)) } - os.Exit(0) + s.Shutdown(fx.ExitCode(0)) }() - ebiten.SetWindowTitle("darktile") - ebiten.SetScreenTransparent(true) + font, err := g.c.Font("font") + if err != nil { + return err + } + g.log.Info("running gui", "font", font) + g.fontManager.SetFontByFamilyName(font.Family) + if font.Size > 0 { + g.fontManager.SetSize(font.Size) + } + if len(font.Style) > 0 { + g.fontManager.SetFontStyle(font.Style) + } + g.fontManager.SetDPI(96) + g.enableLigatures = font.Ligatures + + ebiten.SetWindowTitle("erm") ebiten.SetScreenClearedEveryFrame(true) - ebiten.SetWindowResizable(true) + ebiten.SetWindowResizingMode(ebiten.WindowResizingModeEnabled) ebiten.SetRunnableOnUnfocused(true) - ebiten.SetMaxTPS(120) - if c.Vsync { - ebiten.SetFPSMode(ebiten.FPSModeVsyncOn) + ebiten.SetTPS(144) + ebiten.SetScreenClearedEveryFrame(false) + if g.c.Truthy("vsync") { + ebiten.SetVsyncEnabled(true) } else { - ebiten.SetFPSMode(ebiten.FPSModeVsyncOffMinimum) + ebiten.SetVsyncEnabled(false) } for _, f := range g.startupFuncs { go f(g) } - go g.watchForUpdate() - return ebiten.RunGame(g) } -func (g *GUI) watchForUpdate() { - for range g.updateChan { - ebiten.ScheduleFrame() - if g.keyState.AnythingPressed() { - go func() { - time.Sleep(time.Millisecond * 10) - ebiten.ScheduleFrame() - }() - } - } -} - func (g *GUI) CellSize() image.Point { return g.fontManager.CharSize() } diff --git a/app/darktile/gui/render/render.go b/app/darktile/gui/render/render.go index 7d5534f..2d4f24b 100644 --- a/app/darktile/gui/render/render.go +++ b/app/darktile/gui/render/render.go @@ -4,27 +4,30 @@ import ( "image" "github.com/hajimehoshi/ebiten/v2" + "tuxpa.in/t/erm/app/darktile/config" "tuxpa.in/t/erm/app/darktile/font" "tuxpa.in/t/erm/app/darktile/gui/popup" - termutil2 "tuxpa.in/t/erm/app/darktile/termutil" + termutil "tuxpa.in/t/erm/app/darktile/termutil" imagefont "golang.org/x/image/font" ) type Render struct { - frame *ebiten.Image - screen *ebiten.Image - terminal *termutil2.Terminal - buffer *termutil2.Buffer - theme *termutil2.Theme + frame *ebiten.Image + screen *ebiten.Image + + c *config.Lark + terminal *termutil.Terminal + buffer *termutil.Buffer fontManager *font.Manager pixelWidth int pixelHeight int font Font - opacity float64 popups []popup.Message enableLigatures bool cursorImage *ebiten.Image + + theme *termutil.Theme } type Font struct { @@ -36,14 +39,15 @@ type Font struct { DotDepth int } -func New(screen *ebiten.Image, terminal *termutil2.Terminal, fontManager *font.Manager, popups []popup.Message, opacity float64, enableLigatures bool, cursorImage *ebiten.Image) *Render { - w, h := screen.Size() +func New(screen *ebiten.Image, c *config.Lark, theme *termutil.Theme, terminal *termutil.Terminal, fontManager *font.Manager, popups []popup.Message, opacity float64, enableLigatures bool, cursorImage *ebiten.Image) *Render { + sz := screen.Bounds().Size() + w, h := sz.X, sz.Y + return &Render{ screen: screen, frame: ebiten.NewImage(w, h), terminal: terminal, buffer: terminal.GetActiveBuffer(), - theme: terminal.Theme(), fontManager: fontManager, pixelWidth: w, pixelHeight: h, @@ -55,10 +59,11 @@ func New(screen *ebiten.Image, terminal *termutil2.Terminal, fontManager *font.M CellSize: fontManager.CharSize(), DotDepth: fontManager.DotDepth(), }, - opacity: opacity, popups: popups, enableLigatures: enableLigatures, cursorImage: cursorImage, + theme: theme, + c: c, } } @@ -87,7 +92,7 @@ func (r *Render) Draw() { // // 7. draw popups r.drawPopups() - // // 8. apply effects (e.g. transparency) + // // 8. flush frame r.finalise() } @@ -95,6 +100,5 @@ func (r *Render) Draw() { func (r *Render) finalise() { defer r.frame.Dispose() opt := &ebiten.DrawImageOptions{} - opt.ColorM.Scale(1, 1, 1, r.opacity) r.screen.DrawImage(r.frame, opt) } diff --git a/app/darktile/gui/resize.go b/app/darktile/gui/resize.go index 1611f17..5aec96e 100644 --- a/app/darktile/gui/resize.go +++ b/app/darktile/gui/resize.go @@ -2,22 +2,32 @@ package gui import ( "image" + "math" + + "github.com/hajimehoshi/ebiten/v2" ) // Layout provides the terminal gui size in pixels. Required to implement the ebiten interface. func (g *GUI) Layout(outsideWidth, outsideHeight int) (int, int) { + panic("should not call this") +} - w, h := outsideWidth, outsideHeight +// Layout provides the terminal gui size in pixels. Required to implement the ebiten interface. +func (g *GUI) LayoutF(outsideWidth, outsideHeight float64) (float64, float64) { + + scale := ebiten.DeviceScaleFactor() + sw, sh := math.Ceil(scale*outsideWidth), math.Ceil(scale*outsideHeight) + w, h := int(sw), int(sh) if g.size.X != w || g.size.Y != h { g.size = image.Point{ - X: w, + X: int(w), Y: h, } g.resize(w, h) } - return w, h + return sw, sh } func (g *GUI) resize(w, h int) { diff --git a/app/darktile/termutil/ansi.go b/app/darktile/termutil/ansi.go index 421e4dd..16e0737 100644 --- a/app/darktile/termutil/ansi.go +++ b/app/darktile/termutil/ansi.go @@ -1,10 +1,12 @@ package termutil +import "fmt" + func (t *Terminal) handleANSI(readChan chan MeasuredRune) (renderRequired bool) { // if the byte is an escape character, read the next byte to determine which one r := <-readChan - t.log("ANSI SEQ %c 0x%X", r.Rune, r.Rune) + t.log.Debug(fmt.Sprintf("ANSI SEQ %c 0x%X", r.Rune, r.Rune)) t.mu.Lock() defer t.mu.Unlock() @@ -47,7 +49,7 @@ func (t *Terminal) handleANSI(readChan chan MeasuredRune) (renderRequired bool) case '^': return t.handlePrivacyMessage(readChan) default: - t.log("UNKNOWN ESCAPE SEQUENCE: 0x%X", r.Rune) + t.log.Warn("UNKNOWN ESCAPE SEQUENCE", "rune", fmt.Sprintf("0x%X", r.Rune)) return false } diff --git a/app/darktile/termutil/csi.go b/app/darktile/termutil/csi.go index aa5569c..c95cb6e 100644 --- a/app/darktile/termutil/csi.go +++ b/app/darktile/termutil/csi.go @@ -43,7 +43,7 @@ CSI: func (t *Terminal) handleCSI(readChan chan MeasuredRune) (renderRequired bool) { final, params, intermediate, raw := parseCSI(readChan) - t.log("CSI P(%q) I(%q) %c", strings.Join(params, ";"), string(intermediate), final) + t.log.Debug(fmt.Sprintf("CSI P(%q) I(%q) %c", strings.Join(params, ";"), string(intermediate), final)) switch final { case 'c': @@ -122,7 +122,7 @@ func (t *Terminal) handleCSI(readChan chan MeasuredRune) (renderRequired bool) { // if this is an unknown CSI sequence, write it to stdout as we can't handle it? //_ = t.writeToRealStdOut(append([]rune{0x1b, '['}, raw...)...) _ = raw - t.log("UNKNOWN CSI P(%s) I(%s) %c", strings.Join(params, ";"), string(intermediate), final) + t.log.Warn(fmt.Sprintf("UNKNOWN CSI P(%s) I(%s) %c", strings.Join(params, ";"), string(intermediate), final)) return false } @@ -791,7 +791,7 @@ func (t *Terminal) csiSetMode(modes string, enabled bool) bool { case "?80": t.activeBuffer.modes.SixelScrolling = enabled default: - t.log("Unsupported CSI mode %s = %t", modeStr, enabled) + t.log.Warn(fmt.Sprintf("Unsupported CSI mode %s = %t", modeStr, enabled)) } } return false diff --git a/app/darktile/termutil/options.go b/app/darktile/termutil/options.go index 501e1a3..f20a8a7 100644 --- a/app/darktile/termutil/options.go +++ b/app/darktile/termutil/options.go @@ -1,21 +1,7 @@ package termutil -import ( - "os" -) - type Option func(t *Terminal) -func WithLogFile(path string) Option { - return func(t *Terminal) { - if path == "-" { - t.logFile = os.Stdout - return - } - t.logFile, _ = os.Create(path) - } -} - func WithTheme(theme *Theme) Option { return func(t *Terminal) { t.theme = theme diff --git a/app/darktile/termutil/terminal.go b/app/darktile/termutil/terminal.go index 9d9ca1c..e824628 100644 --- a/app/darktile/termutil/terminal.go +++ b/app/darktile/termutil/terminal.go @@ -5,12 +5,13 @@ import ( "bytes" "fmt" "io" + "log/slog" "os" "os/exec" "sync" "github.com/creack/pty" - "golang.org/x/term" + "tuxpa.in/t/erm/app/darktile/config" ) const ( @@ -31,23 +32,23 @@ type Terminal struct { activeBuffer *Buffer mouseMode MouseMode mouseExtMode MouseExtMode - logFile *os.File theme *Theme running bool shell string initialCommand string + + log *slog.Logger } // NewTerminal creates a new terminal instance -func New(options ...Option) *Terminal { +func New(c *config.Lark, log *slog.Logger) *Terminal { term := &Terminal{ processChan: make(chan MeasuredRune, 0xffff), closeChan: make(chan struct{}), - theme: &Theme{}, - } - for _, opt := range options { - opt(term) + theme: ThemeFromLark(c), + log: log, } + fg := term.theme.DefaultForeground() bg := term.theme.DefaultBackground() term.buffers = []*Buffer{ @@ -63,12 +64,6 @@ func (t *Terminal) SetWindowManipulator(m WindowManipulator) { t.windowManipulator = m } -func (t *Terminal) log(line string, params ...interface{}) { - if t.logFile != nil { - _, _ = fmt.Fprintf(t.logFile, line+"\n", params...) - } -} - func (t *Terminal) reset() { fg := t.theme.DefaultForeground() bg := t.theme.DefaultBackground() @@ -116,7 +111,7 @@ func (t *Terminal) SetSize(rows, cols uint16) error { return fmt.Errorf("terminal is not running") } - t.log("RESIZE %d, %d\n", cols, rows) + t.log.Debug("RESIZE", "cols", cols, "rows", rows) t.activeBuffer.resizeView(cols, rows) @@ -133,6 +128,7 @@ func (t *Terminal) SetSize(rows, cols uint16) error { // Run starts the terminal/shell proxying process func (t *Terminal) Run(updateChan chan struct{}, rows uint16, cols uint16) error { + t.log.Info("starting terminal", "rows", rows, "cols", cols) os.Setenv("TERM", "xterm-256color") t.updateChan = updateChan @@ -162,19 +158,19 @@ func (t *Terminal) Run(updateChan chan struct{}, rows uint16, cols uint16) error // Set stdin in raw mode. - if fd := int(os.Stdin.Fd()); term.IsTerminal(fd) { - oldState, err := term.MakeRaw(fd) - if err != nil { - t.windowManipulator.ReportError(err) - } - defer func() { _ = term.Restore(fd, oldState) }() // Best effort. - } + //if fd := int(os.Stdin.Fd()); term.IsTerminal(fd) { + // oldState, err := term.MakeRaw(fd) + // if err != nil { + // t.windowManipulator.ReportError(err) + // } + // defer func() { _ = term.Restore(fd, oldState) }() // Best effort. + //} go t.process() t.running = true - t.windowManipulator.SetTitle("darktile") + t.windowManipulator.SetTitle("erm") if t.initialCommand != "" { if err := t.WriteToPty([]byte(t.initialCommand)); err != nil { @@ -224,7 +220,7 @@ func (t *Terminal) processRunes(runes ...MeasuredRune) (renderRequired bool) { for _, r := range runes { - t.log("%c 0x%X", r.Rune, r.Rune) + t.log.Debug(fmt.Sprintf("%c 0x%X", r.Rune, r.Rune)) switch r.Rune { case 0x05: //enq diff --git a/app/darktile/termutil/theme.go b/app/darktile/termutil/theme.go index b2f515a..e52d4aa 100644 --- a/app/darktile/termutil/theme.go +++ b/app/darktile/termutil/theme.go @@ -4,6 +4,8 @@ import ( "fmt" "image/color" "strconv" + + "tuxpa.in/t/erm/app/darktile/config" ) type Colour uint8 @@ -39,6 +41,32 @@ type Theme struct { } var ( + // https://www.ditig.com/publications/256-colors-cheat-sheet + xtermColors = map[string]Colour{ + "color0": ColourBlack, + "color1": ColourRed, + "color2": ColourGreen, + "color3": ColourYellow, + "color4": ColourBlue, + "color5": ColourMagenta, + "color6": ColourCyan, + "color7": ColourWhite, + "color8": ColourBrightBlack, + "color9": ColourBrightRed, + "color10": ColourBrightGreen, + "color11": ColourBrightYellow, + "color12": ColourBrightBlue, + "color13": ColourBrightMagenta, + "color14": ColourBrightCyan, + "color15": ColourBrightWhite, + + "foreground": ColourForeground, + "background": ColourBackground, + "cursorColor": ColourCursorBackground, + "cursorColor2": ColourCursorForeground, + "highlightColor": ColourSelectionBackground, + "highlightTextColor": ColourSelectionForeground, + } map4Bit = map[uint8]Colour{ 30: ColourBlack, 31: ColourRed, @@ -212,3 +240,18 @@ func (t *Theme) ColourFromAnsi(ansi []string, bg bool) (color.Color, error) { return nil, fmt.Errorf("invalid ansi colour code") } } + +func ThemeFromLark(c *config.Lark) *Theme { + + tf := NewThemeFactory() + + for k, v := range xtermColors { + val, err := c.Color("colors", k) + if err == nil { + tf = tf.WithColour(v, val) + } + } + theme := tf.Build() + return theme + +} diff --git a/cmd/erm/main.go b/cmd/erm/main.go index 4a32e5a..f3da551 100644 --- a/cmd/erm/main.go +++ b/cmd/erm/main.go @@ -7,72 +7,6 @@ import ( "tuxpa.in/t/erm/app/darktile/cmd" ) -// ducc -/** - ▒▒▒▒░░ - ▓▓▓▓▒▒▓▓▓▓░░ - ██▓▓▓▓▒▒▓▓▓▓▓▓ - ▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ██▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓ - ▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓████░░ - ▓▓▒▒▒▒▒▒▒▒▒▒▓▓▓▓░░▓▓░░ - ██▓▓▒▒▒▒▒▒▒▒▓▓▓▓░░▒▒░░ - ██▓▓▓▓▓▓▓▓▓▓▓▓██░░░░░░ - ████▓▓▓▓▓▓▓▓██░░░░▒▒░░░░ - ████████▓▓████░░░░░░░░░░ - ██████████████▒▒░░ ░░░░░░░░ - ██▓▓▓▓████████ ░░░░░░░░▒▒░░ - ▓▓▓▓▓▓████████ ░░▒▒▒▒██░░ - ▓▓▓▓▓▓████████ ▒▒ - ▓▓▓▓▓▓████████ - ▓▓▓▓██████████ - ██ ▓▓ - ░░ ░░░░ ░░░░ - ░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░ - ░░░░▒▒░░▒▒░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ░░░░░░░░░░▒▒▒▒░░░░▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ░░░░░░░░░░░░░░░░▒▒▒▒░░▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ░░░░░░░░░░░░░░▒▒░░░░▒▒▒▒▒▒▒▒░░▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒ - ░░░░░░░░░░░░░░▒▒▒▒▒▒▒▒░░▒▒▒▒▒▒▒▒▒▒░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ░░░░░░░░░░▒▒▓▓▓▓▒▒▓▓▓▓▓▓▓▓▒▒▒▒▒▒▒▒░░░░▒▒▒▒░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒ - ░░ ░░▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▒▒░░░░░░░░░░░░░░░░░░▒▒░░▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓██░░░░░░▒▒▓▓▓▓▓▓▓▓▒▒▓▓▓▓░░░░░░░░░░░░░░░░░░░░░░░░▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓ ██▒▒░░▒▒▒▒▓▓▓▓████▓▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒ - ██ ██▓▓▒▒▓▓▓▓████████░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▒▒░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ██▒▒████▒▒▓▓▓▓████▒▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒░░▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓██▓▓ - ▓▓▓▓██████▓▓████▒▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓████ - ▓▓██████ ░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▓▓▓▓██▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▒▒▓▓▓▓ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓▓▓▓▓▓██▓▓████▓▓▓▓████████▓▓▓▓██▓▓▒▒ - ▒▒████░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓▓▓▓▓▓████▓▓████████████████▓▓████ - ▓▓░░ ░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▓▓▓▓████▓▓████████████████▓▓▓▓▓▓ - ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓▓▓▓████████████████████████▓▓▓▓ - ░░░░░░░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓▓▓▓████████████████████████▓▓ - ░░░░░░░░░░░░ ░░░░░░░░░░░░░░░░░░▒▒▒▒██████████████████████████▓▓ - ░░ ░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▒▒▓▓████████████████████████ - ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▒▒▒▒▓▓██████████████████████ - ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▒▒▒▒▓▓▓▓████████████████▓▓ - ░░░░░░░░▒▒░░░░░░░░░░░░░░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓██████▒▒ - ░░░░▒▒▒▒░░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒ - ▒▒░░▓▓▓▓▒▒▒▒▒▒▒▒▒▒▓▓▓▓▓▓▓▓▓▓░░ - ░░▓▓ ░░░░ ▒▒░░▓▓▓▓ - ░░▓▓ ▓▓▓▓ - ░░▓▓ ▓▓▓▓ - ▒▒▒▒ ▒▒▒▒ - ░░░░ ▒▒▒▒░░ - ░░░░ ▒▒▒▒▒▒▒▒░░░░▒▒▒▒▒▒▒▒ - ░░░░ ░░▓▓▒▒░░░░▒▒▒▒▒▒ - ░░░░▒▒ ▒▒░░▒▒▒▒▒▒░░░░▒▒ - ░░▒▒░░▒▒▒▒▒▒░░▒▒▒▒ ░░▒▒░░ - ░░░░▒▒░░░░░░▒▒▒▒▒▒▒▒ - ░░░░▒▒▒▒▒▒░░░░░░▒▒ - ░░░░▒▒▒▒▒▒▒▒░░░░▓▓ - -*/ - func main() { os.Exit(cmd.Execute(context.Background())) } diff --git a/go.mod b/go.mod index 1cac88a..3fd3f87 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,47 @@ module tuxpa.in/t/erm -go 1.16 +go 1.21.3 + +toolchain go1.22.0 require ( + gfx.cafe/util/go v1.1.0 github.com/alecthomas/kong v0.7.1 github.com/creack/pty v1.1.12 github.com/d-tsuji/clipboard v0.0.3 - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be // indirect - github.com/hajimehoshi/ebiten/v2 v2.2.0-alpha.11.0.20210724070913-1706d9436a78 - github.com/mvdan/xurls v1.1.0 // indirect + github.com/hajimehoshi/ebiten/v2 v2.7.0-alpha.7 + github.com/lmittmann/tint v1.0.4 + github.com/mazznoer/csscolorparser v0.1.3 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 - github.com/stretchr/testify v1.7.0 - golang.org/x/exp v0.0.0-20210729172720-737cce5152fc // indirect - golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 - golang.org/x/text v0.3.6 - gopkg.in/yaml.v2 v2.4.0 // indirect + github.com/stretchr/testify v1.8.4 + go.starlark.net v0.0.0-20240123142251-f86470692795 + go.uber.org/fx v1.20.1 + golang.org/x/image v0.15.0 + golang.org/x/text v0.14.0 mvdan.cc/xurls v1.1.0 - sigs.k8s.io/yaml v1.1.0 +) + +require ( + git.wow.st/gmp/clip v0.0.0-20191001134149-1458ba6a7cf5 // indirect + github.com/BurntSushi/xgb v0.0.0-20200324125942-20f126ea2843 // indirect + github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/ebitengine/hideconsole v0.1.1-0.20240128160611-57e7b6b00abd // indirect + github.com/ebitengine/purego v0.6.0-alpha.4.0.20240127153756-e7ad88ddfffe // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/jezek/xgb v1.1.1 // indirect + github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1 // indirect + github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4 // indirect + github.com/mvdan/xurls v1.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + go.uber.org/dig v1.17.1 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.26.0 // indirect + golang.org/x/exp/shiny v0.0.0-20240205201215-2c58cdc269a3 // indirect + golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index b271d92..801eb06 100644 --- a/go.sum +++ b/go.sum @@ -1,479 +1,93 @@ -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= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +gfx.cafe/util/go v1.1.0 h1:0zn2DDjC6ervotcRgeqrvZpvFJkJlqYISU+WDjpvFiY= +gfx.cafe/util/go v1.1.0/go.mod h1:1jKv4bpEdBfr5jHw5yqwciUQW6Uztiq9XhVOpwDLUhI= git.wow.st/gmp/clip v0.0.0-20191001134149-1458ba6a7cf5 h1:OKeTjZST+/TKvtdA258NXJH+/gIx/xwyZxKrAezNFvk= git.wow.st/gmp/clip v0.0.0-20191001134149-1458ba6a7cf5/go.mod h1:NLdpaBoMQNFqncwP8OVRNWUDw1Kt9XWm3snfT7cXu24= -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/BurntSushi/xgb v0.0.0-20200324125942-20f126ea2843 h1:3iF31c7rp7nGZVDv7YQ+VxOgpipVfPKotLXykjZmwM8= github.com/BurntSushi/xgb v0.0.0-20200324125942-20f126ea2843/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0= github.com/alecthomas/assert/v2 v2.1.0/go.mod h1:b/+1DI2Q6NckYi+3mXyH3wFb8qG37K/DuK80n7WefXA= github.com/alecthomas/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4= github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U= github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE= github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 h1:6lhrsTEnloDPXyeZBvSYvQf8u86jbKehZPVDDlkgDl4= +github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/creack/pty v1.1.12 h1:2QLiUCEbsI13vUyWH6026g0o4u7vxgg2hLUc+D7FPFU= github.com/creack/pty v1.1.12/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/d-tsuji/clipboard v0.0.3 h1:ceGmYEF+uiuSZXnAfMu56DDZaSN+SgM2+3OHrNy0ABY= github.com/d-tsuji/clipboard v0.0.3/go.mod h1:hF88aLYx9LHNUFRrT6KPRkXEUm34nqP97IFgORGBRFs= -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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210715014612-ab6297867137/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be h1:vEIVIuBApEBQTEJt19GfhoU+zFSV+sNTa9E9FdnRYfk= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= -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= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY= -github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -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/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -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.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/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.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hajimehoshi/bitmapfont/v2 v2.1.3 h1:JefUkL0M4nrdVwVq7MMZxSTh6mSxOylm+C4Anoucbb0= -github.com/hajimehoshi/bitmapfont/v2 v2.1.3/go.mod h1:2BnYrkTQGThpr/CY6LorYtt/zEPNzvE/ND69CRTaHMs= -github.com/hajimehoshi/ebiten/v2 v2.2.0-alpha.11.0.20210724070913-1706d9436a78 h1:eb0XQeiwKUPLLISmH3ssGzq/HXdydrMnYz6SyunNwKU= -github.com/hajimehoshi/ebiten/v2 v2.2.0-alpha.11.0.20210724070913-1706d9436a78/go.mod h1:4AG16fE4/E9OfftCnkhL1KXUEAkA/my+AQ0eY/vi8jw= -github.com/hajimehoshi/file2byteslice v0.0.0-20200812174855-0e5e8a80490e/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE= -github.com/hajimehoshi/go-mp3 v0.3.2/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM= -github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI= -github.com/hajimehoshi/oto v0.7.1/go.mod h1:wovJ8WWMfFKvP587mhHgot/MBr4DnNy9m6EepeVGnos= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -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/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/ebitengine/hideconsole v0.1.1-0.20240128160611-57e7b6b00abd h1:ZOUjLrx0thTZUs43SlHbC/SnLX1ApeCV3S+wElVZfjE= +github.com/ebitengine/hideconsole v0.1.1-0.20240128160611-57e7b6b00abd/go.mod h1:hTTBTvVYWKBuxPr7peweneWdkUwEuHuB3C1R/ielR1A= +github.com/ebitengine/purego v0.6.0-alpha.4.0.20240127153756-e7ad88ddfffe h1:bac7sG+vDG+mBmjElwI0p1a2L09rxkY8xcmv5QEFyGA= +github.com/ebitengine/purego v0.6.0-alpha.4.0.20240127153756-e7ad88ddfffe/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ= +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/hajimehoshi/bitmapfont/v3 v3.0.0 h1:r2+6gYK38nfztS/et50gHAswb9hXgxXECYgE8Nczmi4= +github.com/hajimehoshi/bitmapfont/v3 v3.0.0/go.mod h1:+CxxG+uMmgU4mI2poq944i3uZ6UYFfAkj9V6WqmuvZA= +github.com/hajimehoshi/ebiten/v2 v2.7.0-alpha.7 h1:RnopmjZT7Nh0FWpwS1pH9oBLYGT+DOoRNp9Sr2gjhVU= +github.com/hajimehoshi/ebiten/v2 v2.7.0-alpha.7/go.mod h1:1Lvt+5rJa8DW8zzEP+1XrnpXQpSWPn/Hk7KjNXmHfq0= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jakecoffman/cp v1.1.0/go.mod h1:JjY/Fp6d8E1CHnu74gWNnU0+b9VzEdUVPoJxg2PsTQg= -github.com/jfreymuth/oggvorbis v1.0.3/go.mod h1:1U4pqWmghcoVsCJJ4fRBKv9peUJMBHixthRlBeD6uII= -github.com/jfreymuth/vorbis v1.0.2/go.mod h1:DoftRo4AznKnShRl1GxiTFCseHr4zR9BN3TWXyuzrqQ= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -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/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.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4= +github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk= +github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc= +github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1 h1:/QwQcwWVOQXcoNuV9tHx30gQ3q7jCE/rKcGjwzsa5tg= github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ= github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4 h1:5BmtGkQbch91lglMHQ9JIDGiYCL3kBRBA0ItZTvOcEI= github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4/go.mod h1:ouWl4wViUNh8tPSIwxTVMuS014WakR1hqvBc2I0bMoA= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mazznoer/csscolorparser v0.1.3 h1:vug4zh6loQxAUxfU1DZEu70gTPufDPspamZlHAkKcxE= +github.com/mazznoer/csscolorparser v0.1.3/go.mod h1:Aj22+L/rYN/Y6bj3bYqO3N6g1dtdHtGfQ32xZ5PJQic= github.com/mvdan/xurls v1.1.0 h1:OpuDelGQ1R1ueQ6sSryzi6P+1RtBpfQHM8fJwlE45ww= github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= -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/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -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/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.21.0/go.mod h1:ZPhntP/xmq1nnND05hhpAh2QMhSsA4UN3MGZ6O2J3hM= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -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.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/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-20190701094942-4def268fd1a4/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/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-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/exp v0.0.0-20210729172720-737cce5152fc h1:PKeT2DzGeVcdpsh9a/oZ8gJUG/+S7sADhVilAHjY0dA= -golang.org/x/exp v0.0.0-20210729172720-737cce5152fc/go.mod h1:DVyR6MI7P4kEQgvZJSj1fQGrWIi2RzIrfYWycwheUAc= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs= -golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -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-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= -golang.org/x/mobile v0.0.0-20210716004757-34ab1303b554 h1:3In5TnfvnuXTF/uflgpYxSCEGP2NdYT37KsPh3VjZYU= -golang.org/x/mobile v0.0.0-20210716004757-34ab1303b554/go.mod h1:jFTmtFYCV0MFtXBU+J5V/+5AUeVS0ON/0WkE/KSrl6E= -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.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/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-20181201002055-351d144fa1fc/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-20190125091013-d26f9f9a57f3/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-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -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/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-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -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-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +go.starlark.net v0.0.0-20240123142251-f86470692795 h1:LmbG8Pq7KDGkglKVn8VpZOZj6vb9b8nKEGcg9l03epM= +go.starlark.net v0.0.0-20240123142251-f86470692795/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/dig v1.17.1 h1:Tga8Lz8PcYNsWsyHMZ1Vm0OQOUaJNDyvPImgbAu9YSc= +go.uber.org/dig v1.17.1/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE= +go.uber.org/fx v1.20.1 h1:zVwVQGS8zYvhh9Xxcu4w1M6ESyeMzebzj2NbSayZ4Mk= +go.uber.org/fx v1.20.1/go.mod h1:iSYNbHf2y55acNCwCXKx7LbWb5WG1Bnue5RDXz1OREg= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +golang.org/x/exp/shiny v0.0.0-20240205201215-2c58cdc269a3 h1:tImqKNm/Iclm3Rqb6GffLiURSp3m1iRx/C4mturH8Ys= +golang.org/x/exp/shiny v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o= +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/mobile v0.0.0-20240112133503-c713f31d574b h1:kfWLZgb8iUBHdE9WydD5V5dHIS/F6HjlBZNyJfn2bs4= +golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b/go.mod h1:4efzQnuA1nICq6h4kmZRMGzbPiP06lZvgADUu1VpJCE= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/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-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/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.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/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-20180828015842-6cd1fcedba52/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-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-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/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-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -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/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +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/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -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-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= -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.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/Knetic/govaluate.v3 v3.0.0 h1:18mUyIt4ZlRlFZAAfVetz4/rzlJs9yhN+U02F4u1AOc= gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/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/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/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.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= mvdan.cc/xurls v1.1.0 h1:kj0j2lonKseISJCiq1Tfk+iTv65dDGCl0rTbanXJGGc= mvdan.cc/xurls v1.1.0/go.mod h1:TNWuhvo+IqbUCmtUIb/3LJSQdrzel8loVpgFm0HikbI= -sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=