From d4b496df2e9a1cb9c97d3ffb5a333a762b7d064b Mon Sep 17 00:00:00 2001
From: Jiri Hnidek <jhnidek@redhat.com>
Date: Thu, 12 Sep 2024 11:17:51 +0200
Subject: [PATCH] fix: Print only JSON document in edge cases or print error

* There were one edge case, when not only JSON document was
  printed to stdout, and some user input was required.
  This case happened, when user is member of more organizations
  and --organization was not specified using CLI option
* Do not print error message, when no format is specified
* When no --username/--password is specified and --format json
  is used, then do not ask for input, but print some error.
---
 main.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index ea583fc..a1d2fa6 100644
--- a/main.go
+++ b/main.go
@@ -179,6 +179,9 @@ func registerRHSM(ctx *cli.Context) (string, error) {
 				   required, because user is member of more than one organization, then ask for
 				   the organization. */
 				if len(orgs) > 0 {
+					if uiSettings.isMachineReadable {
+						return "Unable to register system to RHSM", cli.Exit("no organization specified", 1)
+					}
 					// Stop spinner to be able to display message and ask for organization
 					if uiSettings.isRich {
 						s.Stop()
@@ -245,12 +248,11 @@ func beforeConnectAction(ctx *cli.Context) error {
 
 	// When machine-readable format is used, then additional requirements have to be met
 	if uiSettings.isMachineReadable {
-		if username != "" {
-			if password == "" {
-				return fmt.Errorf("--password is required, when --username and machine-readable format are used")
-			}
+		if username == "" || password == "" {
+			return fmt.Errorf("--username/--password or --organization/--activation-key are required when a machine-readable format is used")
 		}
 	}
+
 	return nil
 }
 
@@ -441,6 +443,8 @@ func (disconnectResult DisconnectResult) Error() string {
 			return err.Error()
 		}
 		result = string(data)
+	case "":
+		break
 	default:
 		result = "error: unsupported document format: " + disconnectResult.format
 	}
@@ -473,6 +477,8 @@ func (connectResult ConnectResult) Error() string {
 			return err.Error()
 		}
 		result = string(data)
+	case "":
+		break
 	default:
 		result = "error: unsupported document format: " + connectResult.format
 	}