preserve error type in loginoptions

openshift · Nov 2, 2017 · 0074c3a · 0074c3a
1 parent 6b1a836
commit 0074c3a
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pkg/oc/cli/cmd/login/loginoptions.go b/pkg/oc/cli/cmd/login/loginoptions.go
@@ -56,6 +56,7 @@ type LoginOptions struct {
 	Config             *restclient.Config
 	Reader             io.Reader
 	Out                io.Writer
+	ErrOut             io.Writer
 
 	// cert data to be used when authenticating
 	CertFile string
@@ -231,10 +232,15 @@ func (o *LoginOptions) gatherAuthInfo() error {
 		// client is connecting to the right host:port
 		if statusErr, ok := err.(*kerrors.StatusError); ok {
 			if statusErr.Status().Code == http.StatusInternalServerError {
-				return fmt.Errorf("error: The server was unable to respond - %v", suggestion)
+				fmt.Fprintf(o.ErrOut, "error: The server was unable to respond - %v", suggestion)
 			}
+		} else {
+			fmt.Fprintf(o.ErrOut, "error: %v - %v\n", err, suggestion)
 		}
-		return fmt.Errorf("%v - %v", err, suggestion)
+
+		// TODO: set errout
+		// return error as-is, as method caller expects to check its type
+		return err
 	}
 	clientConfig.BearerToken = token