From 6253e9bdd62759ae9aaf0437062b57cda95da0ff Mon Sep 17 00:00:00 2001 From: revett <2796074+revett@users.noreply.github.com> Date: Wed, 7 Sep 2022 23:38:14 +0100 Subject: [PATCH 1/4] Bump to v0.8.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a3df0a6..6f4eebd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.0 +0.8.1 From 4935d7a7dfabfb70570ef9580cde7d568399cb5e Mon Sep 17 00:00:00 2001 From: revett <2796074+revett@users.noreply.github.com> Date: Wed, 7 Sep 2022 23:38:33 +0100 Subject: [PATCH 2/4] Check if err is not nil before returning it within completion command --- internal/cmd/completion.go | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/internal/cmd/completion.go b/internal/cmd/completion.go index 2687dea..129881e 100644 --- a/internal/cmd/completion.go +++ b/internal/cmd/completion.go @@ -24,20 +24,24 @@ func Completion() *cobra.Command { func completionRunE(c *cobra.Command, args []string) error { switch args[0] { case "bash": - err := Root().GenBashCompletion(os.Stdout) - return fmt.Errorf("failed to generate bash completion: %w", err) + if err := Root().GenBashCompletion(os.Stdout); err != nil { + return fmt.Errorf("failed to generate bash completion: %w", err) + } case "fish": - err := Root().GenFishCompletion(os.Stdout, true) - return fmt.Errorf("failed to generate fish completion: %w", err) + if err := Root().GenFishCompletion(os.Stdout, true); err != nil { + return fmt.Errorf("failed to generate fish completion: %w", err) + } case "powershell": - err := Root().GenPowerShellCompletionWithDesc(os.Stdout) - return fmt.Errorf("failed to generate powershell completion: %w", err) + if err := Root().GenPowerShellCompletionWithDesc(os.Stdout); err != nil { + return fmt.Errorf("failed to generate powershell completion: %w", err) + } case "zsh": - err := Root().GenZshCompletion(os.Stdout) - return fmt.Errorf("failed to generate zsh completion: %w", err) - default: - return nil + if err := Root().GenZshCompletion(os.Stdout); err != nil { + return fmt.Errorf("failed to generate zsh completion: %w", err) + } } + + return nil } func completionLong(rootName string) string { From a650b86bf8709915b60f0e276a1d932e101be15e Mon Sep 17 00:00:00 2001 From: revett <2796074+revett@users.noreply.github.com> Date: Wed, 7 Sep 2022 23:38:55 +0100 Subject: [PATCH 3/4] Remove duplicate log line --- internal/note/note.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/note/note.go b/internal/note/note.go index 0258415..c939a11 100644 --- a/internal/note/note.go +++ b/internal/note/note.go @@ -50,7 +50,6 @@ func NewNote(noteSchema string) (Note, error) { } if errs := validate.NewFilenameValidator().Validate(note.Filename); errs != nil { - log.Info().Msgf("creating note: %s", filename) return Note{}, fmt.Errorf("note filename validation failed: %v", errs) } From 749c9a93941c2714c9baaea8a9b29a39f8da5931 Mon Sep 17 00:00:00 2001 From: revett <2796074+revett@users.noreply.github.com> Date: Wed, 7 Sep 2022 23:39:10 +0100 Subject: [PATCH 4/4] Fix v1.19 Go issue where gofmt linting error was being raised due to bullet points in comment not being indented --- internal/validate/filename.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/validate/filename.go b/internal/validate/filename.go index 7426e2c..5cc1249 100644 --- a/internal/validate/filename.go +++ b/internal/validate/filename.go @@ -21,11 +21,11 @@ func NewFilenameValidator() filenameValidator { //nolint:revive // Validate implements the validate.Validator.Valid() interface. It carries out // a number of checks: -// - If the file extension is correct -// - Has a valid base schema (e.g. "area" from "area.language.go.error") -// - If the filename matches a combined kebab-case dot notation -// (e.g. "area.languagego.error-handling.md") -// - If the filename has the required number of parts (e.g. not "area.md"). +// - If the file extension is correct +// - Has a valid base schema (e.g. "area" from "area.language.go.error") +// - If the filename matches a combined kebab-case dot notation +// (e.g. "area.languagego.error-handling.md") +// - If the filename has the required number of parts (e.g. not "area.md"). func (f filenameValidator) Validate(filename string) []error { var errs []error