resolve review comments given by miquel!!

cmd/suseconnect/suseconnect.go

@@ -403,33 +403,28 @@ func isSumaManaged() bool {
 }
 
 func processToken(token string) (string, error) {
-	var reader io.Reader
-
 	if strings.HasPrefix(token, "@") {
 		tokenFilePath := strings.TrimPrefix(token, "@")
 		file, err := os.Open(tokenFilePath)
 		if err != nil {
 			return "", fmt.Errorf("failed to open token file '%s': %w", tokenFilePath, err)
 		}
 		defer file.Close()
-		reader = file
+		return readTokenFromReader(file)
 	} else if token == "-" {
-		reader = os.Stdin
+		return readTokenFromReader(os.Stdin)
 	} else {
 		return token, nil
 	}
-
-	return readTokenFromReader(reader)
 }
 
 func readTokenFromReader(reader io.Reader) (string, error) {
 	bufReader := bufio.NewReader(reader)
 	tokenBytes, err := bufReader.ReadString('\n')
-	if err != nil && err != io.EOF { // Handle potential errors, including EOF
+	if err != nil && err != io.EOF {
 		return "", fmt.Errorf("failed to read token from reader: %w", err)
 	}
 	token := strings.TrimSuffix(tokenBytes, "\n")
-	token = strings.TrimSpace(token)
 	if token == "" {
 		return "", fmt.Errorf("error: token cannot be empty after reading")
 	}

cmd/suseconnect/suseconnect_test.go

@@ -84,7 +84,7 @@ func TestReadTokenFromReader_EmptyInput(t *testing.T) {
 }
 
 func TestReadTokenFromReader_OnlyNewline(t *testing.T) {
-	reader := strings.NewReader("\n") // Input contains only a newline
+	reader := strings.NewReader("\n")
 
 	token, err := readTokenFromReader(reader)
 	if err == nil {
@@ -102,7 +102,7 @@ func TestReadTokenFromReader_OnlyNewline(t *testing.T) {
 }
 
 func TestReadTokenFromReader_ErrorProducingReader(t *testing.T) {
-	reader := &errorReader{} // Custom reader that always returns an error
+	reader := &errorReader{}
 
 	token, err := readTokenFromReader(reader)
 	if err == nil {
@@ -118,23 +118,6 @@ func TestReadTokenFromReader_ErrorProducingReader(t *testing.T) {
 		t.Errorf("Expected empty token, but got '%s'", token)
 	}
 }
-func TestReadTokenFromReader_OnlyWhitespace(t *testing.T) {
-	reader := strings.NewReader("   \n") // Input contains only spaces and newline
-
-	token, err := readTokenFromReader(reader)
-	if err == nil {
-		t.Fatalf("Expected error, but got none")
-	}
-
-	expectedError := "error: token cannot be empty after reading"
-	if err.Error() != expectedError {
-		t.Errorf("Expected error '%s', but got '%s'", expectedError, err.Error())
-	}
-
-	if token != "" {
-		t.Errorf("Expected empty token, but got '%s'", token)
-	}
-}
 
 func TestProcessToken_RegularToken(t *testing.T) {
 	token := "myRegularToken"
@@ -153,7 +136,7 @@ func TestProcessToken_TokenFromFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create temp file: %v", err)
 	}
-	defer os.Remove(tmpFile.Name()) // Clean up the temp file
+	defer os.Remove(tmpFile.Name())
 
 	expectedToken := "fileToken\n"
 	if _, err := tmpFile.WriteString(expectedToken); err != nil {
@@ -191,7 +174,7 @@ func TestProcessToken_TokenFromStdin(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create temp file: %v", err)
 	}
-	defer os.Remove(tempFile.Name()) // Clean up the temp file
+	defer os.Remove(tempFile.Name())
 	expectedToken := "stdinToken\n"
 	if _, err := tempFile.WriteString(expectedToken); err != nil {
 		t.Fatalf("Failed to write to temp file: %v", err)
@@ -200,19 +183,19 @@ func TestProcessToken_TokenFromStdin(t *testing.T) {
 	tempFile.Close()
 
 	oldStdin := os.Stdin
-	defer func() { os.Stdin = oldStdin }() // Restore original stdin
-	file, err := os.Open(tempFile.Name())  // Reopen the temp file for reading
+	defer func() { os.Stdin = oldStdin }()
+	file, err := os.Open(tempFile.Name())
 	if err != nil {
 		t.Fatalf("Failed to open temp file: %v", err)
 	}
-	os.Stdin = file // Set os.Stdin to the temp file
+	os.Stdin = file
 
 	result, err := processToken("-")
 	if err != nil {
 		t.Fatalf("Expected no error, but got %v", err)
 	}
 
-	expectedToken = strings.TrimSpace(expectedToken) // Trim newline
+	expectedToken = strings.TrimSpace(expectedToken)
 	if result != expectedToken {
 		t.Errorf("Expected token to be '%s', but got '%s'", expectedToken, result)
 	}
@@ -223,16 +206,16 @@ func TestProcessToken_ErrorReadingStdin(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create temp file: %v", err)
 	}
-	defer os.Remove(tempFile.Name()) // Clean up the temp file
+	defer os.Remove(tempFile.Name())
 
 	tempFile.Close()
 	oldStdin := os.Stdin
-	defer func() { os.Stdin = oldStdin }() // Restore original stdin
-	file, err := os.Open(tempFile.Name())  // Open the temp file for reading
+	defer func() { os.Stdin = oldStdin }()
+	file, err := os.Open(tempFile.Name())
 	if err != nil {
 		t.Fatalf("Failed to open temp file: %v", err)
 	}
-	os.Stdin = file // Set os.Stdin to the temp file
+	os.Stdin = file
 
 	_, err = processToken("-")
 	if err == nil {
@@ -251,7 +234,7 @@ func parseRegistrationTokenWithInjection(token string) {
 		processedToken, processTokenErr := processTokenFunc(token)
 		if processTokenErr != nil {
 			util.Debug.Printf("Error Processing token %+v", processTokenErr)
-			exit(1) // Use the mockable exit function
+			exit(1)
 		}
 		connect.CFG.Token = processedToken
 	}