From a1d7809dd8bdbd58d9a6dd827ab2099912518a75 Mon Sep 17 00:00:00 2001 From: Martin Nirtl Date: Sat, 8 Feb 2020 14:08:40 +0100 Subject: [PATCH] use new utils.Error func for improved error processing --- internal/commands/configcmd/set.go | 4 +--- internal/commands/downcmd/root.go | 8 ++------ internal/commands/logscmd/root.go | 8 ++------ internal/commands/profilecmd/create.go | 4 +--- internal/commands/profilecmd/delete.go | 8 ++------ internal/commands/profilecmd/list.go | 4 +--- internal/commands/profilecmd/rename.go | 4 +--- internal/commands/profilecmd/update.go | 8 ++------ internal/commands/pscmd/root.go | 8 ++------ internal/commands/pullcmd/root.go | 4 +--- internal/commands/upcmd/root.go | 28 +++++++------------------- 11 files changed, 22 insertions(+), 66 deletions(-) diff --git a/internal/commands/configcmd/set.go b/internal/commands/configcmd/set.go index 08f7db6..d1c1ea9 100644 --- a/internal/commands/configcmd/set.go +++ b/internal/commands/configcmd/set.go @@ -73,9 +73,7 @@ func setConfigVar(varname string) error { err := config.Save() - if err != nil { - utils.Error(err) - } + utils.Error(err) return nil } diff --git a/internal/commands/downcmd/root.go b/internal/commands/downcmd/root.go index 64cef77..6051432 100644 --- a/internal/commands/downcmd/root.go +++ b/internal/commands/downcmd/root.go @@ -30,9 +30,7 @@ var DownCommand = &cobra.Command{ err := os.Chdir(envHomeDir) - if err != nil { - utils.Error(err) - } + utils.Error(err) var timebridger externalcommand.Timebridger if hideCmdOutput := viper.GetBool("hidesubcommandoutput"); hideCmdOutput { @@ -41,8 +39,6 @@ var DownCommand = &cobra.Command{ _, err = externalcommand.Execute("docker-compose down", timebridger, filepath) - if err != nil { - utils.Error(err) - } + utils.Error(err) }, } diff --git a/internal/commands/logscmd/root.go b/internal/commands/logscmd/root.go index 754593f..653e015 100644 --- a/internal/commands/logscmd/root.go +++ b/internal/commands/logscmd/root.go @@ -30,9 +30,7 @@ var LogsCommand = &cobra.Command{ err := os.Chdir(envHomeDir) - if err != nil { - utils.Error(err) - } + utils.Error(err) args = addFlagsToArgs(args) @@ -40,9 +38,7 @@ var LogsCommand = &cobra.Command{ _, err = externalcommand.Execute(command, nil, "") - if err != nil { - utils.Error(err) - } + utils.Error(err) }, } diff --git a/internal/commands/profilecmd/create.go b/internal/commands/profilecmd/create.go index 8f25862..72bdd53 100644 --- a/internal/commands/profilecmd/create.go +++ b/internal/commands/profilecmd/create.go @@ -57,9 +57,7 @@ var createCmd = &cobra.Command{ err = config.Save() - if err != nil { - utils.Error(err) - } + utils.Error(err) utils.Success(fmt.Sprintf("Successfully saved profile: %s [%s]", profileName, activeEnv)) }, diff --git a/internal/commands/profilecmd/delete.go b/internal/commands/profilecmd/delete.go index ae3ac3b..e911d92 100644 --- a/internal/commands/profilecmd/delete.go +++ b/internal/commands/profilecmd/delete.go @@ -30,9 +30,7 @@ var deleteCmd = &cobra.Command{ profileName, err := survey.Select("Select profile to be deleted", profileNames) - if err != nil { - utils.Error(err) - } + utils.Error(err) profileMap := viper.GetStringMap(fmt.Sprintf("envs.%s.profiles", activeEnv)) @@ -42,9 +40,7 @@ var deleteCmd = &cobra.Command{ err = config.Save() - if err != nil { - utils.Error(err) - } + utils.Error(err) utils.Success(fmt.Sprintf("Successfully deleted profile: %s [%s]", profileName, activeEnv)) }, diff --git a/internal/commands/profilecmd/list.go b/internal/commands/profilecmd/list.go index d8b7ac7..9fb097b 100644 --- a/internal/commands/profilecmd/list.go +++ b/internal/commands/profilecmd/list.go @@ -26,9 +26,7 @@ var listCmd = &cobra.Command{ if servicesFlag { profile, err := config.GetProfile(activeEnv, profileName) - if err != nil { - utils.Error(err) - } + utils.Error(err) for _, service := range profile.Services { if utils.Includes(profile.Selected, service) { diff --git a/internal/commands/profilecmd/rename.go b/internal/commands/profilecmd/rename.go index 386da4d..f0e8681 100644 --- a/internal/commands/profilecmd/rename.go +++ b/internal/commands/profilecmd/rename.go @@ -62,9 +62,7 @@ var renameCmd = &cobra.Command{ err = config.Save() - if err != nil { - utils.Error(err) - } + utils.Error(err) utils.Success(fmt.Sprintf("Successfully renamed profile from %s to %s [%s]", renameProfile, profileName, activeEnv)) }, diff --git a/internal/commands/profilecmd/update.go b/internal/commands/profilecmd/update.go index 21032fa..c91885b 100644 --- a/internal/commands/profilecmd/update.go +++ b/internal/commands/profilecmd/update.go @@ -45,9 +45,7 @@ var updateCmd = &cobra.Command{ profile, err := config.GetProfile(activeEnv, profileName) - if err != nil { - utils.Error(err) - } + utils.Error(err) selected, err := survey.MultiSelect(fmt.Sprintf("Select services for profile %s%s%s", chalk.Cyan, profileName, chalk.ResetColor), services.All, profile.Selected) @@ -63,9 +61,7 @@ var updateCmd = &cobra.Command{ err = config.Save() - if err != nil { - utils.Error(err) - } + utils.Error(err) utils.Success(fmt.Sprintf("Successfully updated profile: %s [%s]", profileName, activeEnv)) }, diff --git a/internal/commands/pscmd/root.go b/internal/commands/pscmd/root.go index d5e811b..fa10486 100644 --- a/internal/commands/pscmd/root.go +++ b/internal/commands/pscmd/root.go @@ -25,14 +25,10 @@ var PSCommand = &cobra.Command{ err := os.Chdir(envHomeDir) - if err != nil { - utils.Error(err) - } + utils.Error(err) _, err = externalcommand.Execute("docker-compose ps", nil, "") - if err != nil { - utils.Error(err) - } + utils.Error(err) }, } diff --git a/internal/commands/pullcmd/root.go b/internal/commands/pullcmd/root.go index 8911e34..7cdd158 100644 --- a/internal/commands/pullcmd/root.go +++ b/internal/commands/pullcmd/root.go @@ -58,8 +58,6 @@ var PullCommand = &cobra.Command{ err := Pull(envHomeDir, true) - if err != nil { - utils.Error(err) - } + utils.Error(err) }, } diff --git a/internal/commands/upcmd/root.go b/internal/commands/upcmd/root.go index fabc4df..681a69f 100644 --- a/internal/commands/upcmd/root.go +++ b/internal/commands/upcmd/root.go @@ -62,17 +62,13 @@ var UpCommand = &cobra.Command{ if profileName != "latest" { profile, err := config.GetProfile(activeEnv, profileName) - if err != nil { - utils.Error(err) - } + utils.Error(err) preselected = profile.Selected } else { profile, err := config.GetLatest(activeEnv) - if err != nil { - utils.Error(err) - } + utils.Error(err) preselected = profile.Selected } @@ -84,9 +80,7 @@ var UpCommand = &cobra.Command{ preselected = services.All } - if err != nil { - utils.Error(err) - } + utils.Error(err) if len(services.Override) > 0 { fmt.Printf("%sFound %d services in docker-compose.override.y(a)ml: %s%s\n\n", chalk.Yellow, len(services.Override), strings.Join(services.Override, ", "), chalk.ResetColor) @@ -119,22 +113,16 @@ var UpCommand = &cobra.Command{ err = config.Save() - if err != nil { - fmt.Printf("%sSome problem ocurred: Could not save profile/latest selection%s\n") - } + utils.Error(err) } err = envvars.SetEnvVars(services.All, selectedServices) - if err != nil { - utils.Error(err) - } + utils.Error(err) err = os.Chdir(envHomeDir) - if err != nil { - utils.Error(err) - } + utils.Error(err) var timebridger externalcommand.Timebridger if hideCmdOutput := viper.GetBool("hidesubcommandoutput"); hideCmdOutput { @@ -145,8 +133,6 @@ var UpCommand = &cobra.Command{ _, err = externalcommand.Execute(command, timebridger, filepath) - if err != nil { - utils.Error(err) - } + utils.Error(err) }, }