From c0ab2d4ced617e35bb6332d86935f9a82b9f6fa4 Mon Sep 17 00:00:00 2001 From: Sam Tholiya Date: Wed, 5 Feb 2025 19:41:09 +0100 Subject: [PATCH] small updates --- cmd/cmd_utils.go | 2 +- cmd/list_components.go | 2 +- cmd/list_workflows.go | 6 +++--- pkg/utils/markdown_utils.go | 7 +++++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cmd/cmd_utils.go b/cmd/cmd_utils.go index e194c2f34..06f796938 100644 --- a/cmd/cmd_utils.go +++ b/cmd/cmd_utils.go @@ -670,7 +670,7 @@ func showUsageExample(cmd *cobra.Command, details string) { suggestion = exampleContent.Suggestion details += "\n## Usage Examples:\n" + exampleContent.Content } - u.PrintErrorMarkdownAndExit("Incorrect Usage", fmt.Errorf(details), suggestion) + u.PrintInvalidUsageErrorAndExit(errors.New(details)) } // Contains checks if a slice of strings contains an exact match for the target string. diff --git a/cmd/list_components.go b/cmd/list_components.go index 89cfb16f6..6f1d68841 100644 --- a/cmd/list_components.go +++ b/cmd/list_components.go @@ -29,7 +29,7 @@ var listComponentsCmd = &cobra.Command{ stackFlag, err := flags.GetString("stack") if err != nil { - u.PrintErrorMarkdownAndExit("Invalid Usage", fmt.Errorf("Error getting the `stack` flag: `%v`", err), "") + u.PrintInvalidUsageErrorAndExit(fmt.Errorf("Error getting the `stack` flag: `%v`", err)) return } diff --git a/cmd/list_workflows.go b/cmd/list_workflows.go index b15287f43..85cc6dfda 100644 --- a/cmd/list_workflows.go +++ b/cmd/list_workflows.go @@ -26,19 +26,19 @@ var listWorkflowsCmd = &cobra.Command{ fileFlag, err := flags.GetString("file") if err != nil { - u.PrintErrorMarkdownAndExit("Invalid Usage", fmt.Errorf("Error getting the `file` flag: %v", err), "") + u.PrintInvalidUsageErrorAndExit(fmt.Errorf("Error getting the `file` flag: %v", err)) return } formatFlag, err := flags.GetString("format") if err != nil { - u.PrintErrorMarkdownAndExit("Invalid Usage", fmt.Errorf("Error getting the `format` flag: %v", err), "") + u.PrintInvalidUsageErrorAndExit(fmt.Errorf("Error getting the `format` flag: %v", err)) return } delimiterFlag, err := flags.GetString("delimiter") if err != nil { - u.PrintErrorMarkdownAndExit("Invalid Usage", fmt.Errorf("Error getting the `delimiter` flag: %v", err), "") + u.PrintInvalidUsageErrorAndExit(fmt.Errorf("Error getting the `delimiter` flag: %v", err)) return } diff --git a/pkg/utils/markdown_utils.go b/pkg/utils/markdown_utils.go index da5579ba5..48a9c83c6 100644 --- a/pkg/utils/markdown_utils.go +++ b/pkg/utils/markdown_utils.go @@ -9,6 +9,8 @@ import ( "github.com/cloudposse/atmos/pkg/schema" "github.com/cloudposse/atmos/pkg/ui/markdown" + "golang.org/x/text/cases" + "golang.org/x/text/language" l "github.com/charmbracelet/log" ) @@ -27,6 +29,7 @@ func PrintErrorMarkdown(title string, err error, suggestion string) { if title == "" { title = "Error" } + title = cases.Title(language.English).String(title) errorMarkdown, renderErr := render.RenderError(title, err.Error(), suggestion) if renderErr != nil { LogError(err) @@ -66,6 +69,10 @@ func PrintErrorMarkdownAndExit(title string, err error, suggestion string) { os.Exit(1) } +func PrintInvalidUsageErrorAndExit(err error) { + PrintErrorMarkdownAndExit("Invalid Usage", err, "") +} + func PrintfMarkdown(format string, a ...interface{}) { if render == nil { _, err := os.Stdout.WriteString(fmt.Sprintf(format, a...))