Make notLoggedInMessage a const

AbhineetJain · AbhineetJain · commit 0584479cd3c9 · 2022-05-23T22:42:16.000Z
diff --git a/cli/logout.go b/cli/logout.go
@@ -15,30 +15,25 @@ func logout() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			config := createConfig(cmd)
 
-			loginHelper := "You are not logged in. Try logging in using 'coder login <url>'."
-
 			err := config.URL().Delete()
-
 			if err != nil {
 				// If the URL configuration file is absent, the user is logged out
 				if os.IsNotExist(err) {
-					return xerrors.New(loginHelper)
+					return xerrors.New(notLoggedInMessage)
 				}
 				return xerrors.Errorf("remove URL file: %w", err)
 			}
 
 			err = config.Session().Delete()
-
 			if err != nil {
 				// If the session configuration file is absent, the user is logged out
 				if os.IsNotExist(err) {
-					return xerrors.New(loginHelper)
+					return xerrors.New(notLoggedInMessage)
 				}
 				return xerrors.Errorf("remove session file: %w", err)
 			}
 
 			err = config.Organization().Delete()
-
 			// If the organization configuration file is absent, we should still log out
 			if err != nil && !os.IsNotExist(err) {
 				return xerrors.Errorf("remove organization file: %w", err)
diff --git a/cli/root.go b/cli/root.go
@@ -31,13 +31,14 @@ var (
 )
 
 const (
-	varURL          = "url"
-	varToken        = "token"
-	varAgentToken   = "agent-token"
-	varAgentURL     = "agent-url"
-	varGlobalConfig = "global-config"
-	varNoOpen       = "no-open"
-	varForceTty     = "force-tty"
+	varURL             = "url"
+	varToken           = "token"
+	varAgentToken      = "agent-token"
+	varAgentURL        = "agent-url"
+	varGlobalConfig    = "global-config"
+	varNoOpen          = "no-open"
+	varForceTty        = "force-tty"
+	notLoggedInMessage = "You are not logged in. Try logging in using 'coder login <url>'."
 )
 
 func init() {
@@ -112,13 +113,12 @@ func Root() *cobra.Command {
 func createClient(cmd *cobra.Command) (*codersdk.Client, error) {
 	root := createConfig(cmd)
 	rawURL, err := cmd.Flags().GetString(varURL)
-	loginHelper := "You are not logged in. Try logging in using 'coder login <url>'."
 	if err != nil || rawURL == "" {
 		rawURL, err = root.URL().Read()
 		if err != nil {
 			// If the configuration files are absent, the user is logged out
 			if os.IsNotExist(err) {
-				return nil, xerrors.New(loginHelper)
+				return nil, xerrors.New(notLoggedInMessage)
 			}
 			return nil, err
 		}
@@ -133,7 +133,7 @@ func createClient(cmd *cobra.Command) (*codersdk.Client, error) {
 		if err != nil {
 			// If the configuration files are absent, the user is logged out
 			if os.IsNotExist(err) {
-				return nil, xerrors.New(loginHelper)
+				return nil, xerrors.New(notLoggedInMessage)
 			}
 			return nil, err
 		}
