From 82a651cd5deddf3a699a66317e85b4ef16d4f1a5 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 22 Dec 2021 11:52:02 +0100 Subject: [PATCH 01/16] First draft of new fiber based server - replaced previous net/http based muxer and all other components with fiber - replaced polling with SSE to handle file changes - auto-update custom stylesheets - natively support mermaid diagrams - handle custom element attributes for lists properly - reload on config changes - replace JS templating with actual JS code and an API --- .gitattributes | 1 + .gitignore | 1 + Taskfile.yml | 4 +- api/config.go | 25 +++ api/events.go | 74 ++++++++ api/no_cache_middleware.go | 12 ++ api/reveal.go | 31 +++ api/views.go | 73 +++++++ assets/assets.go | 4 +- assets/lint/config.toml | 46 ----- assets/web/js/reload.js | 24 --- cmd/goveal/main.go | 6 +- cmd/goveal/root.go | 52 +++++ cmd/goveal/serve.go | 73 +++++++ config/components.go | 68 +++++++ config/load.go | 51 +++++ events/event_hub.go | 151 +++++++++++++++ examples/gopher.jpg | Bin 35704 -> 130 bytes examples/goveal.yaml | 7 +- examples/slides.md | 71 +++++-- fs/layered.go | 24 +++ fs/watching_fs.go | 66 +++++++ go.mod | 26 ++- go.sum | 194 +++++++++++++++++-- internal/app/cmd/root.go | 132 ------------- internal/app/cmd/serve.go | 94 --------- internal/app/rendering/reveal_params.go | 89 --------- internal/app/rendering/template.go | 70 ------- internal/app/routing/layered_fs.go | 47 ----- internal/app/routing/markdown_fs.go | 33 ---- internal/app/routing/no_cache_handler.go | 56 ------ internal/app/routing/regexp_router.go | 38 ---- internal/app/server/hash_handler.go | 103 ---------- internal/app/server/http_server.go | 118 ------------ internal/encoding/line_ending.go | 44 ----- internal/encoding/line_ending_test.go | 74 -------- rendering/render_to_reveal.go | 232 +++++++++++++++++++++++ rendering/state.go | 126 ++++++++++++ rendering/templates/any-code.gohtml | 6 + rendering/templates/image.gohtml | 8 + rendering/templates/listItem.gohtml | 5 + rendering/templates/mermaid.gohtml | 3 + web/index.gohtml | 36 ++++ web/js/app.js | 116 ++++++++++++ web/web.go | 6 + 45 files changed, 1500 insertions(+), 1020 deletions(-) create mode 100644 .gitattributes create mode 100644 api/config.go create mode 100644 api/events.go create mode 100644 api/no_cache_middleware.go create mode 100644 api/reveal.go create mode 100644 api/views.go delete mode 100644 assets/lint/config.toml delete mode 100644 assets/web/js/reload.js create mode 100644 cmd/goveal/root.go create mode 100644 cmd/goveal/serve.go create mode 100644 config/components.go create mode 100644 config/load.go create mode 100644 events/event_hub.go create mode 100644 fs/layered.go create mode 100644 fs/watching_fs.go delete mode 100644 internal/app/cmd/root.go delete mode 100644 internal/app/cmd/serve.go delete mode 100644 internal/app/rendering/reveal_params.go delete mode 100644 internal/app/rendering/template.go delete mode 100644 internal/app/routing/layered_fs.go delete mode 100644 internal/app/routing/markdown_fs.go delete mode 100644 internal/app/routing/no_cache_handler.go delete mode 100644 internal/app/routing/regexp_router.go delete mode 100644 internal/app/server/hash_handler.go delete mode 100644 internal/app/server/http_server.go delete mode 100644 internal/encoding/line_ending.go delete mode 100644 internal/encoding/line_ending_test.go create mode 100644 rendering/render_to_reveal.go create mode 100644 rendering/state.go create mode 100644 rendering/templates/any-code.gohtml create mode 100644 rendering/templates/image.gohtml create mode 100644 rendering/templates/listItem.gohtml create mode 100644 rendering/templates/mermaid.gohtml create mode 100644 web/index.gohtml create mode 100644 web/js/app.js create mode 100644 web/web.go diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4fae6dc --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.jpg filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index cb049df..8025e3f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ bin/ assets/reveal/ +assets/mermaid/ pkged.go diff --git a/Taskfile.yml b/Taskfile.yml index c1c3ad0..354a126 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -4,6 +4,7 @@ vars: DEBUG_PORT: 2345 REVEALJS_VERSION: 4.1.2 HIGHLIGHTJS_VERSION: 11.3.1 + MERMAID_VERSION: 8.13.4 BINARY_NAME: goveal OUT_DIR: ./out GO_BUILD_ARGS: -ldflags="-w -s" @@ -90,13 +91,14 @@ tasks: - Taskfile.yml cmds: - rm -rf ./assets/reveal - - mkdir -p ./assets/reveal + - mkdir -p ./assets/reveal ./assets/mermaid - curl -sL https://github.com/hakimel/reveal.js/archive/{{ .REVEALJS_VERSION }}.tar.gz | tar -xvz --strip-components=1 -C ./assets/reveal --wildcards "*.js" --wildcards "*.css" --wildcards "*.html" --wildcards "*.woff" --wildcards "*.ttf" --exclude "test" --exclude "gulpfile.js" --exclude "gruntfile.js" --exclude "demo.html" --exclude "index.html" --exclude "examples/*.html" - mkdir -p ./assets/reveal/plugin/menu ./assets/reveal/plugin/mouse-pointer - git clone https://github.com/denehyg/reveal.js-menu.git ./assets/reveal/plugin/menu - curl -L -o ./assets/reveal/plugin/mouse-pointer/mouse-pointer.js https://raw.githubusercontent.com/caiofcm/plugin-revealjs-mouse-pointer/master/mouse-pointer.js - rm -f ./assets/reveal/plugin/menu/{bower.json,CONTRIBUTING.md,LICENSE,package.json,README.md,.gitignore,gulpfile.js,package-lock.json} - curl -L https://github.com/highlightjs/highlight.js/archive/{{ .HIGHLIGHTJS_VERSION }}.tar.gz | tar -xvz --strip-components=3 -C ./assets/reveal/plugin/highlight --wildcards "*.css" highlight.js-{{ .HIGHLIGHTJS_VERSION }}/src/styles/ + - curl -L https://github.com/mermaid-js/mermaid/archive/refs/tags/{{ .MERMAID_VERSION }}.tar.gz | tar -xvz -C ./assets/mermaid/ mermaid-{{ .MERMAID_VERSION }}/dist --strip-components=2 go-get-tool: vars: diff --git a/api/config.go b/api/config.go new file mode 100644 index 0000000..5050560 --- /dev/null +++ b/api/config.go @@ -0,0 +1,25 @@ +package api + +import ( + "github.com/gofiber/fiber/v2" + + "github.com/baez90/goveal/config" +) + +type ConfigAPI struct { + cfg *config.Components +} + +func RegisterConfigAPI(app *fiber.App, cfg *config.Components) { + cfgApi := &ConfigAPI{cfg: cfg} + app.Get("/api/v1/config/reveal", cfgApi.RevealConfig) + app.Get("/api/v1/config/mermaid", cfgApi.MermaidConfig) +} + +func (a *ConfigAPI) RevealConfig(ctx *fiber.Ctx) error { + return ctx.JSON(a.cfg.Reveal) +} + +func (a *ConfigAPI) MermaidConfig(ctx *fiber.Ctx) error { + return ctx.JSON(a.cfg.Mermaid) +} diff --git a/api/events.go b/api/events.go new file mode 100644 index 0000000..8ebaca2 --- /dev/null +++ b/api/events.go @@ -0,0 +1,74 @@ +package api + +import ( + "bufio" + "encoding/json" + "errors" + "fmt" + "time" + + "github.com/gofiber/fiber/v2" + log "github.com/sirupsen/logrus" + + "github.com/baez90/goveal/events" +) + +type ContentEventHandler chan events.ContentEvent + +func (h ContentEventHandler) OnEvent(ce events.ContentEvent) error { + const enqueueTimeout = 50 * time.Millisecond + select { + case h <- ce: + return nil + case <-time.After(enqueueTimeout): + return errors.New("failed to enqueue due to timeout") + } +} + +type Events struct { + logger *log.Logger + hub *events.EventHub +} + +func RegisterEventsAPI(app *fiber.App, hub *events.EventHub, logger *log.Logger) { + ev := &Events{hub: hub, logger: logger} + app.Get("/api/v1/events", ev.EventHandler) +} + +func (e *Events) EventHandler(fc *fiber.Ctx) error { + var ( + ctx = fc.Context() + handler = make(ContentEventHandler) + clientID, onError = e.hub.Subscribe(handler) + ) + + ctx.SetContentType("text/event-stream") + ctx.Response.Header.Set("Cache-Control", "no-cache") + ctx.Response.Header.Set("Connection", "keep-alive") + ctx.Response.Header.Set("Transfer-Encoding", "chunked") + ctx.Response.Header.Set("Access-Control-Allow-Origin", "*") + ctx.Response.Header.Set("Access-Control-Allow-Headers", "Cache-Control") + ctx.Response.Header.Set("Access-Control-Allow-Credentials", "true") + + ctx.SetBodyStreamWriter(func(w *bufio.Writer) { + for ev := range handler { + if msg, err := json.Marshal(ev); err != nil { + e.logger.Errorf("Failed to marshal to JSON: %v", err) + continue + } else if _, err = fmt.Fprintf(w, "data: %s\n\n", string(msg)); err != nil { + e.logger.Errorf("Failed to write to client: %v", err) + continue + } else if err = w.Flush(); err != nil { + e.hub.Unsubscribe(clientID) + } + } + }) + + go func() { + for err := range onError { + e.logger.Errorf("Error while sending events to client: %v", err) + } + }() + + return nil +} diff --git a/api/no_cache_middleware.go b/api/no_cache_middleware.go new file mode 100644 index 0000000..15e43ca --- /dev/null +++ b/api/no_cache_middleware.go @@ -0,0 +1,12 @@ +package api + +import "github.com/gofiber/fiber/v2" + +func NoCache(app *fiber.App) { + app.Use(NoCacheHandler) +} + +func NoCacheHandler(ctx *fiber.Ctx) error { + ctx.Response().Header.Set("Cache-Control", "no-cache") + return ctx.Next() +} diff --git a/api/reveal.go b/api/reveal.go new file mode 100644 index 0000000..fed5133 --- /dev/null +++ b/api/reveal.go @@ -0,0 +1,31 @@ +package api + +import ( + "net/http" + "strings" + + "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/middleware/filesystem" + + "github.com/baez90/goveal/assets" + "github.com/baez90/goveal/fs" + "github.com/baez90/goveal/web" +) + +func RegisterStaticFileHandling(app *fiber.App, wdfs fs.FS) error { + layers := []fs.FS{wdfs} + layers = append([]fs.FS{web.WebFS, assets.Assets}, layers...) + + layeredFS := fs.Layered{Layers: layers} + fsMiddleware := filesystem.New(filesystem.Config{ + Root: http.FS(layeredFS), + Next: func(c *fiber.Ctx) bool { + _, err := layeredFS.Open(strings.TrimLeft(c.Path(), "/")) + return err != nil + }, + }) + + app.Use(fsMiddleware) + + return nil +} diff --git a/api/views.go b/api/views.go new file mode 100644 index 0000000..884ccb2 --- /dev/null +++ b/api/views.go @@ -0,0 +1,73 @@ +package api + +import ( + "hash/fnv" + "io" + + "github.com/gofiber/fiber/v2" + "github.com/gomarkdown/markdown" + "github.com/gomarkdown/markdown/html" + "github.com/gomarkdown/markdown/parser" + "go.uber.org/multierr" + + "github.com/baez90/goveal/config" + "github.com/baez90/goveal/fs" + "github.com/baez90/goveal/rendering" +) + +const ( + parserExtensions = parser.NoIntraEmphasis | parser.Tables | parser.FencedCode | + parser.Autolink | parser.Strikethrough | parser.SpaceHeadings | parser.HeadingIDs | + parser.BackslashLineBreak | parser.DefinitionLists | parser.MathJax | parser.Titleblock | + parser.OrderedListStart | parser.Attributes +) + +type Views struct { + cfg *config.Components + wdfs fs.FS + mdFilepath string +} + +func RegisterViews(app *fiber.App, wdfs fs.FS, mdFilepath string, cfg *config.Components) { + p := &Views{cfg: cfg, wdfs: wdfs, mdFilepath: mdFilepath} + app.Get("/", p.IndexPage) + app.Get("/index.html", p.IndexPage) + app.Get("/index.htm", p.IndexPage) + app.Get("/slides", p.RenderedMarkdown) +} + +func (p *Views) IndexPage(ctx *fiber.Ctx) error { + return ctx.Render("index", fiber.Map{ + "Reveal": p.cfg.Reveal, + "Rendering": p.cfg.Rendering, + }) +} + +func (p *Views) RenderedMarkdown(ctx *fiber.Ctx) (err error) { + f, err := p.wdfs.Open(p.mdFilepath) + if err != nil { + return err + } + defer multierr.AppendInvoke(&err, multierr.Close(f)) + data, err := io.ReadAll(f) + if err != nil { + return err + } + + mdParser := parser.NewWithExtensions(parserExtensions) + rr := &rendering.RevealRenderer{ + StateMachine: rendering.NewStateMachine("***", "---"), + Hash: fnv.New32a(), + } + renderer := html.NewRenderer(html.RendererOptions{ + Flags: html.CommonFlags | html.HrefTargetBlank, + RenderNodeHook: rr.RenderHook, + }) + + ctx.Append(fiber.HeaderContentType, fiber.MIMETextHTML) + if _, err = ctx.Write(markdown.ToHTML(data, mdParser, renderer)); err != nil { + return err + } + + return err +} diff --git a/assets/assets.go b/assets/assets.go index 84828fa..e5a6a07 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -3,8 +3,6 @@ package assets import "embed" var ( - //go:embed template/reveal-markdown.tmpl - Template []byte - //go:embed web reveal + //go:embed reveal mermaid/mermaid.min.js Assets embed.FS ) diff --git a/assets/lint/config.toml b/assets/lint/config.toml deleted file mode 100644 index c61446b..0000000 --- a/assets/lint/config.toml +++ /dev/null @@ -1,46 +0,0 @@ -ignoreGeneratedHeader = false -severity = "warning" -confidence = 0.8 -errorCode = 1 -warningCode = 1 -empty-block = true -confusing-naming = true -get-return = true -deep-exit = true -unused-parameter = true -unreachable-code = true - - -[rule.blank-imports] -[rule.context-as-argument] -[rule.context-keys-type] -[rule.dot-imports] -[rule.error-return] -[rule.error-strings] -[rule.error-naming] -[rule.exported] -[rule.if-return] -[rule.increment-decrement] -[rule.var-naming] -[rule.var-declaration] -[rule.package-comments] -[rule.range] -[rule.receiver-naming] -[rule.time-naming] -[rule.unexported-return] -[rule.indent-error-flow] -[rule.errorf] -[rule.empty-block] -[rule.superfluous-else] -[rule.unused-parameter] -[rule.unreachable-code] -[rule.redefines-builtin-id] - -[argument-limit] - arguments =[4] - -[line-length-limit] - arguments =[80] - -[rule.add-constant] - arguments = [{maxLitCount = "3",allowStrs ="\"\"",allowInts="0,1,2",allowFloats="0.0,0.,1.0,1.,2.0,2."}] \ No newline at end of file diff --git a/assets/web/js/reload.js b/assets/web/js/reload.js deleted file mode 100644 index 34981f2..0000000 --- a/assets/web/js/reload.js +++ /dev/null @@ -1,24 +0,0 @@ -let knownHashes = {} - -function getLatestHash(path) { - let request = new XMLHttpRequest() - request.open("GET", `/hash/md5${path}`) - - request.onload = () => { - if(request.status === 200) { - let hashResp = JSON.parse(request.responseText) - if(path in knownHashes && knownHashes[path] !== hashResp["Hash"]) { - window.location.reload() - } else { - knownHashes[path] = hashResp["Hash"] - } - } - } - request.send() -} - -function subscribeForUpdates(path) { - setInterval(() => { - getLatestHash(path) - }, 1000) -} \ No newline at end of file diff --git a/cmd/goveal/main.go b/cmd/goveal/main.go index 753a789..8931dae 100644 --- a/cmd/goveal/main.go +++ b/cmd/goveal/main.go @@ -15,9 +15,11 @@ package main import ( - "github.com/baez90/goveal/internal/app/cmd" + log "github.com/sirupsen/logrus" ) func main() { - cmd.Execute() + if err := rootCmd.Execute(); err != nil { + log.Errorf("Failed to run command: %v", err) + } } diff --git a/cmd/goveal/root.go b/cmd/goveal/root.go new file mode 100644 index 0000000..5439626 --- /dev/null +++ b/cmd/goveal/root.go @@ -0,0 +1,52 @@ +// Copyright © 2019 Peter Kurfer +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "os" + + log "github.com/sirupsen/logrus" + "github.com/spf13/cobra" + + "github.com/baez90/goveal/config" +) + +var ( + cfgFile string + rootCmd = &cobra.Command{ + Use: "goveal", + Short: "goveal is a small reveal.js server", + Long: `goveal is a single static binary to host your reveal.js based markdown presentation. +It is running a small web server that loads your markdown file, renders a complete HTML page and delivers it including all the reveal.js assets. +It is not required to restart the server when you edit the markdown - a simple reload of the page is doing all the required magic.`, + PersistentPreRunE: func(*cobra.Command, []string) (err error) { + log.SetFormatter(&log.TextFormatter{ + ForceColors: true, + }) + + if workingDir, err = os.Getwd(); err != nil { + return err + } + + cfg, err = config.Load(workingDir, cfgFile) + return err + }, + } +) + +func init() { + rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.go-reveal-slides.yaml)") + rootCmd.PersistentFlags().StringVar(&workingDir, "working-dir", workingDir, "working directory to use") +} diff --git a/cmd/goveal/serve.go b/cmd/goveal/serve.go new file mode 100644 index 0000000..2cba01c --- /dev/null +++ b/cmd/goveal/serve.go @@ -0,0 +1,73 @@ +package main + +import ( + "encoding/hex" + "hash/fnv" + "net/http" + "path" + "path/filepath" + + "github.com/gofiber/fiber/v2" + "github.com/gofiber/template/html" + log "github.com/sirupsen/logrus" + "github.com/spf13/cobra" + "go.uber.org/multierr" + + "github.com/baez90/goveal/api" + "github.com/baez90/goveal/config" + "github.com/baez90/goveal/events" + "github.com/baez90/goveal/fs" + "github.com/baez90/goveal/web" +) + +var ( + workingDir string + cfg *config.Components + serveCmd = &cobra.Command{ + Use: "serve", + Args: cobra.ExactArgs(1), + RunE: func(_ *cobra.Command, args []string) (err error) { + var wdfs *fs.Watching + + if wdfs, err = fs.NewWatching(fs.Dir(workingDir)); err != nil { + return err + } + + defer multierr.AppendInvoke(&err, multierr.Close(wdfs)) + + var mdFile fs.File + if mdFile, err = wdfs.Open(args[0]); err != nil { + return err + } + _ = mdFile.Close() + + app := fiber.New(fiber.Config{ + Views: html.NewFileSystem(http.FS(web.WebFS), ".gohtml"). + AddFunc("fileId", func(fileName string) string { + h := fnv.New32a() + return hex.EncodeToString(h.Sum([]byte(path.Base(fileName)))) + }), + }) + hub := events.NewEventHub( + wdfs, + fnv.New32a(), + events.FileNameTrigger(args[0]), + events.FileNameTrigger(filepath.Base(cfg.ConfigFileInUse)), + ) + + api.NoCache(app) + api.RegisterViews(app, wdfs, args[0], cfg) + api.RegisterEventsAPI(app, hub, log.StandardLogger()) + api.RegisterConfigAPI(app, cfg) + if err := api.RegisterStaticFileHandling(app, wdfs); err != nil { + return err + } + + return app.Listen(":3000") + }, + } +) + +func init() { + rootCmd.AddCommand(serveCmd) +} diff --git a/config/components.go b/config/components.go new file mode 100644 index 0000000..64fdceb --- /dev/null +++ b/config/components.go @@ -0,0 +1,68 @@ +package config + +var ( + defaults = map[string]interface{}{ + "mermaid.theme": "forest", + "reveal.theme": "beige", + "codeTheme": "monokai", + "transition": TransitionNone, + "controls": true, + "progress": true, + "history": true, + "center": true, + "slideNumber": true, + "menu.numbers": true, + "menu.useTextContentForMissingTitles": true, + } +) + +const ( + TransitionNone Transition = "none" + TransitionFade Transition = "fade" + TransitionSlide Transition = "slide" + TransitionConvex Transition = "convex" + TransitionConcave Transition = "concave" + TransitionZoom Transition = "zoom" +) + +type ( + Transition string + Mermaid struct { + Theme string `json:"theme"` + } + Rendering struct { + VerticalSeparator string + HorizontalSeparator string + Stylesheets []string + } + Reveal struct { + Theme string `json:"theme"` + CodeTheme string `json:"codeTheme"` + Transition Transition `json:"transition"` + Controls bool `json:"controls"` + Progress bool `json:"progress"` + History bool `json:"history"` + Center bool `json:"center"` + SlideNumber bool `json:"slideNumber"` + Menu struct { + Numbers bool `json:"numbers"` + UseTextContentForMissingTitles bool `json:"useTextContentForMissingTitles"` + Transitions bool + } `json:"menu"` + } + Components struct { + ConfigFileInUse string `mapstructure:"-"` + Reveal Reveal `mapstructure:",squash"` + Rendering Rendering `mapstructure:",squash"` + Mermaid Mermaid + } +) + +func (t Transition) String() string { + switch t { + case TransitionNone: + return "none" + default: + return string(t) + } +} diff --git a/config/load.go b/config/load.go new file mode 100644 index 0000000..5c564b4 --- /dev/null +++ b/config/load.go @@ -0,0 +1,51 @@ +package config + +import ( + "github.com/fsnotify/fsnotify" + "github.com/mitchellh/go-homedir" + log "github.com/sirupsen/logrus" + "github.com/spf13/viper" +) + +func Load(workingDir, configFile string) (cfg *Components, err error) { + var ( + loader = viper.New() + home string + ) + cfg = new(Components) + + for k, v := range defaults { + loader.SetDefault(k, v) + } + + if configFile != "" { + loader.SetConfigFile(configFile) + } else if home, err = homedir.Dir(); err != nil { + return nil, err + } else { + loader.AddConfigPath(home) + } + + loader.AddConfigPath(workingDir) + loader.SetConfigName("goveal") + loader.SetConfigType("yaml") + loader.AutomaticEnv() + + if err = loader.ReadInConfig(); err == nil { + log.Info("Using config file:", loader.ConfigFileUsed()) + cfg.ConfigFileInUse = loader.ConfigFileUsed() + loader.WatchConfig() + } else { + return nil, err + } + + loader.OnConfigChange(func(in fsnotify.Event) { + if in.Op == fsnotify.Write { + _ = loader.Unmarshal(cfg) + } + }) + + err = loader.Unmarshal(cfg) + + return cfg, err +} diff --git a/events/event_hub.go b/events/event_hub.go new file mode 100644 index 0000000..2bf9ee1 --- /dev/null +++ b/events/event_hub.go @@ -0,0 +1,151 @@ +package events + +import ( + "encoding/hex" + "fmt" + "hash" + "io" + "path" + "path/filepath" + "strconv" + "strings" + "sync" + + "github.com/google/uuid" + + "github.com/baez90/goveal/fs" +) + +const ( + baseDecimal = 10 +) + +type ( + ReloadTrigger interface { + Triggers(ev fs.Event) bool + } + ContentEvent struct { + File string `json:"file"` + FileNameHash string `json:"fileNameHash"` + Timestamp string `json:"ts"` + ForceReload bool `json:"forceReload"` + } + EventSource interface { + io.Closer + fs.FS + Events() chan fs.Event + } + EventHandler interface { + OnEvent(ev ContentEvent) error + } + EventHandlerFunc func(ev ContentEvent) error + subscription struct { + EventHandler + OnError chan error + } + FileNameTrigger string + FileSuffixTrigger string +) + +func (t FileNameTrigger) Triggers(ev fs.Event) bool { + fileBase := filepath.Base(ev.File) + return strings.EqualFold(fileBase, string(t)) +} + +func (t FileSuffixTrigger) Triggers(ev fs.Event) bool { + return strings.HasSuffix(strings.ToLower(filepath.Base(ev.File)), strings.ToLower(string(t))) +} + +func (f EventHandlerFunc) OnEvent(ev ContentEvent) error { + return f(ev) +} + +func NewEventHub(eventSource EventSource, fileNameHash hash.Hash, triggers ...ReloadTrigger) *EventHub { + hub := &EventHub{ + FileNameHash: fileNameHash, + reloadTriggers: triggers, + source: eventSource, + subscriptions: make(map[uuid.UUID]*subscription), + done: make(chan struct{}), + } + + go hub.processEvents() + + return hub +} + +type EventHub struct { + FileNameHash hash.Hash + reloadTriggers []ReloadTrigger + lock sync.RWMutex + done chan struct{} + source EventSource + subscriptions map[uuid.UUID]*subscription +} + +func (h *EventHub) Subscribe(handler EventHandler) (id uuid.UUID, onError <-chan error) { + h.lock.Lock() + defer h.lock.Unlock() + + s := &subscription{ + EventHandler: handler, + OnError: make(chan error), + } + clientID := uuid.New() + h.subscriptions[clientID] = s + + return clientID, s.OnError +} + +func (h *EventHub) Unsubscribe(id uuid.UUID) { + h.lock.Lock() + defer h.lock.Unlock() + delete(h.subscriptions, id) +} + +func (h *EventHub) Close() error { + close(h.done) + return h.source.Close() +} + +func (h *EventHub) processEvents() { + events := h.source.Events() + for { + select { + case ev, more := <-events: + if !more { + return + } + h.notifySubscribers(ev) + case _, more := <-h.done: + if !more { + return + } + } + } +} + +func (h *EventHub) notifySubscribers(ev fs.Event) { + h.lock.RLock() + defer h.lock.RUnlock() + + var triggerReload bool + for idx := range h.reloadTriggers { + if triggerReload = h.reloadTriggers[idx].Triggers(ev); triggerReload { + break + } + } + + ce := ContentEvent{ + File: fmt.Sprintf("/%s", ev.File), + Timestamp: strconv.FormatInt(ev.Timestamp.Unix(), baseDecimal), + ForceReload: triggerReload, + FileNameHash: hex.EncodeToString(h.FileNameHash.Sum([]byte(path.Base(ev.File)))), + } + + for _, handler := range h.subscriptions { + if err := handler.OnEvent(ce); err != nil { + handler.OnError <- err + } + } +} diff --git a/examples/gopher.jpg b/examples/gopher.jpg index bcf63e98766b8e8a539eab0eb207b24b0df574e9..c8130d060b84b3e0f2a426c6e91e66a04ed9f706 100644 GIT binary patch literal 130 zcmWN|xe>!45J1tKDrmssTn=>uh&9aEM&m^aT)heYyy)NcOMQHJoAabyh-aUV7t*$D zSKi8a3p#5Nw_>9ooLbW0cICXT@&K8#_ohT+q)Ji8qD#;=Ez#8#Dgd;AL0X$*!jP?T NYh=`al^gKVvOmduCkFrk literal 35704 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 diff --git a/examples/goveal.yaml b/examples/goveal.yaml index 8187d56..d1aef4f 100644 --- a/examples/goveal.yaml +++ b/examples/goveal.yaml @@ -2,8 +2,7 @@ theme: night codeTheme: monokai horizontalSeparator: === verticalSeparator: --- -transition: fade +transition: convex +menu.numbers: false stylesheets: - - custom.css -filesToMonitor: - - ./**/*.css \ No newline at end of file + - custom.css \ No newline at end of file diff --git a/examples/slides.md b/examples/slides.md index 603948a..0c5a09e 100644 --- a/examples/slides.md +++ b/examples/slides.md @@ -4,51 +4,78 @@ Content 1.1 -Note: This will only appear in the speaker notes window. - ---- +*** ## External 1.2 Content 1.2 -=== +Note: + +This will only display in the notes window. + +*** + +### List & fragments + +* unordered +* list +* with `code` +* with __bold__ text + +Notes: + +- some other points only +- in the nodes + +*** + +### List in HTML + +
    +
  • List
    • +
  • with code
    • +
  • with bold text
    • +
+ +--- ## External 2 Content 2.1 -=== +--- ## External 3.1 Content 3.1 ---- +*** ## External 3.2 Content 3.2 ---- +*** ## External 3.3 ![External Image](https://s3.amazonaws.com/static.slid.es/logo/v2/slides-symbol-512x512.png) -=== +--- + ## External 4.1 -![Local image](/examples/gopher.jpg) +![Local image](/gopher.jpg) ---- +*** ## External 4.2 Google -=== +--- ## Code @@ -57,4 +84,26 @@ var i = 10; for (var j = 0; j < i; j++) { Console.WriteLine($"{j}"); } +``` + +*** + +### Mermaid + +```mermaid +flowchart LR + a --> b & c--> d +``` + +*** + +### The inadequacy of a non-highlighted being + +{line-numbers="1-2|3|4"} + +```js + let a = 1; +let b = 2; +let c = x => 1 + 2 + x; +c(3); ``` \ No newline at end of file diff --git a/fs/layered.go b/fs/layered.go new file mode 100644 index 0000000..1c37416 --- /dev/null +++ b/fs/layered.go @@ -0,0 +1,24 @@ +package fs + +import ( + "io/fs" + "os" +) + +type FS = fs.FS +type File = fs.File + +var Dir = os.DirFS + +type Layered struct { + Layers []FS +} + +func (l Layered) Open(name string) (file fs.File, err error) { + for idx := range l.Layers { + if file, err = l.Layers[idx].Open(name); err == nil { + return file, nil + } + } + return nil, err +} diff --git a/fs/watching_fs.go b/fs/watching_fs.go new file mode 100644 index 0000000..d04a776 --- /dev/null +++ b/fs/watching_fs.go @@ -0,0 +1,66 @@ +package fs + +import ( + "io/fs" + "path/filepath" + "time" + + "github.com/fsnotify/fsnotify" + log "github.com/sirupsen/logrus" +) + +type Event struct { + File string + Timestamp time.Time +} + +func NewWatching(backing FS) (*Watching, error) { + watcher, err := fsnotify.NewWatcher() + if err != nil { + return nil, err + } + return &Watching{ + watcher: watcher, + backing: backing, + }, nil +} + +type Watching struct { + events chan Event + watcher *fsnotify.Watcher + backing FS +} + +func (w *Watching) Open(name string) (file fs.File, err error) { + file, err = w.backing.Open(name) + if err == nil { + dir := filepath.Dir(name) + if watchErr := w.watcher.Add(dir); watchErr != nil { + log.Errorf("Failed to watch %s: %v", dir, watchErr) + } + return file, nil + } + return nil, err +} + +func (w *Watching) Events() chan Event { + if w.events == nil { + w.events = make(chan Event) + go transportEvents(w.watcher.Events, w.events) + } + return w.events +} + +func (w *Watching) Close() error { + return w.watcher.Close() +} + +func transportEvents(in <-chan fsnotify.Event, out chan<- Event) { + for ev := range in { + ev.Name = filepath.Base(ev.Name) + out <- Event{ + File: ev.Name, + Timestamp: time.Now(), + } + } +} diff --git a/go.mod b/go.mod index 8f5da87..2669311 100644 --- a/go.mod +++ b/go.mod @@ -4,27 +4,29 @@ go 1.17 require ( github.com/Masterminds/sprig/v3 v3.2.2 - github.com/bmatcuk/doublestar/v2 v2.0.4 github.com/fsnotify/fsnotify v1.5.1 - github.com/imdario/mergo v0.3.12 + github.com/gofiber/fiber/v2 v2.22.0 + github.com/gofiber/template v1.6.19 + github.com/gomarkdown/markdown v0.0.0-20211203165214-0d698b49fbb4 + github.com/google/uuid v1.3.0 github.com/mitchellh/go-homedir v1.1.0 github.com/sirupsen/logrus v1.8.1 - github.com/spf13/cobra v1.2.1 - github.com/spf13/viper v1.9.0 - go.uber.org/multierr v1.7.0 + github.com/spf13/cobra v1.3.0 + github.com/spf13/viper v1.10.1 ) require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.1.1 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/andybalholm/brotli v1.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.11 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/kr/pretty v0.3.0 // indirect + github.com/klauspost/compress v1.13.4 // indirect github.com/magiconair/properties v1.8.5 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/mapstructure v1.4.2 // indirect + github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/shopspring/decimal v1.2.0 // indirect @@ -33,10 +35,14 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.2.0 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.31.0 // indirect + github.com/valyala/tcplisten v1.0.0 // indirect go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.7.0 // indirect golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect - golang.org/x/sys v0.0.0-20211111213525-f221eed1c01e // indirect + golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d // indirect golang.org/x/text v0.3.7 // indirect - gopkg.in/ini.v1 v1.63.2 // indirect + gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index aea74cc..133d9da 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,10 @@ cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSU cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -32,7 +36,7 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -45,6 +49,12 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= 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/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= +github.com/CloudyKit/jet/v6 v6.1.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/Joker/hpp v0.0.0-20180418125244-6893e659854a/go.mod h1:MzD2WMdSxvbHw5fM/OXOFily/lipJWRc9C1px0Mt0ZE= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/Joker/jade v1.0.0/go.mod h1:efZIdO0py/LtcJRSa/j2WEklMSAw84WV0zZVMxNToB8= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= @@ -52,32 +62,55 @@ github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0 github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +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/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E= +github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= 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-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aymerick/raymond v2.0.2+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= +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/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/bmatcuk/doublestar/v2 v2.0.4 h1:6I6oUiT/sU27eE2OFcWqBhL1SwjyvQuOssxT4a1yidI= -github.com/bmatcuk/doublestar/v2 v2.0.4/go.mod h1:QMmcs3H2AUQICWhfzLXz+IYln8lRQmTZRptLie8RgRw= +github.com/cbroglie/mustache v1.3.0/go.mod h1:w58RIHjw/L7DPyRX2CcCTduNmcP1dvztaHP72ciSfh0= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -85,9 +118,14 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= @@ -95,12 +133,23 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofiber/fiber/v2 v2.22.0 h1:+iyKK4ooDH6z0lAHdaWO1AFIB/DZ9AVo6vz8VZIA0EU= +github.com/gofiber/fiber/v2 v2.22.0/go.mod h1:MR1usVH3JHYRyQwMe2eZXRSZHRX38fkV+A7CPB+DlDQ= +github.com/gofiber/template v1.6.19 h1:Qc2oePYcfG0QTp9MKJA+ivVC2lXVdqY6Ue7gZMU3PQU= +github.com/gofiber/template v1.6.19/go.mod h1:EO3L5FvrKkU8JtmINciPNwWIeA0cmzjdb6n/pdmypIM= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -128,6 +177,8 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomarkdown/markdown v0.0.0-20211203165214-0d698b49fbb4 h1:hue2D68UuAO4besRdtrQ+/i2npAF2WMbCMU5MLhYmOo= +github.com/gomarkdown/markdown v0.0.0-20211203165214-0d698b49fbb4/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= 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= @@ -169,19 +220,25 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.1/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-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= @@ -191,52 +248,69 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b 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/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/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/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/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.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s= +github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-slim v0.0.0-20200618151855-bde33eecb5ee/go.mod h1:ma9TUJeni8LGZMJvOwbAv/FOwiwqIMQN570LnpqCBSM= +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/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= @@ -251,56 +325,79 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu 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/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo= -github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= 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/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +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/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= 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/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/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/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= 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 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= 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/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk= -github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= +github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= +github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= 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= @@ -310,14 +407,25 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.31.0 h1:lrauRLII19afgCs2fnWRJ4M5IkV0lo2FqA61uGkNBfE= +github.com/valyala/fasthttp v1.31.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -333,6 +441,7 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +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= @@ -342,6 +451,7 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -380,17 +490,21 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= 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-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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-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-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -417,7 +531,10 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -434,6 +551,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= 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= @@ -447,11 +566,14 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ 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-20181026203630-95b1ffbd15a5/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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -487,6 +609,7 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -500,9 +623,15 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211111213525-f221eed1c01e h1:zeJt6jBtVDK23XK9QXcmG0FvO0elikp0dYZQZOeL1y0= -golang.org/x/sys v0.0.0-20211111213525-f221eed1c01e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d h1:1oIt9o40TWWI9FUaveVpUvBe13FNqBNVXy3ue2fcfkw= +golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -604,7 +733,12 @@ google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtuk google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -664,6 +798,17 @@ google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKr google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -689,6 +834,8 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -703,16 +850,21 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c= -gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +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.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/internal/app/cmd/root.go b/internal/app/cmd/root.go deleted file mode 100644 index c4199df..0000000 --- a/internal/app/cmd/root.go +++ /dev/null @@ -1,132 +0,0 @@ -// Copyright © 2019 Peter Kurfer -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package cmd - -import ( - "fmt" - "os" - "path/filepath" - - "github.com/fsnotify/fsnotify" - - "github.com/baez90/goveal/internal/app/rendering" - - "github.com/mitchellh/go-homedir" - log "github.com/sirupsen/logrus" - "github.com/spf13/cobra" - "github.com/spf13/viper" -) - -var ( - cfgFile string - workingDir string - rootCmd = &cobra.Command{ - Use: "goveal", - Short: "goveal is a small reveal.js server", - Long: `goveal is a single static binary to host your reveal.js based markdown presentation. -It is running a small web server that loads your markdown file, renders a complete HTML page and delivers it including all the reveal.js assets. -It is not required to restart the server when you edit the markdown - a simple reload of the page is doing all the required magic.`, - } - params rendering.RevealParams -) - -// Execute adds all child commands to the root command and sets flags appropriately. -// This is called by main.main(). It only needs to happen once to the rootCmd. -func Execute() { - if err := rootCmd.Execute(); err != nil { - fmt.Println(err) - os.Exit(1) - } -} - -func init() { - cobra.OnInitialize(initLogging) - cobra.OnInitialize(initConfig) - - var err error - workingDir, err = os.Getwd() - if err != nil { - fmt.Println(err) - os.Exit(1) - } - - rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.go-reveal-slides.yaml)") - rootCmd.PersistentFlags().StringVar(&workingDir, "working-dir", workingDir, "working directory to use") -} - -func initLogging() { - log.SetFormatter(&log.TextFormatter{ - ForceColors: true, - }) -} - -// initConfig reads in config file and ENV variables if set. -func initConfig() { - var err error - if workingDir, err = filepath.Abs(workingDir); err != nil { - log.Warnf("Failed to determine absolute path for working dir %s: %v", workingDir, err) - return - } - - var cwd string - if cwd, err = os.Getwd(); err != nil { - log.Warnf("Failed to determine current working directory") - return - } - - if cwd != workingDir { - if err = os.Chdir(workingDir); err != nil { - log.Warnf("Failed to change working directory to %s", workingDir) - } - } - - if cfgFile != "" { - // Use config file from the flag. - viper.SetConfigFile(cfgFile) - } else { - // Find home directory. - home, err := homedir.Dir() - if err != nil { - log.Infof("Failed to determine home directory: %v", err) - } else { - viper.AddConfigPath(home) - } - - viper.AddConfigPath(workingDir) - viper.SetConfigName("goveal") - viper.SetConfigType("yaml") - } - - viper.AutomaticEnv() // read in environment variables that match - - // If a config file is found, read it in. - if err := viper.ReadInConfig(); err == nil { - log.Info("Using config file:", viper.ConfigFileUsed()) - - log.Info("Starting to watch config file...") - viper.WatchConfig() - viper.OnConfigChange(func(in fsnotify.Event) { - log.Info("Noticed configuration change...") - if err := params.Load(); err != nil { - log.Warnf("Failed to load config: %v", err) - } - }) - } - - params.WorkingDirectory = workingDir - if err := params.Load(); err != nil { - log.Warnf("Failed to load config: %v", err) - } -} diff --git a/internal/app/cmd/serve.go b/internal/app/cmd/serve.go deleted file mode 100644 index aa180d4..0000000 --- a/internal/app/cmd/serve.go +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright © 2019 Peter Kurfer peter.kurfer@googlemail.com -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package cmd - -import ( - "errors" - "fmt" - "net/http" - "os/exec" - "runtime" - - "github.com/spf13/cobra" - - "github.com/baez90/goveal/internal/app/server" - - log "github.com/sirupsen/logrus" -) - -var ( - host string - port uint16 - openBrowser bool - serveCmd = &cobra.Command{ - Use: "serve", - Args: cobra.ExactArgs(1), - Short: "", - Long: ``, - RunE: func(cmd *cobra.Command, args []string) (err error) { - var srv *server.HTTPServer - srv, err = server.NewHTTPServer(server.Config{ - Host: host, - Port: port, - MarkdownPath: args[0], - RevealParams: ¶ms, - }) - - if err != nil { - log.Errorf("Error while setting up server: %v", err) - return - } - - listenUrl := fmt.Sprintf("http://%s/", srv.ListenAddress()) - log.Infof("Going to listen on %s", listenUrl) - - if openBrowser { - log.Info("Opening browser...") - openBrowserInBackground(listenUrl) - } - - if err = srv.Serve(); err != nil && !errors.Is(err, http.ErrServerClosed) { - log.Errorf("Error while running serve command: %v", err) - } - return nil - }, - } -) - -func init() { - rootCmd.AddCommand(serveCmd) - - serveCmd.Flags().StringVar(&host, "host", "localhost", "host the CLI should listen on") - serveCmd.Flags().Uint16Var(&port, "port", 2233, "port the CLI should listen on") - serveCmd.Flags().BoolVar(&openBrowser, "open-browser", true, "if the browser should be opened at the URL") -} - -func openBrowserInBackground(url string) { - var err error - - switch runtime.GOOS { - case "linux": - err = exec.Command("xdg-open", url).Start() - case "windows": - err = exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start() - case "darwin": - err = exec.Command("open", url).Start() - default: - err = fmt.Errorf("unsupported platform") - } - if err != nil { - log.Warn(err) - } -} diff --git a/internal/app/rendering/reveal_params.go b/internal/app/rendering/reveal_params.go deleted file mode 100644 index 4d41987..0000000 --- a/internal/app/rendering/reveal_params.go +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright © 2019 Peter Kurfer peter.kurfer@googlemail.com -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package rendering - -import ( - "path" - "path/filepath" - - "github.com/bmatcuk/doublestar/v2" - "github.com/imdario/mergo" - "github.com/spf13/viper" - - "github.com/baez90/goveal/internal/encoding" -) - -var defaultParams = RevealParams{ - Theme: "white", - CodeTheme: "vs", - Transition: "None", - NavigationMode: "default", - HorizontalSeparator: "===", - VerticalSeparator: "---", - SlideNumberVisibility: "all", - SlideNumberFormat: "h.v", - StyleSheets: make([]string, 0), - FilesToMonitor: make([]string, 0), -} - -type RevealParams struct { - Theme string `mapstructure:"theme"` - CodeTheme string `mapstructure:"codeTheme"` - Transition string `mapstructure:"transition"` - NavigationMode string `mapstructure:"navigationMode"` - HorizontalSeparator string `mapstructure:"horizontalSeparator"` - VerticalSeparator string `mapstructure:"verticalSeparator"` - SlideNumberVisibility string `mapstructure:"slideNumberVisibility"` - SlideNumberFormat string `mapstructure:"slideNumberFormat"` - StyleSheets []string `mapstructure:"stylesheets"` - FilesToMonitor []string `mapstructure:"filesToMonitor"` - WorkingDirectory string `mapstructure:"working-dir"` - LineEnding encoding.LineEnding `mapstructure:"-"` -} - -func (params *RevealParams) Load() error { - _ = viper.Unmarshal(params) - expandGlobs(params) - return mergo.Merge(params, &defaultParams) -} - -func expandGlobs(params *RevealParams) { - var allFiles []string - - for _, f := range params.FilesToMonitor { - var err error - - f, err = filepath.Abs(f) - if err != nil { - continue - } - - var matches []string - if matches, err = doublestar.Glob(f); err != nil { - continue - } - - for idx := range matches { - if relative, err := filepath.Rel(params.WorkingDirectory, matches[idx]); err != nil { - continue - } else { - matches[idx] = path.Join("/", relative) - } - } - - allFiles = append(allFiles, matches...) - } - params.FilesToMonitor = allFiles -} diff --git a/internal/app/rendering/template.go b/internal/app/rendering/template.go deleted file mode 100644 index 5cfe3be..0000000 --- a/internal/app/rendering/template.go +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright © 2019 Peter Kurfer peter.kurfer@googlemail.com -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package rendering - -import ( - "html/template" - "net/http" - - "github.com/Masterminds/sprig/v3" - log "github.com/sirupsen/logrus" - - "github.com/baez90/goveal/assets" -) - -type RevealRenderer interface { - http.Handler - init() error -} - -func NewRevealRenderer(params *RevealParams) (renderer RevealRenderer, err error) { - renderer = &revealRenderer{ - params: params, - } - err = renderer.init() - - return -} - -type revealRenderer struct { - template *template.Template - params *RevealParams -} - -func (renderer *revealRenderer) init() (err error) { - renderer.template, err = template.New("index").Funcs(sprig.FuncMap()).Parse(string(assets.Template)) - return -} - -func (renderer *revealRenderer) ServeHTTP(response http.ResponseWriter, _ *http.Request) { - if renderer.template == nil { - writeErrorResponse(500, "rendering is not set - probably error during startup", response) - return - } - - err := renderer.template.Execute(response, struct { - Reveal RevealParams - }{Reveal: *renderer.params}) - if err != nil { - writeErrorResponse(500, "Failed to render Markdown to rendering", response) - log.Errorf("Failed to render Markdown rendering: %v", err) - } -} - -func writeErrorResponse(code int, msg string, response http.ResponseWriter) { - response.WriteHeader(code) - _, err := response.Write([]byte(msg)) - log.Errorf("Failed to write error reponse: %v", err) -} diff --git a/internal/app/routing/layered_fs.go b/internal/app/routing/layered_fs.go deleted file mode 100644 index ed22005..0000000 --- a/internal/app/routing/layered_fs.go +++ /dev/null @@ -1,47 +0,0 @@ -package routing - -import ( - "errors" - "net/http" - "sync" -) - -var ErrFileNotFound = errors.New("file not found in any layer") - -func NewLayeredFileSystem(layers ...http.FileSystem) http.FileSystem { - return &layeredFileSystem{ - resolveCache: make(map[string]http.FileSystem), - layers: layers, - } -} - -type layeredFileSystem struct { - layers []http.FileSystem - resolveCache map[string]http.FileSystem - lock sync.Mutex -} - -func (l *layeredFileSystem) Open(name string) (f http.File, err error) { - if cachedLayer, isCached := l.resolveCache[name]; isCached { - if cachedLayer != nil { - return cachedLayer.Open(name) - } else { - return nil, ErrFileNotFound - } - } - - for idx := range l.layers { - layer := l.layers[idx] - if f, err = layer.Open(name); err == nil { - l.lock.Lock() - l.resolveCache[name] = layer - l.lock.Unlock() - return - } - } - - l.lock.Lock() - l.resolveCache[name] = nil - l.lock.Unlock() - return nil, ErrFileNotFound -} diff --git a/internal/app/routing/markdown_fs.go b/internal/app/routing/markdown_fs.go deleted file mode 100644 index a4c6388..0000000 --- a/internal/app/routing/markdown_fs.go +++ /dev/null @@ -1,33 +0,0 @@ -package routing - -import ( - "fmt" - "net/http" - "os" - "path/filepath" -) - -type markdownFs struct { - destinationPath string -} - -func NewMarkdownFS(path string) (fs http.FileSystem, err error) { - var info os.FileInfo - info, err = os.Stat(path) - if err != nil { - return - } - - if info.IsDir() || filepath.Ext(info.Name()) != ".md" { - err = fmt.Errorf("path %s did not pass sanity checks for markdown files", path) - return - } - - return &markdownFs{ - destinationPath: path, - }, nil -} - -func (m markdownFs) Open(_ string) (http.File, error) { - return os.Open(m.destinationPath) -} diff --git a/internal/app/routing/no_cache_handler.go b/internal/app/routing/no_cache_handler.go deleted file mode 100644 index 6360e7b..0000000 --- a/internal/app/routing/no_cache_handler.go +++ /dev/null @@ -1,56 +0,0 @@ -package routing - -import ( - "net/http" - "strings" - "time" -) - -var epoch = time.Unix(0, 0).Format(time.RFC1123) - -var noCacheHeaders = map[string]string{ - "Expires": epoch, - "Cache-Control": "no-cache, private, max-age=0", - "Pragma": "no-cache", - "X-Accel-Expires": "0", -} - -var etagHeaders = []string{ - "ETag", - "If-Modified-Since", - "If-Match", - "If-None-Match", - "If-Range", - "If-Unmodified-Since", -} - -func NoCache(h http.Handler, pathsToDisableCache []string) http.Handler { - pathLookup := make(map[string]bool) - - for idx := range pathsToDisableCache { - pathLookup[strings.ToLower(pathsToDisableCache[idx])] = true - } - - fn := func(w http.ResponseWriter, r *http.Request) { - if _, shouldBeHandled := pathLookup[strings.ToLower(r.URL.Path)]; !shouldBeHandled { - h.ServeHTTP(w, r) - return - } - - // Delete any ETag headers that may have been set - for _, v := range etagHeaders { - if r.Header.Get(v) != "" { - r.Header.Del(v) - } - } - - // Set our NoCache headers - for k, v := range noCacheHeaders { - w.Header().Set(k, v) - } - - h.ServeHTTP(w, r) - } - - return http.HandlerFunc(fn) -} diff --git a/internal/app/routing/regexp_router.go b/internal/app/routing/regexp_router.go deleted file mode 100644 index 63f3b79..0000000 --- a/internal/app/routing/regexp_router.go +++ /dev/null @@ -1,38 +0,0 @@ -package routing - -import ( - "net/http" - "regexp" -) - -type regexpRule struct { - pattern *regexp.Regexp - handler http.Handler -} - -type RegexpRouter struct { - rules []regexpRule -} - -func (r *RegexpRouter) AddRule(pattern string, handler http.Handler) (err error) { - var exp *regexp.Regexp - if exp, err = regexp.Compile(pattern); err != nil { - return - } - r.rules = append(r.rules, regexpRule{ - pattern: exp, - handler: handler, - }) - return -} - -func (r *RegexpRouter) ServeHTTP(writer http.ResponseWriter, request *http.Request) { - for idx := range r.rules { - rule := r.rules[idx] - if rule.pattern.MatchString(request.URL.Path) { - rule.handler.ServeHTTP(writer, request) - return - } - } - writer.WriteHeader(404) -} diff --git a/internal/app/server/hash_handler.go b/internal/app/server/hash_handler.go deleted file mode 100644 index 2ff6f4e..0000000 --- a/internal/app/server/hash_handler.go +++ /dev/null @@ -1,103 +0,0 @@ -package server - -import ( - "crypto" - "encoding/hex" - "encoding/json" - "hash" - "io" - "net/http" - "regexp" - "strings" - "sync" - - log "github.com/sirupsen/logrus" - "go.uber.org/multierr" -) - -var ( - pathMatcherRegexp = regexp.MustCompile(`(?i)^/hash/(md5|sha1|sha2)(/.*)`) - hashes = map[string]crypto.Hash{ - "md5": crypto.MD5, - "sha1": crypto.SHA1, - "sha256": crypto.SHA256, - } -) - -type hashResponse struct { - FilePath string - Hash string -} - -func NewHashHandler(fs http.FileSystem) http.Handler { - return &hashHandler{ - fs: fs, - bufferPool: &sync.Pool{ - New: func() interface{} { - return make([]byte, 4096) - }, - }, - } -} - -type hashHandler struct { - bufferPool *sync.Pool - fs http.FileSystem -} - -func (h hashHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) { - components := pathMatcherRegexp.FindStringSubmatch(request.URL.Path) - if len(components) != 3 { - writer.WriteHeader(400) - return - } - - filePath := components[2] - - var hashFound bool - var hashInstance crypto.Hash - if hashInstance, hashFound = hashes[strings.ToLower(components[1])]; !hashFound { - writer.WriteHeader(404) - return - } - var f http.File - var err error - if f, err = h.fs.Open(filePath); err != nil { - writer.WriteHeader(404) - return - } - - var encodedHash string - if encodedHash, err = h.buildHash(hashInstance.New(), f); err != nil { - log.Errorf("Failed to calculate hash %v", err) - writer.WriteHeader(500) - return - } - - resp := hashResponse{ - FilePath: filePath, - Hash: encodedHash, - } - - writer.Header().Set("Content-Type", "application/json") - encoder := json.NewEncoder(writer) - if err = encoder.Encode(resp); err != nil { - writer.WriteHeader(500) - return - } -} - -func (h *hashHandler) buildHash(hasher hash.Hash, src io.ReadCloser) (encodedHash string, err error) { - defer func() { - err = multierr.Append(err, src.Close()) - }() - - buffer := h.bufferPool.Get().([]byte) - for n, err := src.Read(buffer); n > 0 && err == nil; n, err = src.Read(buffer) { - if _, err := hasher.Write(buffer[:n]); err != nil { - return "", err - } - } - encodedHash = hex.EncodeToString(hasher.Sum(nil)) - return -} diff --git a/internal/app/server/http_server.go b/internal/app/server/http_server.go deleted file mode 100644 index 9637c92..0000000 --- a/internal/app/server/http_server.go +++ /dev/null @@ -1,118 +0,0 @@ -package server - -import ( - "fmt" - "io/fs" - "net" - "net/http" - "os" - - "github.com/baez90/goveal/assets" - "github.com/baez90/goveal/internal/app/rendering" - "github.com/baez90/goveal/internal/app/routing" - "github.com/baez90/goveal/internal/encoding" -) - -const ( - markdownFilePath = "/content.md" -) - -type ( - Config struct { - Host string - Port uint16 - MarkdownPath string - RevealParams *rendering.RevealParams - } - - HTTPServer struct { - listener net.Listener - handler http.Handler - } -) - -func (srv HTTPServer) Serve() error { - return http.Serve(srv.listener, srv.handler) -} - -func (srv HTTPServer) ListenAddress() string { - return srv.listener.Addr().String() -} - -func NewHTTPServer(config Config) (srv *HTTPServer, err error) { - noCacheFiles := append(config.RevealParams.FilesToMonitor, markdownFilePath) - if err := detectMarkdownFileEnding(config.MarkdownPath, config.RevealParams); err != nil { - return nil, err - } - - router := &routing.RegexpRouter{} - var tmplRenderer rendering.RevealRenderer - if tmplRenderer, err = rendering.NewRevealRenderer(config.RevealParams); err != nil { - err = fmt.Errorf("failed to initialize reveal renderer %w", err) - return - } - - // language=regexp - if err = router.AddRule(`^(/(index.html(l)?)?)?$`, tmplRenderer); err != nil { - return - } - - var mdFS http.FileSystem - if mdFS, err = routing.NewMarkdownFS(config.MarkdownPath); err != nil { - err = fmt.Errorf("failed to initialize markdown file handler %w", err) - return - } - - var revealFS, webFS fs.FS - if revealFS, err = fs.Sub(assets.Assets, "reveal"); err != nil { - return nil, err - } - - if webFS, err = fs.Sub(assets.Assets, "web"); err != nil { - return nil, err - } - - layeredFS := routing.NewLayeredFileSystem(http.FS(revealFS), http.FS(webFS), http.Dir("."), mdFS) - - // language=regexp - if err = router.AddRule(`^(?i)/hash/(md5|sha1|sha2)/.*`, NewHashHandler(layeredFS)); err != nil { - return - } - // language=regexp - if err = router.AddRule("^/.*\\.md$", http.FileServer(mdFS)); err != nil { - return - } - // language=regexp - if err = router.AddRule("/.+", http.FileServer(layeredFS)); err != nil { - return - } - - hostPort := fmt.Sprintf("%s:%d", config.Host, config.Port) - - srv = &HTTPServer{ - handler: routing.NoCache(router, noCacheFiles), - } - - if srv.listener, err = net.Listen("tcp", hostPort); err != nil { - return - } - - return -} - -func detectMarkdownFileEnding(filePath string, params *rendering.RevealParams) error { - f, err := os.Open(filePath) - if err != nil { - return err - } - defer func() { - _ = f.Close() - }() - - if le, err := encoding.Detect(f); err != nil { - return err - } else { - params.LineEnding = le - } - return nil -} diff --git a/internal/encoding/line_ending.go b/internal/encoding/line_ending.go deleted file mode 100644 index be165c6..0000000 --- a/internal/encoding/line_ending.go +++ /dev/null @@ -1,44 +0,0 @@ -package encoding - -import ( - "bufio" - "io" -) - -const ( - LineEndingUnknown LineEnding = "" - LineEndingWindows LineEnding = "\r\n" - LineEndingUnix LineEnding = "\n" -) - -type LineEnding string - -func (e LineEnding) String() string { - return string(e) -} - -func (e LineEnding) Escaped() string { - switch e { - case LineEndingUnix: - return "\\n" - case LineEndingWindows: - return "\\r\\n" - default: - return "" - } -} - -func Detect(reader io.Reader) (LineEnding, error) { - bufferedReader := bufio.NewReader(reader) - line, err := bufferedReader.ReadString(byte('\n')) - if err != nil { - return LineEndingUnknown, err - } - - lineLength := len(line) - if lineLength <= 1 || line[lineLength-2:] != LineEndingWindows.String() { - return LineEndingUnix, nil - } - - return LineEndingWindows, nil -} diff --git a/internal/encoding/line_ending_test.go b/internal/encoding/line_ending_test.go deleted file mode 100644 index e92dc95..0000000 --- a/internal/encoding/line_ending_test.go +++ /dev/null @@ -1,74 +0,0 @@ -package encoding_test - -import ( - "io" - "strings" - "testing" - - "github.com/baez90/goveal/internal/encoding" -) - -func TestDetect(t *testing.T) { - type args struct { - reader io.Reader - } - tests := []struct { - name string - args args - want encoding.LineEnding - wantErr bool - }{ - { - name: "Empty file expect unknown", - args: args{ - reader: strings.NewReader(""), - }, - want: encoding.LineEndingUnknown, - wantErr: true, - }, - { - name: "File with only Unix line ending", - args: args{ - reader: strings.NewReader("\n"), - }, - want: encoding.LineEndingUnix, - wantErr: false, - }, - { - name: "File with only Windows line ending", - args: args{ - reader: strings.NewReader("\r\n"), - }, - want: encoding.LineEndingWindows, - wantErr: false, - }, - { - name: "File with multiple lines - Unix file ending", - args: args{ - reader: strings.NewReader("Hello, World\nThis comes from Unix!\n"), - }, - want: encoding.LineEndingUnix, - wantErr: false, - }, - { - name: "File with multiple lines - Windows file ending", - args: args{ - reader: strings.NewReader("Hello, World\r\nThis comes from Windows!\r\n"), - }, - want: encoding.LineEndingWindows, - wantErr: false, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - got, err := encoding.Detect(tt.args.reader) - if (err != nil) != tt.wantErr { - t.Errorf("Detect() error = %v, wantErr %v", err, tt.wantErr) - return - } - if got != tt.want { - t.Errorf("Detect() got = %v, want %v", got, tt.want) - } - }) - } -} diff --git a/rendering/render_to_reveal.go b/rendering/render_to_reveal.go new file mode 100644 index 0000000..83e4259 --- /dev/null +++ b/rendering/render_to_reveal.go @@ -0,0 +1,232 @@ +package rendering + +import ( + "bytes" + "embed" + "encoding/hex" + "hash" + "html" + "html/template" + "io" + "path" + "regexp" + "sync" + + "github.com/Masterminds/sprig/v3" + "github.com/gomarkdown/markdown/ast" +) + +var ( + //go:embed templates/*.gohtml + templatesFS embed.FS + templates *template.Template + templateRenderBufferPool = &sync.Pool{ + New: func() interface{} { + return new(bytes.Buffer) + }, + } + htmlElementAttributesRegexp = regexp.MustCompile(`(?P[a-z]+(-[a-z]+)*)="(?P.+)"`) + notesRegexp = regexp.MustCompile(`^(?i)notes?`) +) + +const ( + mermaidCodeBlock = "mermaid" +) + +func init() { + var err error + templates = template.New("rendering").Funcs(sprig.FuncMap()) + if templates, err = templates.ParseFS(templatesFS, "templates/*.gohtml"); err != nil { + panic(err) + } +} + +type RevealRenderer struct { + StateMachine *StateMachine + Hash hash.Hash + hasNotes bool +} + +func (r *RevealRenderer) RenderHook(w io.Writer, node ast.Node, entering bool) (ast.WalkStatus, bool) { + switch b := node.(type) { + case *ast.Document: + if entering { + _, _ = w.Write([]byte("
\n")) + if next := peekNextRuler(b); next != nil && string(next.Literal) == "***" { + _, _ = w.Write([]byte("
\n")) + r.StateMachine.CurrentState = StateTypeNested + } + } else { + _, _ = w.Write([]byte("
\n")) + } + return ast.GoToNext, false + case *ast.ListItem: + if entering { + return r.handleListItem(w, b) + } + return ast.GoToNext, false + case *ast.Text: + if !entering { + return ast.GoToNext, false + } + if notesRegexp.Match(b.Literal) { + _, err := w.Write([]byte(``)) + r.hasNotes = false + } + _, _ = w.Write(r.StateMachine.Accept(input)) + return ast.GoToNext, true + case *ast.Image: + if entering { + return r.handleImage(w, b) + } + return ast.GoToNext, false + default: + return ast.GoToNext, false + } +} + +func (r *RevealRenderer) handleCodeBlock(w io.Writer, code *ast.CodeBlock) (ast.WalkStatus, bool) { + code.Info = bytes.ToLower(code.Info) + switch string(code.Info) { + case mermaidCodeBlock: + output, err := renderCodeTemplate("mermaid.gohtml", code) + if err != nil { + return ast.GoToNext, false + } + _, err = w.Write(output) + return ast.GoToNext, err == nil + default: + output, err := renderCodeTemplate("any-code.gohtml", code) + if err != nil { + return ast.GoToNext, false + } + _, err = w.Write(output) + return ast.GoToNext, err == nil + } +} + +func (r *RevealRenderer) handleListItem(w io.Writer, listItem *ast.ListItem) (ast.WalkStatus, bool) { + for _, child := range listItem.Children { + if p, ok := child.(*ast.Paragraph); ok { + if len(p.Children) == 0 { + return ast.GoToNext, false + } + + data := map[string]interface{}{ + "Attributes": getAttributesFromChildSpan(p), + } + + if rendered, err := renderTemplate("listItem.gohtml", data); err != nil { + return ast.GoToNext, false + } else if _, err = w.Write(rendered); err != nil { + return ast.GoToNext, false + } + + return ast.GoToNext, true + } + } + return ast.GoToNext, false +} + +func (r *RevealRenderer) handleImage(w io.Writer, img *ast.Image) (ast.WalkStatus, bool) { + var title string + if len(img.Children) >= 1 { + if txt, ok := img.Children[0].(*ast.Text); ok { + title = string(txt.Literal) + } + } + + data := map[string]interface{}{ + "ID": hex.EncodeToString(r.Hash.Sum([]byte(path.Base(string(img.Destination))))), + "Attributes": getAttributesFromChildSpan(img.GetParent()), + "ImageSource": string(img.Destination), + "AlternativeText": html.EscapeString(title), + } + + if rendered, err := renderTemplate("image.gohtml", data); err != nil { + return ast.GoToNext, false + } else if _, err = w.Write(rendered); err != nil { + return ast.GoToNext, false + } + + return ast.SkipChildren, true +} + +func getAttributesFromChildSpan(node ast.Node) []template.HTMLAttr { + if getChildren, ok := node.(interface{ GetChildren() []ast.Node }); ok { + childs := getChildren.GetChildren() + if len(childs) == 0 { + return nil + } + for idx := range childs { + if span, ok := childs[idx].(*ast.HTMLSpan); ok { + return extractElementAttributes(span) + } + } + } + return nil +} + +func extractElementAttributes(htmlSpan *ast.HTMLSpan) (attrs []template.HTMLAttr) { + htmlComment := string(htmlSpan.Literal) + if htmlComment == "" { + return nil + } + matches := htmlElementAttributesRegexp.FindAllStringSubmatch(htmlComment, -1) + attrs = make([]template.HTMLAttr, 0, len(matches)) + for idx := range matches { + if len(matches[idx]) != 4 { + continue + } + + //nolint:gosec // it's the user's responsibility to not skrew this up here + attrs = append(attrs, template.HTMLAttr(matches[idx][0])) + } + + return attrs +} + +func renderCodeTemplate(templateName string, codeBlock *ast.CodeBlock) (output []byte, err error) { + data := map[string]interface{}{ + //nolint:gosec // need to embed the code in original format without escaping + "Code": template.HTML(codeBlock.Literal), + "LineNumbers": lineNumbers(codeBlock.Attribute), + } + + return renderTemplate(templateName, data) +} + +func renderTemplate(templateName string, data interface{}) (output []byte, err error) { + buffer := templateRenderBufferPool.Get().(*bytes.Buffer) + defer func() { + buffer.Reset() + templateRenderBufferPool.Put(buffer) + }() + + err = templates.ExecuteTemplate(buffer, templateName, data) + return buffer.Bytes(), err +} + +func lineNumbers(attrs *ast.Attribute) string { + if attrs == nil || attrs.Attrs == nil { + return "" + } + return string(attrs.Attrs["line-numbers"]) +} diff --git a/rendering/state.go b/rendering/state.go new file mode 100644 index 0000000..a926b13 --- /dev/null +++ b/rendering/state.go @@ -0,0 +1,126 @@ +package rendering + +import ( + "fmt" + + "github.com/gomarkdown/markdown/ast" +) + +const ( + EventTypeHorizontalSplit EventType = iota + EventTypeVerticalSplit + EventTypeHorizontalEnd + EventTypeVerticalSplitEnd + EventTypeVerticalDocumentEnd + EventTypeVerticalVerticalSplit + + StateTypeRegular StateType = iota + StateTypeNested +) + +var ( + EventMapping = map[EventType][]byte{ + EventTypeHorizontalSplit: []byte(` +
+
`), + EventTypeVerticalSplit: []byte(` +
+
+
+`), + EventTypeHorizontalEnd: []byte(` +
+`), + EventTypeVerticalSplitEnd: []byte(` +
+ +
`), + EventTypeVerticalDocumentEnd: []byte(` +
+ +`), + EventTypeVerticalVerticalSplit: []byte(` + + +
+
`), + } +) + +func NewStateMachine(verticalSplit, horizontalSplit string) *StateMachine { + return &StateMachine{ + CurrentState: StateTypeRegular, + States: map[StateType]State{ + StateTypeRegular: { + Transitions: map[string]TransitionResult{ + horizontalSplit: {EventTypeHorizontalSplit, StateTypeRegular}, + fmt.Sprintf("%s%s", horizontalSplit, horizontalSplit): {EventTypeHorizontalSplit, StateTypeRegular}, + fmt.Sprintf("%s%s", horizontalSplit, verticalSplit): {EventTypeVerticalSplit, StateTypeNested}, + fmt.Sprintf("%s%s", verticalSplit, horizontalSplit): {EventTypeVerticalSplit, StateTypeNested}, + "": {EventTypeHorizontalEnd, StateTypeRegular}, + }, + }, + StateTypeNested: { + Transitions: map[string]TransitionResult{ + fmt.Sprintf("%s%s", verticalSplit, verticalSplit): {EventTypeHorizontalSplit, StateTypeNested}, + verticalSplit: {EventTypeHorizontalSplit, StateTypeNested}, + fmt.Sprintf("%s%s", verticalSplit, horizontalSplit): {EventTypeVerticalSplitEnd, StateTypeNested}, + horizontalSplit: {EventTypeVerticalSplitEnd, StateTypeRegular}, + fmt.Sprintf("%s%s", horizontalSplit, verticalSplit): {EventTypeVerticalVerticalSplit, StateTypeNested}, + fmt.Sprintf("%s%s", horizontalSplit, horizontalSplit): {EventTypeVerticalSplitEnd, StateTypeRegular}, + "": {EventTypeVerticalDocumentEnd, StateTypeRegular}, + }, + }, + }, + } +} + +type ( + EventType uint + StateType uint + TransitionResult struct { + EventType EventType + StateType StateType + } + State struct { + Transitions map[string]TransitionResult + } + StateMachine struct { + CurrentState StateType + States map[StateType]State + } +) + +func (m *StateMachine) Accept(input string) []byte { + if result, ok := m.States[m.CurrentState].Transitions[input]; ok { + m.CurrentState = result.StateType + return EventMapping[result.EventType] + } + return nil +} + +func peekNextRuler(node ast.Node) *ast.HorizontalRule { + if node.AsContainer() == nil { + node = node.GetParent() + } + + nodes := node.GetChildren() + if nodes == nil { + return nil + } + + var selfIdx int + for idx := range nodes { + if nodes[idx] == node { + selfIdx = idx + break + } + } + + for idx := selfIdx + 1; idx < len(nodes); idx++ { + if hr, ok := nodes[idx].(*ast.HorizontalRule); ok { + return hr + } + } + return nil +} diff --git a/rendering/templates/any-code.gohtml b/rendering/templates/any-code.gohtml new file mode 100644 index 0000000..27e37a4 --- /dev/null +++ b/rendering/templates/any-code.gohtml @@ -0,0 +1,6 @@ +

+    {{- .Code }}
+
\ No newline at end of file diff --git a/rendering/templates/image.gohtml b/rendering/templates/image.gohtml new file mode 100644 index 0000000..8699982 --- /dev/null +++ b/rendering/templates/image.gohtml @@ -0,0 +1,8 @@ +{{ .AlternativeText }} \ No newline at end of file diff --git a/rendering/templates/listItem.gohtml b/rendering/templates/listItem.gohtml new file mode 100644 index 0000000..e95d5a1 --- /dev/null +++ b/rendering/templates/listItem.gohtml @@ -0,0 +1,5 @@ +
  • \ No newline at end of file diff --git a/rendering/templates/mermaid.gohtml b/rendering/templates/mermaid.gohtml new file mode 100644 index 0000000..7f6228d --- /dev/null +++ b/rendering/templates/mermaid.gohtml @@ -0,0 +1,3 @@ +
    + {{ .Code -}} +
    \ No newline at end of file diff --git a/web/index.gohtml b/web/index.gohtml new file mode 100644 index 0000000..7ede00d --- /dev/null +++ b/web/index.gohtml @@ -0,0 +1,36 @@ + + + + + + + goveal + + + + + + + + {{ range .Rendering.Stylesheets}} + + {{ end }} + + + + +
    +
    +
    +
    + + + + + + + + + + + diff --git a/web/js/app.js b/web/js/app.js new file mode 100644 index 0000000..1614abe --- /dev/null +++ b/web/js/app.js @@ -0,0 +1,116 @@ +document.addEventListener("DOMContentLoaded", _ => { + Promise.all([initMermaid(), setSlidesContent()]) + .then(() => { + return initReveal() + }) + .then(() => { + subscribeToEvents() + console.info("finished initializing") + }) + +}); + +async function setSlidesContent() { + let resp = await fetch("/slides") + let contentText = await resp.text() + let parser = new DOMParser() + let contentDocument = parser.parseFromString(contentText, 'text/html') + for (let mermaidElem of contentDocument.getElementsByClassName("mermaid")) { + let insertSVG = (svgCode, _) => { + mermaidElem.innerHTML = svgCode + } + + mermaid.mermaidAPI.render('mermaid', mermaidElem.innerText, insertSVG) + } + document.getElementById("content-root").innerHTML = contentDocument.documentElement.innerHTML +} + +async function initReveal() { + let resp = await fetch('/api/v1/config/reveal') + let cfg = await resp.json() + Reveal.initialize({ + controls: cfg.controls, + progress: cfg.progress, + history: cfg.history, + center: cfg.center, + slideNumber: cfg.slideNumber, + transition: cfg.transition, + hash: true, + pdfSeparateFragments: false, + menu: { + numbers: cfg.menu.numbers, + useTextContentForMissingTitles: cfg.menu.useTextContentForMissingTitles, + custom: [ + { + title: 'Print', + icon: '', + content: 'Go to print view' + } + ], + themes: [ + {name: 'Beige', theme: '/reveal/dist/theme/beige.css'}, + {name: 'Black', theme: '/reveal/dist/theme/black.css'}, + {name: 'Blood', theme: '/reveal/dist/theme/blood.css'}, + {name: 'League', theme: '/reveal/dist/theme/league.css'}, + {name: 'Moon', theme: '/reveal/dist/theme/moon.css'}, + {name: 'Night', theme: '/reveal/dist/theme/night.css'}, + {name: 'Serif', theme: '/reveal/dist/theme/serif.css'}, + {name: 'Simple', theme: '/reveal/dist/theme/simple.css'}, + {name: 'Sky', theme: '/reveal/dist/theme/sky.css'}, + {name: 'Solarized', theme: '/reveal/dist/theme/solarized.css'}, + {name: 'White', theme: '/reveal/dist/theme/white.css'} + ], + transitions: true, + }, + plugins: [RevealHighlight, RevealNotes, RevealMenu] + }) +} + +async function initMermaid() { + let resp = await fetch('/api/v1/config/mermaid') + let cfg = await resp.json() + mermaid.parseError = (err, hash) => { + console.error(`Failed to parse Mermaid diagraph: ${err} - ${hash}`) + } + mermaid.initialize({ + startOnLoad: false, + theme: cfg.theme, + securityLevel: 'loose', + }); +} + +function subscribeToEvents() { + let source = new EventSource("/api/v1/events"); + + source.onopen = (() => { + console.log("eventsource connection open"); + }) + + source.onerror = (ev => { + if (ev.target.readyState === 0) { + console.log("reconnecting to eventsource"); + } else { + console.log("eventsource error", ev); + } + }) + + source.onmessage = (ev => { + let obj = JSON.parse(ev.data); + console.log(obj); + if (obj.forceReload) { + window.location.reload() + } else { + switch (true) { + case obj.file.endsWith(".css"): + let cssLink = document.querySelector(`link[rel=stylesheet][id="${obj.fileNameHash}"]`); + cssLink.href = `${obj.file}?ts=${obj.ts}` + break + default: + let elem = document.getElementById(obj.fileNameHash); + if (elem !== null) { + elem.src = `${obj.file}?ts=${obj.ts}` + } + } + } + }) +} \ No newline at end of file diff --git a/web/web.go b/web/web.go new file mode 100644 index 0000000..495868e --- /dev/null +++ b/web/web.go @@ -0,0 +1,6 @@ +package web + +import "embed" + +//go:embed js/* index.gohtml +var WebFS embed.FS From 3f847e0b8bf8c7d06e845d3a38373f2223043462 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 22 Dec 2021 20:19:05 +0100 Subject: [PATCH 02/16] Live update Reveal config --- cmd/goveal/serve.go | 4 +-- config/components.go | 30 +++++++++++++--------- events/event_hub.go | 60 +++++++++++++++++++++++--------------------- examples/goveal.yaml | 12 ++++++++- web/js/app.js | 43 +++++++++++++++++++------------ 5 files changed, 89 insertions(+), 60 deletions(-) diff --git a/cmd/goveal/serve.go b/cmd/goveal/serve.go index 2cba01c..c4fd3af 100644 --- a/cmd/goveal/serve.go +++ b/cmd/goveal/serve.go @@ -51,8 +51,8 @@ var ( hub := events.NewEventHub( wdfs, fnv.New32a(), - events.FileNameTrigger(args[0]), - events.FileNameTrigger(filepath.Base(cfg.ConfigFileInUse)), + events.MutationReloadForFile(args[0]), + events.MutationConfigReloadForFile(filepath.Base(cfg.ConfigFileInUse)), ) api.NoCache(app) diff --git a/config/components.go b/config/components.go index 64fdceb..a650f09 100644 --- a/config/components.go +++ b/config/components.go @@ -3,9 +3,10 @@ package config var ( defaults = map[string]interface{}{ "mermaid.theme": "forest", - "reveal.theme": "beige", + "theme": "beige", "codeTheme": "monokai", "transition": TransitionNone, + "controlsLayout": ControlsLayoutEdges, "controls": true, "progress": true, "history": true, @@ -23,11 +24,15 @@ const ( TransitionConvex Transition = "convex" TransitionConcave Transition = "concave" TransitionZoom Transition = "zoom" + + ControlsLayoutBottomRight ControlsLayout = "bottom-right" + ControlsLayoutEdges ControlsLayout = "edges" ) type ( - Transition string - Mermaid struct { + Transition string + ControlsLayout string + Mermaid struct { Theme string `json:"theme"` } Rendering struct { @@ -36,15 +41,16 @@ type ( Stylesheets []string } Reveal struct { - Theme string `json:"theme"` - CodeTheme string `json:"codeTheme"` - Transition Transition `json:"transition"` - Controls bool `json:"controls"` - Progress bool `json:"progress"` - History bool `json:"history"` - Center bool `json:"center"` - SlideNumber bool `json:"slideNumber"` - Menu struct { + Theme string `json:"theme"` + CodeTheme string `json:"codeTheme"` + Transition Transition `json:"transition"` + Controls bool `json:"controls"` + ControlsLayout ControlsLayout `json:"controlsLayout"` + Progress bool `json:"progress"` + History bool `json:"history"` + Center bool `json:"center"` + SlideNumber bool `json:"slideNumber"` + Menu struct { Numbers bool `json:"numbers"` UseTextContentForMissingTitles bool `json:"useTextContentForMissingTitles"` Transitions bool diff --git a/events/event_hub.go b/events/event_hub.go index 2bf9ee1..9458eee 100644 --- a/events/event_hub.go +++ b/events/event_hub.go @@ -21,14 +21,15 @@ const ( ) type ( - ReloadTrigger interface { - Triggers(ev fs.Event) bool + EventMutation interface { + OnEvent(in ContentEvent, ev fs.Event) (out ContentEvent) } ContentEvent struct { File string `json:"file"` FileNameHash string `json:"fileNameHash"` Timestamp string `json:"ts"` ForceReload bool `json:"forceReload"` + ReloadConfig bool `json:"reloadConfig"` } EventSource interface { io.Closer @@ -43,30 +44,35 @@ type ( EventHandler OnError chan error } - FileNameTrigger string - FileSuffixTrigger string + MutationReloadForFile string + MutationConfigReloadForFile string ) -func (t FileNameTrigger) Triggers(ev fs.Event) bool { - fileBase := filepath.Base(ev.File) - return strings.EqualFold(fileBase, string(t)) +func (t MutationReloadForFile) OnEvent(in ContentEvent, ev fs.Event) (out ContentEvent) { + if strings.EqualFold(filepath.Base(ev.File), string(t)) { + in.ForceReload = true + } + return in } -func (t FileSuffixTrigger) Triggers(ev fs.Event) bool { - return strings.HasSuffix(strings.ToLower(filepath.Base(ev.File)), strings.ToLower(string(t))) +func (t MutationConfigReloadForFile) OnEvent(in ContentEvent, ev fs.Event) (out ContentEvent) { + if strings.EqualFold(filepath.Base(ev.File), string(t)) { + in.ReloadConfig = true + } + return in } func (f EventHandlerFunc) OnEvent(ev ContentEvent) error { return f(ev) } -func NewEventHub(eventSource EventSource, fileNameHash hash.Hash, triggers ...ReloadTrigger) *EventHub { +func NewEventHub(eventSource EventSource, fileNameHash hash.Hash, mutations ...EventMutation) *EventHub { hub := &EventHub{ - FileNameHash: fileNameHash, - reloadTriggers: triggers, - source: eventSource, - subscriptions: make(map[uuid.UUID]*subscription), - done: make(chan struct{}), + FileNameHash: fileNameHash, + mutations: mutations, + source: eventSource, + subscriptions: make(map[uuid.UUID]*subscription), + done: make(chan struct{}), } go hub.processEvents() @@ -75,12 +81,12 @@ func NewEventHub(eventSource EventSource, fileNameHash hash.Hash, triggers ...Re } type EventHub struct { - FileNameHash hash.Hash - reloadTriggers []ReloadTrigger - lock sync.RWMutex - done chan struct{} - source EventSource - subscriptions map[uuid.UUID]*subscription + FileNameHash hash.Hash + mutations []EventMutation + lock sync.RWMutex + done chan struct{} + source EventSource + subscriptions map[uuid.UUID]*subscription } func (h *EventHub) Subscribe(handler EventHandler) (id uuid.UUID, onError <-chan error) { @@ -129,20 +135,16 @@ func (h *EventHub) notifySubscribers(ev fs.Event) { h.lock.RLock() defer h.lock.RUnlock() - var triggerReload bool - for idx := range h.reloadTriggers { - if triggerReload = h.reloadTriggers[idx].Triggers(ev); triggerReload { - break - } - } - ce := ContentEvent{ File: fmt.Sprintf("/%s", ev.File), Timestamp: strconv.FormatInt(ev.Timestamp.Unix(), baseDecimal), - ForceReload: triggerReload, FileNameHash: hex.EncodeToString(h.FileNameHash.Sum([]byte(path.Base(ev.File)))), } + for idx := range h.mutations { + ce = h.mutations[idx].OnEvent(ce, ev) + } + for _, handler := range h.subscriptions { if err := handler.OnEvent(ce); err != nil { handler.OnError <- err diff --git a/examples/goveal.yaml b/examples/goveal.yaml index d1aef4f..ba725c0 100644 --- a/examples/goveal.yaml +++ b/examples/goveal.yaml @@ -3,6 +3,16 @@ codeTheme: monokai horizontalSeparator: === verticalSeparator: --- transition: convex -menu.numbers: false +controlsLayout: edges +controls: true +progress: true +history: true +center: true +slideNumber: true +menu: + numbers: false + useTextContentForMissingTitles: true +mermaid: + theme: forest stylesheets: - custom.css \ No newline at end of file diff --git a/web/js/app.js b/web/js/app.js index 1614abe..f529970 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -25,9 +25,13 @@ async function setSlidesContent() { document.getElementById("content-root").innerHTML = contentDocument.documentElement.innerHTML } -async function initReveal() { +async function getRevealConfig() { let resp = await fetch('/api/v1/config/reveal') - let cfg = await resp.json() + return await resp.json() +} + +async function initReveal() { + let cfg = await getRevealConfig() Reveal.initialize({ controls: cfg.controls, progress: cfg.progress, @@ -97,20 +101,27 @@ function subscribeToEvents() { source.onmessage = (ev => { let obj = JSON.parse(ev.data); console.log(obj); - if (obj.forceReload) { - window.location.reload() - } else { - switch (true) { - case obj.file.endsWith(".css"): - let cssLink = document.querySelector(`link[rel=stylesheet][id="${obj.fileNameHash}"]`); - cssLink.href = `${obj.file}?ts=${obj.ts}` - break - default: - let elem = document.getElementById(obj.fileNameHash); - if (elem !== null) { - elem.src = `${obj.file}?ts=${obj.ts}` - } - } + switch (true) { + case obj.forceReload: + window.location.reload() + break + case obj.reloadConfig: + getRevealConfig().then(cfg => { + Reveal.configure(cfg) + }) + break + default: + switch (true) { + case obj.file.endsWith(".css"): + let cssLink = document.querySelector(`link[rel=stylesheet][id="${obj.fileNameHash}"]`); + cssLink.href = `${obj.file}?ts=${obj.ts}` + break + default: + let elem = document.getElementById(obj.fileNameHash); + if (elem !== null) { + elem.src = `${obj.file}?ts=${obj.ts}` + } + } } }) } \ No newline at end of file From 33dadaff8785659b5dabf79820efd8182b143c9c Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 22 Dec 2021 20:27:43 +0100 Subject: [PATCH 03/16] Add golangci-lint --- .golangci.yml | 121 ++++++++++++++++++++++++++++++++++ .pre-commit-config.yaml | 18 +++++ api/config.go | 6 +- assets/assets.go | 6 +- cmd/goveal/root.go | 1 + config/components.go | 37 +++++------ fs/layered.go | 6 +- rendering/render_to_reveal.go | 6 +- rendering/state.go | 18 +++-- 9 files changed, 176 insertions(+), 43 deletions(-) create mode 100644 .golangci.yml create mode 100644 .pre-commit-config.yaml diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..08a6304 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,121 @@ +linters-settings: + dupl: + threshold: 100 + funlen: + lines: 100 + statements: 50 + gci: + local-prefixes: github.com/baez90/goveal + goconst: + min-len: 2 + min-occurrences: 2 + gocritic: + enabled-tags: + - diagnostic + - opinionated + - performance + disabled-checks: + - ifElseChain + - octalLiteral + - wrapperFunc + settings: + hugeParam: + sizeThreshold: 200 + gocyclo: + min-complexity: 15 + goimports: + local-prefixes: github.com/baez90/goveal + golint: + min-confidence: 0 + gomnd: + settings: + mnd: + # don't include the "operation" and "assign" + checks: + - argument + - case + - condition + - return + govet: + check-shadowing: true + importas: + no-unaliased: true + alias: [] + lll: + line-length: 140 + maligned: + suggest-new: true + misspell: + locale: US + nolintlint: + allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space) + allow-unused: false # report any unused nolint directives + require-explanation: false # don't require an explanation for nolint directives + require-specific: false # don't require nolint directives to be specific about which linter is being skipped + +linters: + # please, do not use `enable-all`: it's deprecated and will be removed soon. + # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint + disable-all: true + enable: + - deadcode + - dogsled + - dupl + - errcheck + - exhaustive + - exportloopref + - funlen + - gocognit + - goconst + - gocritic + - gocyclo + - godox + - gofumpt + - goimports + - gomnd + - gosec + - gosimple + - govet + - importas + - ineffassign + - lll + - misspell + - nakedret + - nestif + - noctx + - nolintlint + - paralleltest + - prealloc + - promlinter + - staticcheck + - structcheck + - stylecheck + - testpackage + - thelper + - typecheck + - unconvert + - unparam + - varcheck + - whitespace + + #- unused + +issues: + # Excluding configuration per-path, per-linter, per-text and per-source + exclude-rules: + - path: _test\.go + linters: + - gomnd + - funlen + +run: + build-tags: + - sudo + skip-dirs: + - internal/mock + skip-files: + - ".*\\.pb\\.go$" + - ".*.mock.\\.go$" + +service: + golangci-lint-version: 1.43.x # use the fixed version to not introduce new linters unexpectedly diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..afc7d0d --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,18 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +repos: + - repo: https://github.com/tekwizely/pre-commit-golang + rev: v1.0.0-beta.5 + hooks: + - id: go-mod-tidy-repo + - id: go-fumpt + args: + - -w + - id: go-imports + args: + - -local=github.com/baez90/goveal + - -w + - id: golangci-lint-repo-mod + args: + - --fast + - --fix diff --git a/api/config.go b/api/config.go index 5050560..0402047 100644 --- a/api/config.go +++ b/api/config.go @@ -11,9 +11,9 @@ type ConfigAPI struct { } func RegisterConfigAPI(app *fiber.App, cfg *config.Components) { - cfgApi := &ConfigAPI{cfg: cfg} - app.Get("/api/v1/config/reveal", cfgApi.RevealConfig) - app.Get("/api/v1/config/mermaid", cfgApi.MermaidConfig) + cfgAPI := &ConfigAPI{cfg: cfg} + app.Get("/api/v1/config/reveal", cfgAPI.RevealConfig) + app.Get("/api/v1/config/mermaid", cfgAPI.MermaidConfig) } func (a *ConfigAPI) RevealConfig(ctx *fiber.Ctx) error { diff --git a/assets/assets.go b/assets/assets.go index e5a6a07..d36538c 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -2,7 +2,5 @@ package assets import "embed" -var ( - //go:embed reveal mermaid/mermaid.min.js - Assets embed.FS -) +//go:embed reveal mermaid/mermaid.min.js +var Assets embed.FS diff --git a/cmd/goveal/root.go b/cmd/goveal/root.go index 5439626..6ff78b2 100644 --- a/cmd/goveal/root.go +++ b/cmd/goveal/root.go @@ -23,6 +23,7 @@ import ( "github.com/baez90/goveal/config" ) +//nolint:lll // explanations are rather long var ( cfgFile string rootCmd = &cobra.Command{ diff --git a/config/components.go b/config/components.go index a650f09..b92e3b3 100644 --- a/config/components.go +++ b/config/components.go @@ -1,21 +1,19 @@ package config -var ( - defaults = map[string]interface{}{ - "mermaid.theme": "forest", - "theme": "beige", - "codeTheme": "monokai", - "transition": TransitionNone, - "controlsLayout": ControlsLayoutEdges, - "controls": true, - "progress": true, - "history": true, - "center": true, - "slideNumber": true, - "menu.numbers": true, - "menu.useTextContentForMissingTitles": true, - } -) +var defaults = map[string]interface{}{ + "mermaid.theme": "forest", + "theme": "beige", + "codeTheme": "monokai", + "transition": TransitionNone, + "controlsLayout": ControlsLayoutEdges, + "controls": true, + "progress": true, + "history": true, + "center": true, + "slideNumber": true, + "menu.numbers": true, + "menu.useTextContentForMissingTitles": true, +} const ( TransitionNone Transition = "none" @@ -65,10 +63,5 @@ type ( ) func (t Transition) String() string { - switch t { - case TransitionNone: - return "none" - default: - return string(t) - } + return string(t) } diff --git a/fs/layered.go b/fs/layered.go index 1c37416..554b369 100644 --- a/fs/layered.go +++ b/fs/layered.go @@ -5,8 +5,10 @@ import ( "os" ) -type FS = fs.FS -type File = fs.File +type ( + FS = fs.FS + File = fs.File +) var Dir = os.DirFS diff --git a/rendering/render_to_reveal.go b/rendering/render_to_reveal.go index 83e4259..09b700b 100644 --- a/rendering/render_to_reveal.go +++ b/rendering/render_to_reveal.go @@ -47,6 +47,7 @@ type RevealRenderer struct { hasNotes bool } +//nolint:gocyclo // under construction func (r *RevealRenderer) RenderHook(w io.Writer, node ast.Node, entering bool) (ast.WalkStatus, bool) { switch b := node.(type) { case *ast.Document: @@ -82,7 +83,7 @@ func (r *RevealRenderer) RenderHook(w io.Writer, node ast.Node, entering bool) ( return ast.GoToNext, false case *ast.HorizontalRule: next := peekNextRuler(b) - var input = string(b.Literal) + input := string(b.Literal) if next != nil { input += string(next.Literal) } @@ -185,6 +186,7 @@ func getAttributesFromChildSpan(node ast.Node) []template.HTMLAttr { } func extractElementAttributes(htmlSpan *ast.HTMLSpan) (attrs []template.HTMLAttr) { + const expectedNumberOfMatches = 4 htmlComment := string(htmlSpan.Literal) if htmlComment == "" { return nil @@ -192,7 +194,7 @@ func extractElementAttributes(htmlSpan *ast.HTMLSpan) (attrs []template.HTMLAttr matches := htmlElementAttributesRegexp.FindAllStringSubmatch(htmlComment, -1) attrs = make([]template.HTMLAttr, 0, len(matches)) for idx := range matches { - if len(matches[idx]) != 4 { + if len(matches[idx]) != expectedNumberOfMatches { continue } diff --git a/rendering/state.go b/rendering/state.go index a926b13..010816e 100644 --- a/rendering/state.go +++ b/rendering/state.go @@ -18,34 +18,32 @@ const ( StateTypeNested ) -var ( - EventMapping = map[EventType][]byte{ - EventTypeHorizontalSplit: []byte(` +var EventMapping = map[EventType][]byte{ + EventTypeHorizontalSplit: []byte(`
    • `), - EventTypeVerticalSplit: []byte(` + EventTypeVerticalSplit: []byte(`
    `), - EventTypeHorizontalEnd: []byte(` + EventTypeHorizontalEnd: []byte(`
    `), - EventTypeVerticalSplitEnd: []byte(` + EventTypeVerticalSplitEnd: []byte(`
    `), - EventTypeVerticalDocumentEnd: []byte(` + EventTypeVerticalDocumentEnd: []byte(`
    `), - EventTypeVerticalVerticalSplit: []byte(` + EventTypeVerticalVerticalSplit: []byte(`
    `), - } -) +} func NewStateMachine(verticalSplit, horizontalSplit string) *StateMachine { return &StateMachine{ From 7d3d3a5abfd057b368d0f0aa61686a183d5a8331 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 22 Dec 2021 22:31:45 +0100 Subject: [PATCH 04/16] Split slides first before rendering them - add some more config options - cleanup code - remove state machine --- api/views.go | 29 ++------ config/components.go | 9 ++- examples/goveal.yaml | 8 +- examples/slides.md | 3 +- rendering/html.go | 90 ++++++++++++++++++++++ rendering/patterns.go | 19 +++++ rendering/render_to_reveal.go | 65 +--------------- rendering/state.go | 124 ------------------------------- rendering/templates.go | 61 +++++++++++++++ rendering/templates/slide.gohtml | 12 +++ web/js/app.js | 14 ++-- 11 files changed, 213 insertions(+), 221 deletions(-) create mode 100644 rendering/html.go create mode 100644 rendering/patterns.go delete mode 100644 rendering/state.go create mode 100644 rendering/templates.go create mode 100644 rendering/templates/slide.gohtml diff --git a/api/views.go b/api/views.go index 884ccb2..7d6e792 100644 --- a/api/views.go +++ b/api/views.go @@ -1,13 +1,9 @@ package api import ( - "hash/fnv" "io" "github.com/gofiber/fiber/v2" - "github.com/gomarkdown/markdown" - "github.com/gomarkdown/markdown/html" - "github.com/gomarkdown/markdown/parser" "go.uber.org/multierr" "github.com/baez90/goveal/config" @@ -15,13 +11,6 @@ import ( "github.com/baez90/goveal/rendering" ) -const ( - parserExtensions = parser.NoIntraEmphasis | parser.Tables | parser.FencedCode | - parser.Autolink | parser.Strikethrough | parser.SpaceHeadings | parser.HeadingIDs | - parser.BackslashLineBreak | parser.DefinitionLists | parser.MathJax | parser.Titleblock | - parser.OrderedListStart | parser.Attributes -) - type Views struct { cfg *config.Components wdfs fs.FS @@ -54,20 +43,14 @@ func (p *Views) RenderedMarkdown(ctx *fiber.Ctx) (err error) { return err } - mdParser := parser.NewWithExtensions(parserExtensions) - rr := &rendering.RevealRenderer{ - StateMachine: rendering.NewStateMachine("***", "---"), - Hash: fnv.New32a(), - } - renderer := html.NewRenderer(html.RendererOptions{ - Flags: html.CommonFlags | html.HrefTargetBlank, - RenderNodeHook: rr.RenderHook, - }) - - ctx.Append(fiber.HeaderContentType, fiber.MIMETextHTML) - if _, err = ctx.Write(markdown.ToHTML(data, mdParser, renderer)); err != nil { + var rendered []byte + if rendered, err = rendering.ToHTML(string(data), p.cfg.Rendering); err != nil { + return err + } else if _, err = ctx.Write(rendered); err != nil { return err } + ctx.Append(fiber.HeaderContentType, fiber.MIMETextHTML) + return err } diff --git a/config/components.go b/config/components.go index b92e3b3..e9c2027 100644 --- a/config/components.go +++ b/config/components.go @@ -13,6 +13,10 @@ var defaults = map[string]interface{}{ "slideNumber": true, "menu.numbers": true, "menu.useTextContentForMissingTitles": true, + "menu.transitions": true, + "menu.hideMissingTitles": true, + "menu.markers": true, + "menu.openButton": true, } const ( @@ -51,7 +55,10 @@ type ( Menu struct { Numbers bool `json:"numbers"` UseTextContentForMissingTitles bool `json:"useTextContentForMissingTitles"` - Transitions bool + Transitions bool `json:"transitions"` + HideMissingTitles bool `json:"hideMissingTitles"` + Markers bool `json:"markers"` + OpenButton bool `json:"openButton"` } `json:"menu"` } Components struct { diff --git a/examples/goveal.yaml b/examples/goveal.yaml index ba725c0..e08b74b 100644 --- a/examples/goveal.yaml +++ b/examples/goveal.yaml @@ -1,7 +1,7 @@ theme: night codeTheme: monokai -horizontalSeparator: === -verticalSeparator: --- +horizontalSeparator: --- +verticalSeparator: '\*\*\*' transition: convex controlsLayout: edges controls: true @@ -12,6 +12,10 @@ slideNumber: true menu: numbers: false useTextContentForMissingTitles: true + transitions: true + hideMissingTitles: false + markers: true + openButton: true mermaid: theme: forest stylesheets: diff --git a/examples/slides.md b/examples/slides.md index 0c5a09e..f507a15 100644 --- a/examples/slides.md +++ b/examples/slides.md @@ -91,6 +91,7 @@ for (var j = 0; j < i; j++) { ### Mermaid ```mermaid +%%{init: {'theme': 'dark'}}%% flowchart LR a --> b & c--> d ``` @@ -102,7 +103,7 @@ flowchart LR {line-numbers="1-2|3|4"} ```js - let a = 1; +let a = 1; let b = 2; let c = x => 1 + 2 + x; c(3); diff --git a/rendering/html.go b/rendering/html.go new file mode 100644 index 0000000..66ce628 --- /dev/null +++ b/rendering/html.go @@ -0,0 +1,90 @@ +package rendering + +import ( + "bytes" + "fmt" + "html/template" + "regexp" + + "github.com/gomarkdown/markdown/parser" + + "github.com/baez90/goveal/config" +) + +const ( + parserExtensions = parser.NoIntraEmphasis | parser.Tables | parser.FencedCode | + parser.Autolink | parser.Strikethrough | parser.SpaceHeadings | parser.HeadingIDs | + parser.BackslashLineBreak | parser.DefinitionLists | parser.MathJax | parser.Titleblock | + parser.OrderedListStart | parser.Attributes +) + +func ToHTML(markdown string, renderCfg config.Rendering) (rendered []byte, err error) { + var slides []rawSlide + if slides, err = splitIntoRawSlides(markdown, renderCfg); err != nil { + return nil, err + } + + buf := templateRenderBufferPool.Get().(*bytes.Buffer) + defer func() { + buf.Reset() + templateRenderBufferPool.Put(buf) + }() + + for idx := range slides { + if rendered, err := slides[idx].ToHTML(); err != nil { + return nil, err + } else { + buf.WriteString(string(rendered)) + } + } + + return buf.Bytes(), nil +} + +type rawSlide struct { + Content string + Children []rawSlide +} + +func (s rawSlide) HasNotes() bool { + return notesLineRegexp.MatchString(s.Content) +} + +func (s rawSlide) ToHTML() (template.HTML, error) { + if rendered, err := renderTemplate("slide.gohtml", s); err != nil { + return "", err + } else { + //nolint:gosec // should not be sanitized + return template.HTML(rendered), nil + } +} + +func splitIntoRawSlides(markdown string, renderCfg config.Rendering) ([]rawSlide, error) { + var ( + verticalSplit, horizontalSplit *regexp.Regexp + err error + ) + if verticalSplit, err = regexp.Compile(fmt.Sprintf(splitFormat, renderCfg.VerticalSeparator)); err != nil { + return nil, err + } + + if horizontalSplit, err = regexp.Compile(fmt.Sprintf(splitFormat, renderCfg.HorizontalSeparator)); err != nil { + return nil, err + } + + horizontalSlides := horizontalSplit.Split(markdown, -1) + slides := make([]rawSlide, 0, len(horizontalSlides)) + for _, hs := range horizontalSlides { + s := rawSlide{ + Content: hs, + } + verticalSlides := verticalSplit.Split(hs, -1) + s.Children = make([]rawSlide, 0, len(verticalSlides)) + for _, vs := range verticalSlides { + s.Children = append(s.Children, rawSlide{Content: vs}) + } + slides = append(slides, s) + } + + return slides, nil +} diff --git a/rendering/patterns.go b/rendering/patterns.go new file mode 100644 index 0000000..1326c45 --- /dev/null +++ b/rendering/patterns.go @@ -0,0 +1,19 @@ +package rendering + +import ( + "fmt" + "regexp" +) + +const ( + // language=regexp + notesRegex = `(?i)notes?:` + // language=regexp + splitFormat = `\r?\n%s\r?\n` +) + +var ( + htmlElementAttributesRegexp = regexp.MustCompile(`(?P[a-z]+(-[a-z]+)*)="(?P.+)"`) + notesRegexp = regexp.MustCompile(fmt.Sprintf(`^%s`, notesRegex)) + notesLineRegexp = regexp.MustCompile(fmt.Sprintf(`\r?\n%s\r?\n`, notesRegex)) +) diff --git a/rendering/render_to_reveal.go b/rendering/render_to_reveal.go index 09b700b..221b58d 100644 --- a/rendering/render_to_reveal.go +++ b/rendering/render_to_reveal.go @@ -2,65 +2,26 @@ package rendering import ( "bytes" - "embed" "encoding/hex" "hash" "html" "html/template" "io" "path" - "regexp" - "sync" - "github.com/Masterminds/sprig/v3" "github.com/gomarkdown/markdown/ast" ) -var ( - //go:embed templates/*.gohtml - templatesFS embed.FS - templates *template.Template - templateRenderBufferPool = &sync.Pool{ - New: func() interface{} { - return new(bytes.Buffer) - }, - } - htmlElementAttributesRegexp = regexp.MustCompile(`(?P[a-z]+(-[a-z]+)*)="(?P.+)"`) - notesRegexp = regexp.MustCompile(`^(?i)notes?`) -) - const ( mermaidCodeBlock = "mermaid" ) -func init() { - var err error - templates = template.New("rendering").Funcs(sprig.FuncMap()) - if templates, err = templates.ParseFS(templatesFS, "templates/*.gohtml"); err != nil { - panic(err) - } -} - type RevealRenderer struct { - StateMachine *StateMachine - Hash hash.Hash - hasNotes bool + Hash hash.Hash } -//nolint:gocyclo // under construction func (r *RevealRenderer) RenderHook(w io.Writer, node ast.Node, entering bool) (ast.WalkStatus, bool) { switch b := node.(type) { - case *ast.Document: - if entering { - _, _ = w.Write([]byte("
    \n")) - if next := peekNextRuler(b); next != nil && string(next.Literal) == "***" { - _, _ = w.Write([]byte("
    \n")) - r.StateMachine.CurrentState = StateTypeNested - } - } else { - _, _ = w.Write([]byte("
    \n")) - } - return ast.GoToNext, false case *ast.ListItem: if entering { return r.handleListItem(w, b) @@ -72,7 +33,6 @@ func (r *RevealRenderer) RenderHook(w io.Writer, node ast.Node, entering bool) ( } if notesRegexp.Match(b.Literal) { _, err := w.Write([]byte(``)) - r.hasNotes = false - } - _, _ = w.Write(r.StateMachine.Accept(input)) - return ast.GoToNext, true case *ast.Image: if entering { return r.handleImage(w, b) @@ -215,17 +163,6 @@ func renderCodeTemplate(templateName string, codeBlock *ast.CodeBlock) (output [ return renderTemplate(templateName, data) } -func renderTemplate(templateName string, data interface{}) (output []byte, err error) { - buffer := templateRenderBufferPool.Get().(*bytes.Buffer) - defer func() { - buffer.Reset() - templateRenderBufferPool.Put(buffer) - }() - - err = templates.ExecuteTemplate(buffer, templateName, data) - return buffer.Bytes(), err -} - func lineNumbers(attrs *ast.Attribute) string { if attrs == nil || attrs.Attrs == nil { return "" diff --git a/rendering/state.go b/rendering/state.go deleted file mode 100644 index 010816e..0000000 --- a/rendering/state.go +++ /dev/null @@ -1,124 +0,0 @@ -package rendering - -import ( - "fmt" - - "github.com/gomarkdown/markdown/ast" -) - -const ( - EventTypeHorizontalSplit EventType = iota - EventTypeVerticalSplit - EventTypeHorizontalEnd - EventTypeVerticalSplitEnd - EventTypeVerticalDocumentEnd - EventTypeVerticalVerticalSplit - - StateTypeRegular StateType = iota - StateTypeNested -) - -var EventMapping = map[EventType][]byte{ - EventTypeHorizontalSplit: []byte(` -
    -
    `), - EventTypeVerticalSplit: []byte(` -
    -
    -
    -`), - EventTypeHorizontalEnd: []byte(` -
    -`), - EventTypeVerticalSplitEnd: []byte(` -
    -
    -
    `), - EventTypeVerticalDocumentEnd: []byte(` -
    -
    -`), - EventTypeVerticalVerticalSplit: []byte(` - - -
    -
    `), -} - -func NewStateMachine(verticalSplit, horizontalSplit string) *StateMachine { - return &StateMachine{ - CurrentState: StateTypeRegular, - States: map[StateType]State{ - StateTypeRegular: { - Transitions: map[string]TransitionResult{ - horizontalSplit: {EventTypeHorizontalSplit, StateTypeRegular}, - fmt.Sprintf("%s%s", horizontalSplit, horizontalSplit): {EventTypeHorizontalSplit, StateTypeRegular}, - fmt.Sprintf("%s%s", horizontalSplit, verticalSplit): {EventTypeVerticalSplit, StateTypeNested}, - fmt.Sprintf("%s%s", verticalSplit, horizontalSplit): {EventTypeVerticalSplit, StateTypeNested}, - "": {EventTypeHorizontalEnd, StateTypeRegular}, - }, - }, - StateTypeNested: { - Transitions: map[string]TransitionResult{ - fmt.Sprintf("%s%s", verticalSplit, verticalSplit): {EventTypeHorizontalSplit, StateTypeNested}, - verticalSplit: {EventTypeHorizontalSplit, StateTypeNested}, - fmt.Sprintf("%s%s", verticalSplit, horizontalSplit): {EventTypeVerticalSplitEnd, StateTypeNested}, - horizontalSplit: {EventTypeVerticalSplitEnd, StateTypeRegular}, - fmt.Sprintf("%s%s", horizontalSplit, verticalSplit): {EventTypeVerticalVerticalSplit, StateTypeNested}, - fmt.Sprintf("%s%s", horizontalSplit, horizontalSplit): {EventTypeVerticalSplitEnd, StateTypeRegular}, - "": {EventTypeVerticalDocumentEnd, StateTypeRegular}, - }, - }, - }, - } -} - -type ( - EventType uint - StateType uint - TransitionResult struct { - EventType EventType - StateType StateType - } - State struct { - Transitions map[string]TransitionResult - } - StateMachine struct { - CurrentState StateType - States map[StateType]State - } -) - -func (m *StateMachine) Accept(input string) []byte { - if result, ok := m.States[m.CurrentState].Transitions[input]; ok { - m.CurrentState = result.StateType - return EventMapping[result.EventType] - } - return nil -} - -func peekNextRuler(node ast.Node) *ast.HorizontalRule { - if node.AsContainer() == nil { - node = node.GetParent() - } - - nodes := node.GetChildren() - if nodes == nil { - return nil - } - - var selfIdx int - for idx := range nodes { - if nodes[idx] == node { - selfIdx = idx - break - } - } - - for idx := selfIdx + 1; idx < len(nodes); idx++ { - if hr, ok := nodes[idx].(*ast.HorizontalRule); ok { - return hr - } - } - return nil -} diff --git a/rendering/templates.go b/rendering/templates.go new file mode 100644 index 0000000..492220a --- /dev/null +++ b/rendering/templates.go @@ -0,0 +1,61 @@ +package rendering + +import ( + "bytes" + "embed" + "hash/fnv" + "html/template" + "sync" + + "github.com/Masterminds/sprig/v3" + "github.com/gomarkdown/markdown" + mdhtml "github.com/gomarkdown/markdown/html" + "github.com/gomarkdown/markdown/parser" +) + +var ( + //go:embed templates/*.gohtml + templatesFS embed.FS + templates *template.Template + templateRenderBufferPool = &sync.Pool{ + New: func() interface{} { + return new(bytes.Buffer) + }, + } +) + +func init() { + templates = template.New("rendering"). + Funcs(sprig.FuncMap()). + Funcs(template.FuncMap{ + "renderMarkdown": func(md string) template.HTML { + rr := &RevealRenderer{ + Hash: fnv.New32a(), + } + mdParser := parser.NewWithExtensions(parserExtensions) + renderer := mdhtml.NewRenderer(mdhtml.RendererOptions{ + Flags: mdhtml.CommonFlags | mdhtml.HrefTargetBlank, + RenderNodeHook: rr.RenderHook, + }) + + renderedHTML := markdown.ToHTML([]byte(md), mdParser, renderer) + //nolint:gosec // template should be esacped + return template.HTML(renderedHTML) + }, + }) + var err error + if templates, err = templates.ParseFS(templatesFS, "templates/*.gohtml"); err != nil { + panic(err) + } +} + +func renderTemplate(templateName string, data interface{}) (output []byte, err error) { + buffer := templateRenderBufferPool.Get().(*bytes.Buffer) + defer func() { + buffer.Reset() + templateRenderBufferPool.Put(buffer) + }() + + err = templates.ExecuteTemplate(buffer, templateName, data) + return buffer.Bytes(), err +} diff --git a/rendering/templates/slide.gohtml b/rendering/templates/slide.gohtml new file mode 100644 index 0000000..1931613 --- /dev/null +++ b/rendering/templates/slide.gohtml @@ -0,0 +1,12 @@ +
    + {{ if .Children }} + {{ range .Children }} + {{ .ToHTML }} + {{ end }} + {{ else }} + {{ renderMarkdown .Content }} + {{ end }} + {{ if .HasNotes }} + + {{ end }} +
    \ No newline at end of file diff --git a/web/js/app.js b/web/js/app.js index f529970..d60359f 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -5,7 +5,6 @@ document.addEventListener("DOMContentLoaded", _ => { }) .then(() => { subscribeToEvents() - console.info("finished initializing") }) }); @@ -34,6 +33,7 @@ async function initReveal() { let cfg = await getRevealConfig() Reveal.initialize({ controls: cfg.controls, + controlsLayout: cfg.controlsLayout, progress: cfg.progress, history: cfg.history, center: cfg.center, @@ -44,6 +44,10 @@ async function initReveal() { menu: { numbers: cfg.menu.numbers, useTextContentForMissingTitles: cfg.menu.useTextContentForMissingTitles, + transitions: cfg.menu.transitions, + hideMissingTitles: cfg.hideMissingTitles, + markers: cfg.menu.markers, + openButton: cfg.menu.openButton, custom: [ { title: 'Print', @@ -64,7 +68,6 @@ async function initReveal() { {name: 'Solarized', theme: '/reveal/dist/theme/solarized.css'}, {name: 'White', theme: '/reveal/dist/theme/white.css'} ], - transitions: true, }, plugins: [RevealHighlight, RevealNotes, RevealMenu] }) @@ -87,20 +90,19 @@ function subscribeToEvents() { let source = new EventSource("/api/v1/events"); source.onopen = (() => { - console.log("eventsource connection open"); + console.debug("eventsource connection open"); }) source.onerror = (ev => { if (ev.target.readyState === 0) { - console.log("reconnecting to eventsource"); + console.debug("reconnecting to eventsource"); } else { - console.log("eventsource error", ev); + console.error("eventsource error", ev); } }) source.onmessage = (ev => { let obj = JSON.parse(ev.data); - console.log(obj); switch (true) { case obj.forceReload: window.location.reload() From 6be2b5aeb5a995b02042d18934c894afee39d79d Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 22 Dec 2021 23:05:59 +0100 Subject: [PATCH 05/16] Cleanup - update deps - add open-browser option - allow to change port and host --- Taskfile.yml | 6 +++--- cmd/goveal/serve.go | 50 ++++++++++++++++++++++++++++++++++++++++---- config/components.go | 2 ++ examples/slides.md | 3 +-- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 354a126..5891efb 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -2,9 +2,9 @@ version: '3' vars: DEBUG_PORT: 2345 - REVEALJS_VERSION: 4.1.2 + REVEALJS_VERSION: 4.2.1 HIGHLIGHTJS_VERSION: 11.3.1 - MERMAID_VERSION: 8.13.4 + MERMAID_VERSION: 8.13.6 BINARY_NAME: goveal OUT_DIR: ./out GO_BUILD_ARGS: -ldflags="-w -s" @@ -98,7 +98,7 @@ tasks: - curl -L -o ./assets/reveal/plugin/mouse-pointer/mouse-pointer.js https://raw.githubusercontent.com/caiofcm/plugin-revealjs-mouse-pointer/master/mouse-pointer.js - rm -f ./assets/reveal/plugin/menu/{bower.json,CONTRIBUTING.md,LICENSE,package.json,README.md,.gitignore,gulpfile.js,package-lock.json} - curl -L https://github.com/highlightjs/highlight.js/archive/{{ .HIGHLIGHTJS_VERSION }}.tar.gz | tar -xvz --strip-components=3 -C ./assets/reveal/plugin/highlight --wildcards "*.css" highlight.js-{{ .HIGHLIGHTJS_VERSION }}/src/styles/ - - curl -L https://github.com/mermaid-js/mermaid/archive/refs/tags/{{ .MERMAID_VERSION }}.tar.gz | tar -xvz -C ./assets/mermaid/ mermaid-{{ .MERMAID_VERSION }}/dist --strip-components=2 + - curl -L https://registry.npmjs.org/mermaid/-/mermaid-{{ .MERMAID_VERSION }}.tgz | tar -xvz -C ./assets/mermaid/ package/dist --strip-components=2 go-get-tool: vars: diff --git a/cmd/goveal/serve.go b/cmd/goveal/serve.go index c4fd3af..3d94658 100644 --- a/cmd/goveal/serve.go +++ b/cmd/goveal/serve.go @@ -2,10 +2,13 @@ package main import ( "encoding/hex" + "fmt" "hash/fnv" "net/http" + "os/exec" "path" "path/filepath" + "runtime" "github.com/gofiber/fiber/v2" "github.com/gofiber/template/html" @@ -20,10 +23,18 @@ import ( "github.com/baez90/goveal/web" ) +const ( + defaultListeningPort uint16 = 3000 + defaultHost = "127.0.0.1" +) + var ( - workingDir string - cfg *config.Components - serveCmd = &cobra.Command{ + workingDir string + cfg *config.Components + host string + port uint16 + openBrowser bool + serveCmd = &cobra.Command{ Use: "serve", Args: cobra.ExactArgs(1), RunE: func(_ *cobra.Command, args []string) (err error) { @@ -47,6 +58,10 @@ var ( h := fnv.New32a() return hex.EncodeToString(h.Sum([]byte(path.Base(fileName)))) }), + AppName: "goveal", + GETOnly: true, + DisableStartupMessage: true, + StreamRequestBody: true, }) hub := events.NewEventHub( wdfs, @@ -63,11 +78,38 @@ var ( return err } - return app.Listen(":3000") + if openBrowser { + log.Info("Opening browser...") + openBrowserInBackground(fmt.Sprintf("http://%s:%d", host, port)) + } + + log.Infof("Listening on %s:%d", host, port) + return app.Listen(fmt.Sprintf("%s:%d", host, port)) }, } ) func init() { + serveCmd.Flags().Uint16Var(&port, "port", defaultListeningPort, "port to listen on") + serveCmd.Flags().StringVar(&host, "host", defaultHost, "address/hostname to bind on") + serveCmd.Flags().BoolVar(&openBrowser, "open-browser", true, "Open browser when starting") rootCmd.AddCommand(serveCmd) } + +func openBrowserInBackground(url string) { + var err error + + switch runtime.GOOS { + case "linux": + err = exec.Command("xdg-open", url).Start() + case "windows": + err = exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start() + case "darwin": + err = exec.Command("open", url).Start() + default: + err = fmt.Errorf("unsupported platform") + } + if err != nil { + log.Warn(err) + } +} diff --git a/config/components.go b/config/components.go index e9c2027..a7024c8 100644 --- a/config/components.go +++ b/config/components.go @@ -4,6 +4,8 @@ var defaults = map[string]interface{}{ "mermaid.theme": "forest", "theme": "beige", "codeTheme": "monokai", + "verticalSeparator": `\*\*\*`, + "horizontalSeparator": `---`, "transition": TransitionNone, "controlsLayout": ControlsLayoutEdges, "controls": true, diff --git a/examples/slides.md b/examples/slides.md index f507a15..eecff37 100644 --- a/examples/slides.md +++ b/examples/slides.md @@ -91,7 +91,7 @@ for (var j = 0; j < i; j++) { ### Mermaid ```mermaid -%%{init: {'theme': 'dark'}}%% +%%{init: {'theme': 'neutral'}}%% flowchart LR a --> b & c--> d ``` @@ -101,7 +101,6 @@ flowchart LR ### The inadequacy of a non-highlighted being {line-numbers="1-2|3|4"} - ```js let a = 1; let b = 2; From 00109b62b49936e20e3f40687f23c1f32174e29d Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Thu, 23 Dec 2021 11:17:14 +0100 Subject: [PATCH 06/16] Fix GoReleaser config --- .goreleaser.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 3884927..2feed1c 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,6 +1,6 @@ project_name: goveal builds: - - main: ./cmd/goveal/main.go + - main: ./cmd/goveal/ binary: goveal goos: - linux @@ -16,10 +16,10 @@ builds: - CGO_ENABLED=0 ignore: - goos: darwin - goarch: 386 + goarch: '386' - goos: linux goarch: arm - goarm: 7 + goarm: '7' archives: - replacements: darwin: Darwin From f8daaf293ebe8944afb94fde339aecfe91491088 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Thu, 23 Dec 2021 12:20:10 +0100 Subject: [PATCH 07/16] Add container image and document usage --- .goreleaser.yml | 13 +++++ README.md | 97 ++++++++++++++++++++++++++-------- build/docker/goveal.dockerfile | 9 ++++ cmd/goveal/root.go | 1 - cmd/goveal/serve.go | 2 +- 5 files changed, 97 insertions(+), 25 deletions(-) create mode 100644 build/docker/goveal.dockerfile diff --git a/.goreleaser.yml b/.goreleaser.yml index 2feed1c..7ff7cf7 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -20,6 +20,19 @@ builds: - goos: linux goarch: arm goarm: '7' + +dockers: + - id: goveal + goos: linux + goarch: amd64 + goarm: '' + ids: + - goveal + image_templates: + - ghcr.io/baez90/goveal:{{ .Tag }} + - ghcr.io/baez90/goveal:{{ .Major }} + dockerfile: ./build/docker/goveal.dockerfile + archives: - replacements: darwin: Darwin diff --git a/README.md b/README.md index 58795c3..9d80596 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,23 @@ [![Actions Status](https://github.com/baez90/goveal/workflows/Go/badge.svg)](https://github.com/baez90/goveal/actions) -Goveal is very small and very simple tool that reads Markdown from a given file, renders it into a HTML template and -serves it as local HTTP server. Right now Goveal uses Reveal.js 4.1.2 to create presentations and therefore also -includes all features of Reveal.js 4.1.2. +Goveal is very small and very simple tool that reads Markdown from a given file, renders it into an HTML template and serves it as local HTTP server. +Right now Goveal uses Reveal.js 4.2.1 to create presentations and therefore also includes all features of Reveal.js 4.2.1. + +In contrary to Reveal.js `goveal` ships with its own Markdown parser and renderer which is why some features are working slightly different from Reveal.js. +See [Markdown](#markdown) for further details. + +Besides all features from Reveal.js `goveal` comes with first class support for [mermaid-js](https://mermaid-js.github.io/). +Just inline your diagrams as code and enjoy! ## Install The easiest and fastest way to install Goveal is to use a pre-built binary from the [releases](https://github.com/baez90/goveal/releases/latest). +There's also a pre-built container image available you can use if you don't want to download the binary. + +### Build from source + If you have Go in the latest version installed you can also build your own version of Goveal: ```shell @@ -21,46 +30,88 @@ Requirements: - [task](https://taskfile.dev/) - _Optional:_ [goreleaser](https://goreleaser.com/) (for `task snapshot-release` to build all binaries) -_Note: All script tasks in the [Taskfile.yml](Taskfile.yml) are meant to be executed with Linux/MacOS. Binaries for Windows are provided but not tested!_ +_Note: All script tasks in the [Taskfile.yml](Taskfile.yml) are meant to be executed with Linux/MacOS. Binaries for +Windows are provided but not tested!_ ## Usage +### Local installation + ```bash goveal serve ./slides.md ``` -| Param | Description | Default value | -| ------------------------ | ---------------------------------------------------------------------------- | ----------------------- | -| `--host` | Hostname the binary is listening on | `localhost` | -| `--port` | Port the binary is listening on | `2233` | -| `--code-theme` | highlight.js theme to use | `monokai` | -| `--transition` | Transition effect to show between slides | `none` | -| `--navigationMode` | Navigation mode to use when using the cursor keys to navigate through slides | `default` | -| `--config` | Path to the config file see [config](#config) | `$HOME/goveal:./goveal` | -| `--horizontal-separator` | horizontal separator to split slides | `===` | -| `--vertical-separator` | vertical separator to split slides | `---` | -| `--theme` | reveal.js theme to use | `white` | -| `-h` / `--help` | shows help | | +| Param | Description | Default value | +| ---------------- | --------------------------------------------- | ----------------------- | +| `--host` | Hostname the binary is listening on | `127.0.0.1` | +| `--port` | Port the binary is listening on | `2233` | +| `--config` | Path to the config file see [config](#config) | `$HOME/goveal:./goveal` | +| `--open-browser` | Open a browser after starting the web server | `true` | +| `-h` / `--help` | shows help | | + +### Container + +Assuming your slides are in a file called `slides.md` in the current directory, you can start the presentation like +this: + +```shell +podman/docker run --rm -ti -v `pwd`:/work -w /work -p 2233:2233 ghcr.io/baez90/goveal:0 serve --host 0.0.0.0 slides.md +``` + +By default `goveal` only listens on `127.0.0.1`. To allow traffic from outside of the container you've to change the +binding to `0.0.0.0`. ## Config Goveal supports multiple configuration mechanisms. It tries to load a configuration file from `$HOME` or from `.` i.e. `$HOME/goveal.yaml` or `$HOME/goveal.yml` or `./goveal.yaml` and so on. -Most options that can be set via commandline flags can also be set via configuration file (actually all but -the `--config` switch does not make sense in the configuration file, does it? :wink:). It is more a convenience feature -to be able to set a theme and so on and so forth for the presentation without having to pass it every time as parameter. +The config allows setting a lot of options exposed by Reveal.js. +There are still a few missing, and I won't guarantee to support all options in the future. -Furthermore goveal supports configuration hot reloading i.e. you can play around with different themes and the rendered +Furthermore, `goveal` supports configuration hot reloading i.e. you can play around with different themes and the rendered theme will be changed whenever you hit the save button! See also an example at [`./examples/goveal.yaml`](./examples/goveal.yaml). +I try to keep the example up to date to cover **all** supported config options as kind of documentation. -### Custom CSS +## Markdown + +A good point to start is the [slides.md](examples/slides.md) in the `examples` directory. +I try to showcase everyting possible with `goveal` in this presentation. + +The most remarkable difference between `goveal` and the `marked` driven Reveal.js markdown is how line numbers in listings are working: + +Reveal.js: + +
    ```cs [1-2|3|4]
+var i = 10;
+for (var j = 0; j < i; j++) {
+    Console.WriteLine($"{j}");
+}
+```
    + +`goveal`: + +
    
+{line-numbers="1-2|3|4"}
+```cs
+var i = 10;
+for (var j = 0; j < i; j++) {
+    Console.WriteLine($"{j}");
+}
+```
    + +This is because the Markdown parser used in `goveal` currently does not support additional attributes for code blocks. + +## Custom CSS To add custom CSS as theme overrides use a config file and add the `stylesheets` property. It takes a list of relative ( mandatory!) paths to CSS files that are included automatacally after the page was loaded so that they really overload everything added by Reveal and plugins. -the sample configuration file [`./examples/goveal.yaml`](./examples/goveal.yaml) also contains a sample how to add -custom CSS. +Changes in the custom CSS files are monitored and propagated via SSE to the presentation immediately. +No page reload necessary! + +The sample configuration file [`./examples/goveal.yaml`](./examples/goveal.yaml) also contains a sample how to add +custom CSS. \ No newline at end of file diff --git a/build/docker/goveal.dockerfile b/build/docker/goveal.dockerfile new file mode 100644 index 0000000..15324f3 --- /dev/null +++ b/build/docker/goveal.dockerfile @@ -0,0 +1,9 @@ +FROM gcr.io/distroless/static:nonroot + +USER nonroot:nonroot + +COPY --chown=nonroot:nonroot goveal /app/goveal + +EXPOSE 2233 + +ENTRYPOINT ["/app/goveal"] \ No newline at end of file diff --git a/cmd/goveal/root.go b/cmd/goveal/root.go index 6ff78b2..dcad82e 100644 --- a/cmd/goveal/root.go +++ b/cmd/goveal/root.go @@ -49,5 +49,4 @@ It is not required to restart the server when you edit the markdown - a simple r func init() { rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.go-reveal-slides.yaml)") - rootCmd.PersistentFlags().StringVar(&workingDir, "working-dir", workingDir, "working directory to use") } diff --git a/cmd/goveal/serve.go b/cmd/goveal/serve.go index 3d94658..75ac618 100644 --- a/cmd/goveal/serve.go +++ b/cmd/goveal/serve.go @@ -24,7 +24,7 @@ import ( ) const ( - defaultListeningPort uint16 = 3000 + defaultListeningPort uint16 = 2233 defaultHost = "127.0.0.1" ) From 7eb4d67f95b500f871bf1e4197d431dd47c9689b Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Sun, 26 Dec 2021 11:58:59 +0100 Subject: [PATCH 08/16] Add golangci-lint as Github action --- .github/workflows/go.yml | 9 +++++- .github/workflows/golangci-lint.yml | 46 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/golangci-lint.yml diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 1f346ac..0cba7fb 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,6 +1,13 @@ name: Go -on: [ push, pull_request ] +on: + push: + tags: + - v* + branches: + - master + - main + pull_request: jobs: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml new file mode 100644 index 0000000..e2867e3 --- /dev/null +++ b/.github/workflows/golangci-lint.yml @@ -0,0 +1,46 @@ +name: golangci-lint +on: + push: + tags: + - v* + branches: + - master + - main + pull_request: +permissions: + contents: read + # Optional: allow read access to pull request. Use with `only-new-issues` option. + # pull-requests: read +jobs: + golangci: + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Task + uses: arduino/setup-task@v1 + - name: Download assets + run: task download-reveal + - name: golangci-lint + uses: golangci/golangci-lint-action@v2 + with: + # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version + version: latest + + # Optional: working directory, useful for monorepos + # working-directory: somedir + + # Optional: golangci-lint command line arguments. + # args: --issues-exit-code=0 + + # Optional: show only new issues if it's a pull request. The default value is `false`. + # only-new-issues: true + + # Optional: if set to true then the action will use pre-installed Go. + # skip-go-installation: true + + # Optional: if set to true then the action don't cache or restore ~/go/pkg. + # skip-pkg-cache: true + + # Optional: if set to true then the action don't cache or restore ~/.cache/go-build. + # skip-build-cache: true \ No newline at end of file From 234929e5ed3a64a03a054b5054ff5b27b1337df8 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 16 Feb 2022 08:58:49 +0100 Subject: [PATCH 09/16] Fix loading config from given path --- config/load.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/load.go b/config/load.go index 5c564b4..1cc0c3f 100644 --- a/config/load.go +++ b/config/load.go @@ -24,11 +24,11 @@ func Load(workingDir, configFile string) (cfg *Components, err error) { return nil, err } else { loader.AddConfigPath(home) + loader.AddConfigPath(workingDir) + loader.SetConfigName("goveal") + loader.SetConfigType("yaml") } - loader.AddConfigPath(workingDir) - loader.SetConfigName("goveal") - loader.SetConfigType("yaml") loader.AutomaticEnv() if err = loader.ReadInConfig(); err == nil { From 0637962da8dd9c42095e1bb83d61d227cb207af1 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 16 Feb 2022 09:50:07 +0100 Subject: [PATCH 10/16] Improve mermaid handling and update deps --- Taskfile.yml | 6 +++--- rendering/templates/mermaid.gohtml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 5891efb..a18cfc5 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -3,8 +3,8 @@ version: '3' vars: DEBUG_PORT: 2345 REVEALJS_VERSION: 4.2.1 - HIGHLIGHTJS_VERSION: 11.3.1 - MERMAID_VERSION: 8.13.6 + HIGHLIGHTJS_VERSION: 11.4.0 + MERMAID_VERSION: 8.14.0 BINARY_NAME: goveal OUT_DIR: ./out GO_BUILD_ARGS: -ldflags="-w -s" @@ -122,4 +122,4 @@ tasks: vars: PACKAGE: golang.org/x/tools/cmd/goimports@v0.1.7 status: - - test -f {{ .GOBIN }}goimports \ No newline at end of file + - test -f {{ .GOBIN }}goimports diff --git a/rendering/templates/mermaid.gohtml b/rendering/templates/mermaid.gohtml index 7f6228d..7c38c01 100644 --- a/rendering/templates/mermaid.gohtml +++ b/rendering/templates/mermaid.gohtml @@ -1,3 +1,3 @@
    - {{ .Code -}} -
    \ No newline at end of file + {{- .Code -}} + From e7942ebf15d84251b4b1e37fd832445ba4d3fca0 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 16 Feb 2022 14:18:08 +0100 Subject: [PATCH 11/16] Make content-root size configurable --- config/components.go | 9 +++++++++ web/js/app.js | 2 ++ 2 files changed, 11 insertions(+) diff --git a/config/components.go b/config/components.go index a7024c8..3ee50ef 100644 --- a/config/components.go +++ b/config/components.go @@ -1,8 +1,15 @@ package config +const ( + defaultWidth uint = 960 + defaultHeight uint = 700 +) + var defaults = map[string]interface{}{ "mermaid.theme": "forest", "theme": "beige", + "width": defaultWidth, + "height": defaultHeight, "codeTheme": "monokai", "verticalSeparator": `\*\*\*`, "horizontalSeparator": `---`, @@ -54,6 +61,8 @@ type ( History bool `json:"history"` Center bool `json:"center"` SlideNumber bool `json:"slideNumber"` + Width uint `json:"width"` + Height uint `json:"height"` Menu struct { Numbers bool `json:"numbers"` UseTextContentForMissingTitles bool `json:"useTextContentForMissingTitles"` diff --git a/web/js/app.js b/web/js/app.js index d60359f..c805b0a 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -39,6 +39,8 @@ async function initReveal() { center: cfg.center, slideNumber: cfg.slideNumber, transition: cfg.transition, + width: cfg.width, + height: cfg.height, hash: true, pdfSeparateFragments: false, menu: { From f18164d48cc1de63a21e92d730b4519fc4c2fea3 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Tue, 15 Mar 2022 14:53:24 +0100 Subject: [PATCH 12/16] Replace fiber with httprouter --- api/config.go | 27 ++++++++---- api/events.go | 87 +++++++++++++++++++++++--------------- api/no_cache_middleware.go | 16 +++---- api/reveal.go | 30 +++++++------ api/views.go | 83 +++++++++++++++++++++++++++--------- cmd/goveal/serve.go | 42 ++++++++---------- events/event_hub.go | 41 +++++++++--------- go.mod | 17 +++----- go.sum | 72 +++---------------------------- web/js/app.js | 9 ++-- 10 files changed, 217 insertions(+), 207 deletions(-) diff --git a/api/config.go b/api/config.go index 0402047..7972d95 100644 --- a/api/config.go +++ b/api/config.go @@ -1,7 +1,10 @@ package api import ( - "github.com/gofiber/fiber/v2" + "encoding/json" + "net/http" + + "github.com/julienschmidt/httprouter" "github.com/baez90/goveal/config" ) @@ -10,16 +13,24 @@ type ConfigAPI struct { cfg *config.Components } -func RegisterConfigAPI(app *fiber.App, cfg *config.Components) { +func RegisterConfigAPI(router *httprouter.Router, cfg *config.Components) { cfgAPI := &ConfigAPI{cfg: cfg} - app.Get("/api/v1/config/reveal", cfgAPI.RevealConfig) - app.Get("/api/v1/config/mermaid", cfgAPI.MermaidConfig) + router.GET("/api/v1/config/reveal", cfgAPI.RevealConfig) + router.GET("/api/v1/config/mermaid", cfgAPI.MermaidConfig) } -func (a *ConfigAPI) RevealConfig(ctx *fiber.Ctx) error { - return ctx.JSON(a.cfg.Reveal) +func (a *ConfigAPI) RevealConfig(writer http.ResponseWriter, _ *http.Request, _ httprouter.Params) { + writer.Header().Set("Content-Type", "application/json") + enc := json.NewEncoder(writer) + if err := enc.Encode(a.cfg.Reveal); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + } } -func (a *ConfigAPI) MermaidConfig(ctx *fiber.Ctx) error { - return ctx.JSON(a.cfg.Mermaid) +func (a *ConfigAPI) MermaidConfig(writer http.ResponseWriter, _ *http.Request, _ httprouter.Params) { + writer.Header().Set("Content-Type", "application/json") + enc := json.NewEncoder(writer) + if err := enc.Encode(a.cfg.Mermaid); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + } } diff --git a/api/events.go b/api/events.go index 8ebaca2..b2293d9 100644 --- a/api/events.go +++ b/api/events.go @@ -1,13 +1,14 @@ package api import ( - "bufio" + "bytes" "encoding/json" "errors" "fmt" + "net/http" "time" - "github.com/gofiber/fiber/v2" + "github.com/julienschmidt/httprouter" log "github.com/sirupsen/logrus" "github.com/baez90/goveal/events" @@ -25,50 +26,68 @@ func (h ContentEventHandler) OnEvent(ce events.ContentEvent) error { } } +func (h ContentEventHandler) Close() (err error) { + defer func() { + if rec := recover(); rec != nil { + err = fmt.Errorf("failed to close event handler: %v", rec) + } + }() + + close(h) + return +} + type Events struct { logger *log.Logger hub *events.EventHub } -func RegisterEventsAPI(app *fiber.App, hub *events.EventHub, logger *log.Logger) { +func RegisterEventsAPI(router *httprouter.Router, hub *events.EventHub, logger *log.Logger) { ev := &Events{hub: hub, logger: logger} - app.Get("/api/v1/events", ev.EventHandler) + router.GET("/api/v1/events", ev.EventHandler) + } -func (e *Events) EventHandler(fc *fiber.Ctx) error { +func (e *Events) EventHandler(writer http.ResponseWriter, req *http.Request, _ httprouter.Params) { + writer.Header().Set("Content-Type", "text/event-stream") + writer.Header().Set("Cache-Control", "no-cache") + writer.Header().Set("Connection", "keep-alive") + writer.Header().Set("Access-Control-Allow-Origin", "*") + writer.Header().Set("Transfer-Encoding", "chunked") + writer.Header().Set("Access-Control-Allow-Headers", "Cache-Control") + writer.Header().Set("Access-Control-Allow-Credentials", "true") + var ( - ctx = fc.Context() - handler = make(ContentEventHandler) - clientID, onError = e.hub.Subscribe(handler) + handler = make(ContentEventHandler) + clientID = e.hub.Subscribe(handler) + buf = new(bytes.Buffer) + enc = json.NewEncoder(buf) ) - ctx.SetContentType("text/event-stream") - ctx.Response.Header.Set("Cache-Control", "no-cache") - ctx.Response.Header.Set("Connection", "keep-alive") - ctx.Response.Header.Set("Transfer-Encoding", "chunked") - ctx.Response.Header.Set("Access-Control-Allow-Origin", "*") - ctx.Response.Header.Set("Access-Control-Allow-Headers", "Cache-Control") - ctx.Response.Header.Set("Access-Control-Allow-Credentials", "true") - - ctx.SetBodyStreamWriter(func(w *bufio.Writer) { - for ev := range handler { - if msg, err := json.Marshal(ev); err != nil { - e.logger.Errorf("Failed to marshal to JSON: %v", err) - continue - } else if _, err = fmt.Fprintf(w, "data: %s\n\n", string(msg)); err != nil { - e.logger.Errorf("Failed to write to client: %v", err) - continue - } else if err = w.Flush(); err != nil { - e.hub.Unsubscribe(clientID) - } - } - }) - - go func() { - for err := range onError { - e.logger.Errorf("Error while sending events to client: %v", err) + defer func() { + if err := e.hub.Unsubscribe(clientID); err != nil { + e.logger.Warnf("Error occurred while unsubscribing: %v", err) } }() - return nil + for { + select { + case ev := <-handler: + if err := enc.Encode(ev); err != nil { + e.logger.Errorf("Failed to marshal to JSON: %v", err) + continue + } else if _, err = fmt.Fprintf(writer, "data: %s\n\n", buf.String()); err != nil { + e.logger.Errorf("Failed to write to client: %v", err) + return + } else if f, ok := writer.(http.Flusher); !ok { + e.logger.Errorf("Cannot flush data") + writer.WriteHeader(http.StatusBadRequest) + return + } else { + f.Flush() + } + case <-req.Context().Done(): + return + } + } } diff --git a/api/no_cache_middleware.go b/api/no_cache_middleware.go index 15e43ca..a468c99 100644 --- a/api/no_cache_middleware.go +++ b/api/no_cache_middleware.go @@ -1,12 +1,12 @@ package api -import "github.com/gofiber/fiber/v2" +import ( + "net/http" +) -func NoCache(app *fiber.App) { - app.Use(NoCacheHandler) -} - -func NoCacheHandler(ctx *fiber.Ctx) error { - ctx.Response().Header.Set("Cache-Control", "no-cache") - return ctx.Next() +func NoCache(handler http.Handler) http.Handler { + return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) { + writer.Header().Set("Cache-Control", "no-cache") + handler.ServeHTTP(writer, request) + }) } diff --git a/api/reveal.go b/api/reveal.go index fed5133..3a51ef2 100644 --- a/api/reveal.go +++ b/api/reveal.go @@ -1,31 +1,33 @@ package api import ( + "io" "net/http" + "path" "strings" - - "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/middleware/filesystem" + "time" "github.com/baez90/goveal/assets" "github.com/baez90/goveal/fs" "github.com/baez90/goveal/web" ) -func RegisterStaticFileHandling(app *fiber.App, wdfs fs.FS) error { +func FileSystemMiddleware(fallthroughHandler http.Handler, wdfs fs.FS) http.Handler { layers := []fs.FS{wdfs} layers = append([]fs.FS{web.WebFS, assets.Assets}, layers...) layeredFS := fs.Layered{Layers: layers} - fsMiddleware := filesystem.New(filesystem.Config{ - Root: http.FS(layeredFS), - Next: func(c *fiber.Ctx) bool { - _, err := layeredFS.Open(strings.TrimLeft(c.Path(), "/")) - return err != nil - }, + return http.HandlerFunc(func(writer http.ResponseWriter, req *http.Request) { + reqPath := strings.TrimPrefix(req.URL.Path, "/") + if f, err := layeredFS.Open(reqPath); err != nil { + fallthroughHandler.ServeHTTP(writer, req) + return + } else if readSeeker, ok := f.(io.ReadSeeker); ok { + http.ServeContent(writer, req, path.Base(reqPath), time.Now(), readSeeker) + _ = f.Close() + } else { + _ = f.Close() + fallthroughHandler.ServeHTTP(writer, req) + } }) - - app.Use(fsMiddleware) - - return nil } diff --git a/api/views.go b/api/views.go index 7d6e792..230dbe8 100644 --- a/api/views.go +++ b/api/views.go @@ -1,56 +1,99 @@ package api import ( + "encoding/hex" + "hash/fnv" + "html/template" "io" + "net/http" + "path" - "github.com/gofiber/fiber/v2" + "github.com/Masterminds/sprig/v3" + "github.com/julienschmidt/httprouter" + log "github.com/sirupsen/logrus" "go.uber.org/multierr" "github.com/baez90/goveal/config" "github.com/baez90/goveal/fs" "github.com/baez90/goveal/rendering" + "github.com/baez90/goveal/web" ) +var indexTmpl *template.Template + +func init() { + if t, err := template. + New("index"). + Funcs(sprig.FuncMap()). + Funcs(map[string]interface{}{ + "fileId": func(fileName string) string { + h := fnv.New32a() + return hex.EncodeToString(h.Sum([]byte(path.Base(fileName)))) + }, + }). + ParseFS(web.WebFS, "*.gohtml"); err != nil { + panic(err) + } else { + indexTmpl = t + } +} + type Views struct { + logger *log.Logger cfg *config.Components wdfs fs.FS mdFilepath string } -func RegisterViews(app *fiber.App, wdfs fs.FS, mdFilepath string, cfg *config.Components) { - p := &Views{cfg: cfg, wdfs: wdfs, mdFilepath: mdFilepath} - app.Get("/", p.IndexPage) - app.Get("/index.html", p.IndexPage) - app.Get("/index.htm", p.IndexPage) - app.Get("/slides", p.RenderedMarkdown) +func RegisterViews(router *httprouter.Router, logger *log.Logger, wdfs fs.FS, mdFilepath string, cfg *config.Components) { + p := &Views{ + logger: logger, + cfg: cfg, + wdfs: wdfs, + mdFilepath: mdFilepath, + } + router.GET("/", p.IndexPage) + router.GET("/index.html", p.IndexPage) + router.GET("/index.htm", p.IndexPage) + router.GET("/slides", p.RenderedMarkdown) } -func (p *Views) IndexPage(ctx *fiber.Ctx) error { - return ctx.Render("index", fiber.Map{ +func (p *Views) IndexPage(writer http.ResponseWriter, _ *http.Request, _ httprouter.Params) { + writer.Header().Set("Content-Type", "text/html") + if err := indexTmpl.ExecuteTemplate(writer, "index.gohtml", map[string]interface{}{ "Reveal": p.cfg.Reveal, "Rendering": p.cfg.Rendering, - }) + }); err != nil { + p.logger.Errorf("Failed to render template: %v", err) + writer.WriteHeader(http.StatusInternalServerError) + _, _ = writer.Write([]byte(err.Error())) + } } -func (p *Views) RenderedMarkdown(ctx *fiber.Ctx) (err error) { +func (p *Views) RenderedMarkdown(writer http.ResponseWriter, _ *http.Request, _ httprouter.Params) { f, err := p.wdfs.Open(p.mdFilepath) if err != nil { - return err + writer.WriteHeader(http.StatusInternalServerError) + _, _ = writer.Write([]byte(err.Error())) + return } defer multierr.AppendInvoke(&err, multierr.Close(f)) data, err := io.ReadAll(f) if err != nil { - return err + writer.WriteHeader(http.StatusInternalServerError) + _, _ = writer.Write([]byte(err.Error())) + return } + writer.Header().Set("Content-Type", "text/html") var rendered []byte if rendered, err = rendering.ToHTML(string(data), p.cfg.Rendering); err != nil { - return err - } else if _, err = ctx.Write(rendered); err != nil { - return err + writer.WriteHeader(http.StatusInternalServerError) + _, _ = writer.Write([]byte(err.Error())) + return + } else if _, err = writer.Write(rendered); err != nil { + writer.WriteHeader(http.StatusInternalServerError) + _, _ = writer.Write([]byte(err.Error())) + return } - - ctx.Append(fiber.HeaderContentType, fiber.MIMETextHTML) - - return err } diff --git a/cmd/goveal/serve.go b/cmd/goveal/serve.go index 75ac618..5a8062e 100644 --- a/cmd/goveal/serve.go +++ b/cmd/goveal/serve.go @@ -1,17 +1,15 @@ package main import ( - "encoding/hex" + "errors" "fmt" "hash/fnv" "net/http" "os/exec" - "path" "path/filepath" "runtime" - "github.com/gofiber/fiber/v2" - "github.com/gofiber/template/html" + "github.com/julienschmidt/httprouter" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.uber.org/multierr" @@ -20,7 +18,6 @@ import ( "github.com/baez90/goveal/config" "github.com/baez90/goveal/events" "github.com/baez90/goveal/fs" - "github.com/baez90/goveal/web" ) const ( @@ -52,31 +49,22 @@ var ( } _ = mdFile.Close() - app := fiber.New(fiber.Config{ - Views: html.NewFileSystem(http.FS(web.WebFS), ".gohtml"). - AddFunc("fileId", func(fileName string) string { - h := fnv.New32a() - return hex.EncodeToString(h.Sum([]byte(path.Base(fileName)))) - }), - AppName: "goveal", - GETOnly: true, - DisableStartupMessage: true, - StreamRequestBody: true, - }) + router := httprouter.New() + hub := events.NewEventHub( + log.StandardLogger(), wdfs, fnv.New32a(), events.MutationReloadForFile(args[0]), events.MutationConfigReloadForFile(filepath.Base(cfg.ConfigFileInUse)), ) - api.NoCache(app) - api.RegisterViews(app, wdfs, args[0], cfg) - api.RegisterEventsAPI(app, hub, log.StandardLogger()) - api.RegisterConfigAPI(app, cfg) - if err := api.RegisterStaticFileHandling(app, wdfs); err != nil { - return err - } + api.RegisterViews(router, log.StandardLogger(), wdfs, args[0], cfg) + api.RegisterEventsAPI(router, hub, log.StandardLogger()) + api.RegisterConfigAPI(router, cfg) + + handler := api.FileSystemMiddleware(router, wdfs) + handler = api.NoCache(handler) if openBrowser { log.Info("Opening browser...") @@ -84,7 +72,13 @@ var ( } log.Infof("Listening on %s:%d", host, port) - return app.Listen(fmt.Sprintf("%s:%d", host, port)) + if err := http.ListenAndServe(fmt.Sprintf("%s:%d", host, port), handler); err != nil { + if errors.Is(err, http.ErrServerClosed) { + return nil + } + return err + } + return nil }, } ) diff --git a/events/event_hub.go b/events/event_hub.go index 9458eee..cedfc04 100644 --- a/events/event_hub.go +++ b/events/event_hub.go @@ -12,6 +12,7 @@ import ( "sync" "github.com/google/uuid" + log "github.com/sirupsen/logrus" "github.com/baez90/goveal/fs" ) @@ -38,18 +39,15 @@ type ( } EventHandler interface { OnEvent(ev ContentEvent) error + Close() error } - EventHandlerFunc func(ev ContentEvent) error - subscription struct { - EventHandler - OnError chan error - } + EventHandlerFunc func(ev ContentEvent) error MutationReloadForFile string MutationConfigReloadForFile string ) func (t MutationReloadForFile) OnEvent(in ContentEvent, ev fs.Event) (out ContentEvent) { - if strings.EqualFold(filepath.Base(ev.File), string(t)) { + if strings.EqualFold(filepath.Base(ev.File), filepath.Base(string(t))) { in.ForceReload = true } return in @@ -66,12 +64,13 @@ func (f EventHandlerFunc) OnEvent(ev ContentEvent) error { return f(ev) } -func NewEventHub(eventSource EventSource, fileNameHash hash.Hash, mutations ...EventMutation) *EventHub { +func NewEventHub(logger *log.Logger, eventSource EventSource, fileNameHash hash.Hash, mutations ...EventMutation) *EventHub { hub := &EventHub{ + Logger: logger, FileNameHash: fileNameHash, mutations: mutations, source: eventSource, - subscriptions: make(map[uuid.UUID]*subscription), + subscriptions: make(map[uuid.UUID]EventHandler), done: make(chan struct{}), } @@ -82,31 +81,35 @@ func NewEventHub(eventSource EventSource, fileNameHash hash.Hash, mutations ...E type EventHub struct { FileNameHash hash.Hash + Logger *log.Logger mutations []EventMutation lock sync.RWMutex done chan struct{} source EventSource - subscriptions map[uuid.UUID]*subscription + subscriptions map[uuid.UUID]EventHandler } -func (h *EventHub) Subscribe(handler EventHandler) (id uuid.UUID, onError <-chan error) { +func (h *EventHub) Subscribe(handler EventHandler) (id uuid.UUID) { h.lock.Lock() defer h.lock.Unlock() - s := &subscription{ - EventHandler: handler, - OnError: make(chan error), - } clientID := uuid.New() - h.subscriptions[clientID] = s + h.subscriptions[clientID] = handler - return clientID, s.OnError + return clientID } -func (h *EventHub) Unsubscribe(id uuid.UUID) { +func (h *EventHub) Unsubscribe(id uuid.UUID) (err error) { h.lock.Lock() defer h.lock.Unlock() - delete(h.subscriptions, id) + + if handler, ok := h.subscriptions[id]; ok { + err = handler.Close() + delete(h.subscriptions, id) + return err + } + + return nil } func (h *EventHub) Close() error { @@ -147,7 +150,7 @@ func (h *EventHub) notifySubscribers(ev fs.Event) { for _, handler := range h.subscriptions { if err := handler.OnEvent(ce); err != nil { - handler.OnError <- err + h.Logger.Errorf("Failed to propagate event: %v", err) } } } diff --git a/go.mod b/go.mod index 2669311..7059281 100644 --- a/go.mod +++ b/go.mod @@ -5,29 +5,29 @@ go 1.17 require ( github.com/Masterminds/sprig/v3 v3.2.2 github.com/fsnotify/fsnotify v1.5.1 - github.com/gofiber/fiber/v2 v2.22.0 - github.com/gofiber/template v1.6.19 github.com/gomarkdown/markdown v0.0.0-20211203165214-0d698b49fbb4 github.com/google/uuid v1.3.0 + github.com/julienschmidt/httprouter v1.3.0 github.com/mitchellh/go-homedir v1.1.0 github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.3.0 github.com/spf13/viper v1.10.1 + go.uber.org/multierr v1.7.0 ) require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.1.1 // indirect - github.com/andybalholm/brotli v1.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/huandu/xstrings v1.3.2 // indirect - github.com/imdario/mergo v0.3.11 // indirect + github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/klauspost/compress v1.13.4 // indirect + github.com/kr/text v0.2.0 // indirect github.com/magiconair/properties v1.8.5 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/shopspring/decimal v1.2.0 // indirect github.com/spf13/afero v1.6.0 // indirect @@ -35,14 +35,11 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.2.0 // indirect - github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.31.0 // indirect - github.com/valyala/tcplisten v1.0.0 // indirect go.uber.org/atomic v1.9.0 // indirect - go.uber.org/multierr v1.7.0 // indirect - golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect + golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 // indirect golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d // indirect golang.org/x/text v0.3.7 // indirect + gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 133d9da..1e54911 100644 --- a/go.sum +++ b/go.sum @@ -35,7 +35,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= @@ -49,12 +48,7 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= 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/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= -github.com/CloudyKit/jet/v6 v6.1.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/Joker/hpp v0.0.0-20180418125244-6893e659854a/go.mod h1:MzD2WMdSxvbHw5fM/OXOFily/lipJWRc9C1px0Mt0ZE= -github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= -github.com/Joker/jade v1.0.0/go.mod h1:efZIdO0py/LtcJRSa/j2WEklMSAw84WV0zZVMxNToB8= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= @@ -66,21 +60,16 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy 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/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E= -github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= 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-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aymerick/raymond v2.0.2+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= 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/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/cbroglie/mustache v1.3.0/go.mod h1:w58RIHjw/L7DPyRX2CcCTduNmcP1dvztaHP72ciSfh0= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -104,13 +93,11 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -125,8 +112,6 @@ github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -139,10 +124,6 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofiber/fiber/v2 v2.22.0 h1:+iyKK4ooDH6z0lAHdaWO1AFIB/DZ9AVo6vz8VZIA0EU= -github.com/gofiber/fiber/v2 v2.22.0/go.mod h1:MR1usVH3JHYRyQwMe2eZXRSZHRX38fkV+A7CPB+DlDQ= -github.com/gofiber/template v1.6.19 h1:Qc2oePYcfG0QTp9MKJA+ivVC2lXVdqY6Ue7gZMU3PQU= -github.com/gofiber/template v1.6.19/go.mod h1:EO3L5FvrKkU8JtmINciPNwWIeA0cmzjdb6n/pdmypIM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -221,11 +202,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -239,26 +217,21 @@ github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= 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.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/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/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/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -267,8 +240,9 @@ github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -277,12 +251,11 @@ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/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/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s= -github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -306,25 +279,19 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-slim v0.0.0-20200618151855-bde33eecb5ee/go.mod h1:ma9TUJeni8LGZMJvOwbAv/FOwiwqIMQN570LnpqCBSM= 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/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.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/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= @@ -340,7 +307,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -364,20 +330,16 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -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 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -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/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= @@ -385,14 +347,12 @@ github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= @@ -408,23 +368,13 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.31.0 h1:lrauRLII19afgCs2fnWRJ4M5IkV0lo2FqA61uGkNBfE= -github.com/valyala/fasthttp v1.31.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= -github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= -github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -451,10 +401,9 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 h1:L8CkJyVoa0/NslN3RUMLgasK5+KatNvyRGQ9QyCYAfc= +golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -495,11 +444,9 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -533,7 +480,6 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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= @@ -546,7 +492,6 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= @@ -582,7 +527,6 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -652,7 +596,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 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-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -663,7 +606,6 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -727,7 +669,6 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= @@ -857,7 +798,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/web/js/app.js b/web/js/app.js index c805b0a..c27d7e0 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -89,13 +89,13 @@ async function initMermaid() { } function subscribeToEvents() { - let source = new EventSource("/api/v1/events"); + let eventSource = new EventSource("/api/v1/events"); - source.onopen = (() => { + eventSource.onopen = (() => { console.debug("eventsource connection open"); }) - source.onerror = (ev => { + eventSource.onerror = (ev => { if (ev.target.readyState === 0) { console.debug("reconnecting to eventsource"); } else { @@ -103,10 +103,11 @@ function subscribeToEvents() { } }) - source.onmessage = (ev => { + eventSource.onmessage = (ev => { let obj = JSON.parse(ev.data); switch (true) { case obj.forceReload: + eventSource.close() window.location.reload() break case obj.reloadConfig: From 21e41b0bcf135bac059b0043c26f33212618a200 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Tue, 15 Mar 2022 15:44:53 +0100 Subject: [PATCH 13/16] Add emoji support --- .gitignore | 3 + Taskfile.yml | 1 + api/events.go | 1 - go.mod | 14 +- go.sum | 358 +++----------------------------- rendering/emoji/emoji.go | 32 +++ rendering/emoji/emoji_parser.go | 109 ++++++++++ rendering/templates.go | 5 + web/css/site.css | 7 + web/index.gohtml | 1 + web/web.go | 2 +- 11 files changed, 195 insertions(+), 338 deletions(-) create mode 100644 rendering/emoji/emoji.go create mode 100644 rendering/emoji/emoji_parser.go create mode 100644 web/css/site.css diff --git a/.gitignore b/.gitignore index 8025e3f..0c477dc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ *.so *.dylib +emoji.json + # Test binary, build with `go test -c` *.test @@ -23,6 +25,7 @@ bin/ assets/reveal/ assets/mermaid/ +assets/twemoji/ pkged.go diff --git a/Taskfile.yml b/Taskfile.yml index a18cfc5..a610b9d 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -99,6 +99,7 @@ tasks: - rm -f ./assets/reveal/plugin/menu/{bower.json,CONTRIBUTING.md,LICENSE,package.json,README.md,.gitignore,gulpfile.js,package-lock.json} - curl -L https://github.com/highlightjs/highlight.js/archive/{{ .HIGHLIGHTJS_VERSION }}.tar.gz | tar -xvz --strip-components=3 -C ./assets/reveal/plugin/highlight --wildcards "*.css" highlight.js-{{ .HIGHLIGHTJS_VERSION }}/src/styles/ - curl -L https://registry.npmjs.org/mermaid/-/mermaid-{{ .MERMAID_VERSION }}.tgz | tar -xvz -C ./assets/mermaid/ package/dist --strip-components=2 + - curl -L -o rendering/emoji/emoji.json https://raw.githubusercontent.com/muan/emojilib/main/dist/emoji-en-US.json go-get-tool: vars: diff --git a/api/events.go b/api/events.go index b2293d9..4b95879 100644 --- a/api/events.go +++ b/api/events.go @@ -45,7 +45,6 @@ type Events struct { func RegisterEventsAPI(router *httprouter.Router, hub *events.EventHub, logger *log.Logger) { ev := &Events{hub: hub, logger: logger} router.GET("/api/v1/events", ev.EventHandler) - } func (e *Events) EventHandler(writer http.ResponseWriter, req *http.Request, _ httprouter.Params) { diff --git a/go.mod b/go.mod index 7059281..652bed6 100644 --- a/go.mod +++ b/go.mod @@ -5,14 +5,14 @@ go 1.17 require ( github.com/Masterminds/sprig/v3 v3.2.2 github.com/fsnotify/fsnotify v1.5.1 - github.com/gomarkdown/markdown v0.0.0-20211203165214-0d698b49fbb4 + github.com/gomarkdown/markdown v0.0.0-20220310201231-552c6011c0b8 github.com/google/uuid v1.3.0 github.com/julienschmidt/httprouter v1.3.0 github.com/mitchellh/go-homedir v1.1.0 github.com/sirupsen/logrus v1.8.1 - github.com/spf13/cobra v1.3.0 + github.com/spf13/cobra v1.4.0 github.com/spf13/viper v1.10.1 - go.uber.org/multierr v1.7.0 + go.uber.org/multierr v1.8.0 ) require ( @@ -23,23 +23,23 @@ require ( github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/kr/text v0.2.0 // indirect - github.com/magiconair/properties v1.8.5 // indirect + github.com/magiconair/properties v1.8.6 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/shopspring/decimal v1.2.0 // indirect - github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.2.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 // indirect - golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d // indirect + golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect golang.org/x/text v0.3.7 // indirect gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect - gopkg.in/ini.v1 v1.66.2 // indirect + gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 1e54911..c7139fe 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -15,18 +16,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -35,7 +25,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -45,54 +34,24 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= 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/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -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/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -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-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -103,34 +62,16 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -138,8 +79,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= 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= @@ -154,12 +93,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomarkdown/markdown v0.0.0-20211203165214-0d698b49fbb4 h1:hue2D68UuAO4besRdtrQ+/i2npAF2WMbCMU5MLhYmOo= -github.com/gomarkdown/markdown v0.0.0-20211203165214-0d698b49fbb4/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= +github.com/gomarkdown/markdown v0.0.0-20220310201231-552c6011c0b8 h1:YVvt637ygnOO9qjLBVmPOvrUmCz/i8YECSu/8UlOQW0= +github.com/gomarkdown/markdown v0.0.0-20220310201231-552c6011c0b8/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= 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= @@ -170,15 +105,10 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -188,11 +118,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -200,44 +126,14 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1/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-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= -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/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= 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/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= @@ -245,163 +141,89 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -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/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.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/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -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/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -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/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/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/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -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 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= 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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -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= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 h1:L8CkJyVoa0/NslN3RUMLgasK5+KatNvyRGQ9QyCYAfc= golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -427,7 +249,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -438,12 +259,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= 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-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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -451,11 +268,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-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-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -472,15 +287,9 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -490,14 +299,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= 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= @@ -508,33 +309,21 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-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-20181026203630-95b1ffbd15a5/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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -552,30 +341,12 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/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-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d h1:1oIt9o40TWWI9FUaveVpUvBe13FNqBNVXy3ue2fcfkw= -golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -583,8 +354,6 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -603,7 +372,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -628,7 +396,6 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -637,13 +404,8 @@ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/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/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -667,19 +429,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -710,7 +459,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -722,34 +470,8 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -763,21 +485,9 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -788,24 +498,14 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= +gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/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= diff --git a/rendering/emoji/emoji.go b/rendering/emoji/emoji.go new file mode 100644 index 0000000..61db95a --- /dev/null +++ b/rendering/emoji/emoji.go @@ -0,0 +1,32 @@ +package emoji + +import ( + _ "embed" + "encoding/json" +) + +func isValidEmoji(input []byte) bool { + _, exists := emojiMap[string(input)] + return exists +} + +var ( + //go:embed emoji.json + emojiMapRaw []byte + + emojiMap map[string]string +) + +func init() { + rawMap := make(map[string][]string) + if err := json.Unmarshal(emojiMapRaw, &rawMap); err != nil { + panic(err) + } + + emojiMap = make(map[string]string, len(rawMap)) + for emoji, keywords := range rawMap { + for i := range keywords { + emojiMap[keywords[i]] = emoji + } + } +} diff --git a/rendering/emoji/emoji_parser.go b/rendering/emoji/emoji_parser.go new file mode 100644 index 0000000..fb71458 --- /dev/null +++ b/rendering/emoji/emoji_parser.go @@ -0,0 +1,109 @@ +package emoji + +import ( + "bytes" + "fmt" + "strconv" + "strings" + "unicode/utf8" + + "github.com/gomarkdown/markdown/ast" +) + +func NewEmojiParser() *EmojiParser { + return &EmojiParser{ + seen: make(map[string]bool), + } +} + +// Node is a node containing an emoji +type Node struct { + ast.Leaf +} + +type EmojiParser struct { + seen map[string]bool +} + +func (p *EmojiParser) EmojiParser(data []byte) (parsedNode ast.Node, result []byte, newLength int) { + if p.seen[string(data)] { + // Already processed + return nil, nil, 0 + } + if bytes.Contains(data, []byte("class=\"emoji\"")) { + // Already processed + return nil, nil, 0 + } + dataLen := len(data) + if dataLen <= 1 { + // Not long enough to be an emoji + return nil, nil, 0 + } + if bytes.IndexByte(data, ':') == -1 { + // No emoji delimiters + return nil, nil, 0 + } + // Translate emojis to HTML + resData := make([]byte, 0) + startIndex := bytes.IndexByte(data, ':') + resData = append(resData, data[0:startIndex]...) + for { + if startIndex >= len(data) { + // Done + break + } + endIndex := bytes.IndexByte(data[startIndex+1:], ':') + startIndex + 1 + if endIndex > startIndex { + name := string(data[startIndex+1 : endIndex]) + if isValidEmoji([]byte(name)) { + startIndex = endIndex + 1 + url := fmt.Sprintf(`:%s:`, GenerateEmojiURL(name), name) + resData = append(resData, []byte(url)...) + } else { + resData = append(resData, data[startIndex:endIndex]...) + startIndex = endIndex + } + if startIndex == dataLen { + break + } + } else { + break + } + } + if startIndex < dataLen { + resData = append(resData, data[startIndex:]...) + } + + if !bytes.Contains(resData, []byte("class=\"emoji\"")) { + // Processed with no changes + p.seen[string(resData)] = true + } + + return &ast.Softbreak{}, resData, dataLen +} + +func GenerateEmojiURL(emoji string) string { + code, exists := emojiMap[emoji] + if !exists { + return "" + } + res := "" + chars := utf8.RuneCountInString(code) + curChar := 1 + for _, c := range code { + tmp := strings.Trim(strings.ToLower(strconv.QuoteRuneToASCII(c)), "'") + if tmp != `\ufe0f` || (chars > 2 && curChar == chars) { + // Valid character to add + if curChar > 1 { + res += "-" + } + if len(tmp) == 1 { + res += fmt.Sprintf("%x", []byte(tmp)) + } else { + res += strings.TrimLeft(tmp[2:], "0") + } + } + curChar++ + } + return fmt.Sprintf("https://twemoji.maxcdn.com/2/svg/%s.svg", res) +} diff --git a/rendering/templates.go b/rendering/templates.go index 492220a..4c56c0a 100644 --- a/rendering/templates.go +++ b/rendering/templates.go @@ -11,6 +11,8 @@ import ( "github.com/gomarkdown/markdown" mdhtml "github.com/gomarkdown/markdown/html" "github.com/gomarkdown/markdown/parser" + + "github.com/baez90/goveal/rendering/emoji" ) var ( @@ -32,7 +34,10 @@ func init() { rr := &RevealRenderer{ Hash: fnv.New32a(), } + + emojis := emoji.NewEmojiParser() mdParser := parser.NewWithExtensions(parserExtensions) + mdParser.Opts.ParserHook = emojis.EmojiParser renderer := mdhtml.NewRenderer(mdhtml.RendererOptions{ Flags: mdhtml.CommonFlags | mdhtml.HrefTargetBlank, RenderNodeHook: rr.RenderHook, diff --git a/web/css/site.css b/web/css/site.css new file mode 100644 index 0000000..a9b3c3c --- /dev/null +++ b/web/css/site.css @@ -0,0 +1,7 @@ +img.emoji { + cursor: pointer; + height: 1em; + width: 1em; + margin: 0 .05em 0 .1em; + vertical-align: -0.1em; +} \ No newline at end of file diff --git a/web/index.gohtml b/web/index.gohtml index 7ede00d..a462be1 100644 --- a/web/index.gohtml +++ b/web/index.gohtml @@ -6,6 +6,7 @@ goveal + diff --git a/web/web.go b/web/web.go index 495868e..2a4332c 100644 --- a/web/web.go +++ b/web/web.go @@ -2,5 +2,5 @@ package web import "embed" -//go:embed js/* index.gohtml +//go:embed js/* css/* index.gohtml var WebFS embed.FS From 466534532649bb96d87951addc530dc7fcd20e9a Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Tue, 15 Mar 2022 16:35:16 +0100 Subject: [PATCH 14/16] Update actions/checkout action to v3 --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 0cba7fb..0621091 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -23,7 +23,7 @@ jobs: id: go - name: Check out code into the Go module directory - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: lfs: true From 424618ced37e261738a6f1729596ed1d4ffe9617 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Tue, 15 Mar 2022 16:39:47 +0100 Subject: [PATCH 15/16] Rename download task --- .github/workflows/go.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- Taskfile.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 0621091..09e1ba3 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -31,7 +31,7 @@ jobs: uses: arduino/setup-task@v1 - name: Build & test - run: task download-reveal test + run: task download-assets test - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index e2867e3..4ecb096 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -20,7 +20,7 @@ jobs: - name: Install Task uses: arduino/setup-task@v1 - name: Download assets - run: task download-reveal + run: task download-assets - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: diff --git a/Taskfile.yml b/Taskfile.yml index a610b9d..bb56878 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -86,7 +86,7 @@ tasks: cmds: - goreleaser --snapshot --skip-publish --rm-dist - download-reveal: + download-assets: sources: - Taskfile.yml cmds: From 1582460b28ff85da8adf3bd6ab86c4ad528da250 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Tue, 15 Mar 2022 17:05:47 +0100 Subject: [PATCH 16/16] Add emoji section to Readme --- README.md | 17 ++++++++++++----- Taskfile.yml | 8 +++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9d80596..e9ea545 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,14 @@ [![Actions Status](https://github.com/baez90/goveal/workflows/Go/badge.svg)](https://github.com/baez90/goveal/actions) Goveal is very small and very simple tool that reads Markdown from a given file, renders it into an HTML template and serves it as local HTTP server. -Right now Goveal uses Reveal.js 4.2.1 to create presentations and therefore also includes all features of Reveal.js 4.2.1. +Right now Goveal uses Reveal.js 4.3.0 to create presentations and therefore also includes all features of Reveal.js. In contrary to Reveal.js `goveal` ships with its own Markdown parser and renderer which is why some features are working slightly different from Reveal.js. See [Markdown](#markdown) for further details. Besides all features from Reveal.js `goveal` comes with first class support for [mermaid-js](https://mermaid-js.github.io/). Just inline your diagrams as code and enjoy! +An example can be found in the [examples](examples/slides.md). ## Install @@ -42,7 +43,7 @@ goveal serve ./slides.md ``` | Param | Description | Default value | -| ---------------- | --------------------------------------------- | ----------------------- | +|------------------|-----------------------------------------------|-------------------------| | `--host` | Hostname the binary is listening on | `127.0.0.1` | | `--port` | Port the binary is listening on | `2233` | | `--config` | Path to the config file see [config](#config) | `$HOME/goveal:./goveal` | @@ -58,7 +59,7 @@ this: podman/docker run --rm -ti -v `pwd`:/work -w /work -p 2233:2233 ghcr.io/baez90/goveal:0 serve --host 0.0.0.0 slides.md ``` -By default `goveal` only listens on `127.0.0.1`. To allow traffic from outside of the container you've to change the +By default `goveal` only listens on `127.0.0.1`. To allow traffic from outside the container you've to change the binding to `0.0.0.0`. ## Config @@ -78,7 +79,7 @@ I try to keep the example up to date to cover **all** supported config options a ## Markdown A good point to start is the [slides.md](examples/slides.md) in the `examples` directory. -I try to showcase everyting possible with `goveal` in this presentation. +I try to showcase everything possible with `goveal` in this presentation. The most remarkable difference between `goveal` and the `marked` driven Reveal.js markdown is how line numbers in listings are working: @@ -114,4 +115,10 @@ Changes in the custom CSS files are monitored and propagated via SSE to the pres No page reload necessary! The sample configuration file [`./examples/goveal.yaml`](./examples/goveal.yaml) also contains a sample how to add -custom CSS. \ No newline at end of file +custom CSS. + +## Emojis + +Aside of UTF character emojis `goveal` also supports emoji references like Github flavored markdown supports them. +For example`:winking_face:` becomes :winking_face: . +All supported keywords can be found [here](https://unpkg.com/emojilib@latest). \ No newline at end of file diff --git a/Taskfile.yml b/Taskfile.yml index bb56878..9a9bc46 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -2,8 +2,8 @@ version: '3' vars: DEBUG_PORT: 2345 - REVEALJS_VERSION: 4.2.1 - HIGHLIGHTJS_VERSION: 11.4.0 + REVEALJS_VERSION: 4.3.0 + HIGHLIGHTJS_VERSION: 11.5.0 MERMAID_VERSION: 8.14.0 BINARY_NAME: goveal OUT_DIR: ./out @@ -33,6 +33,8 @@ tasks: - "{{ .GOBIN }}goimports -w -local github.com/baez90/goveal ./." deps: + deps: + - download-assets sources: - go.mod - go.sum @@ -99,7 +101,7 @@ tasks: - rm -f ./assets/reveal/plugin/menu/{bower.json,CONTRIBUTING.md,LICENSE,package.json,README.md,.gitignore,gulpfile.js,package-lock.json} - curl -L https://github.com/highlightjs/highlight.js/archive/{{ .HIGHLIGHTJS_VERSION }}.tar.gz | tar -xvz --strip-components=3 -C ./assets/reveal/plugin/highlight --wildcards "*.css" highlight.js-{{ .HIGHLIGHTJS_VERSION }}/src/styles/ - curl -L https://registry.npmjs.org/mermaid/-/mermaid-{{ .MERMAID_VERSION }}.tgz | tar -xvz -C ./assets/mermaid/ package/dist --strip-components=2 - - curl -L -o rendering/emoji/emoji.json https://raw.githubusercontent.com/muan/emojilib/main/dist/emoji-en-US.json + - curl -L -o rendering/emoji/emoji.json https://unpkg.com/emojilib@latest go-get-tool: vars: