Silence non-JSON output for scripting

cmd/audit.go

@@ -26,7 +26,6 @@ var auditCmd = &cobra.Command{
 
 		csv, err := c.GetAuditLogCSV(auditTimestamp)
 		if err != nil {
-			fmt.Printf("Error getting audit log: %v\n", err)
 			return err
 		}
 

cmd/instance_account.go

@@ -37,14 +37,7 @@ var rotatePasswordCmd = &cobra.Command{
 
 		c := client.New(apiKey)
 
-		err = c.RotatePassword(idFlag)
-		if err != nil {
-			fmt.Printf("Error rotating password: %v\n", err)
-			return err
-		}
-
-		fmt.Println("Password rotation initiated successfully.")
-		return nil
+		return c.RotatePassword(idFlag)
 	},
 }
 
@@ -67,16 +60,7 @@ var rotateInstanceAPIKeyCmd = &cobra.Command{
 
 		c := client.New(apiKey)
 
-		err = c.RotateInstanceAPIKey(idFlag)
-		if err != nil {
-			fmt.Printf("Error rotating instance API key: %v\n", err)
-			return err
-		}
-
-		fmt.Println("Instance API key rotation initiated successfully.")
-		fmt.Printf("Warning: The local config for instance %s will need to be updated.\n", idFlag)
-		fmt.Printf("Run 'cloudamqp instance get --id %s' to retrieve and save the new API key.\n", idFlag)
-		return nil
+		return c.RotateInstanceAPIKey(idFlag)
 	},
 }
 

cmd/instance_actions.go

@@ -187,7 +187,6 @@ var upgradeVersionsCmd = &cobra.Command{
 
 		versions, err := c.GetUpgradeVersions(idFlag)
 		if err != nil {
-			fmt.Printf("Error getting upgrade versions: %v\n", err)
 			return err
 		}
 
@@ -196,7 +195,7 @@ var upgradeVersionsCmd = &cobra.Command{
 			return fmt.Errorf("failed to format response: %v", err)
 		}
 
-		fmt.Printf("Upgrade versions:\n%s\n", string(output))
+		fmt.Println(string(output))
 		return nil
 	},
 }
@@ -237,13 +236,7 @@ func performNodeAction(cmd *cobra.Command, action string) error {
 		return fmt.Errorf("unknown action: %s", action)
 	}
 
-	if err != nil {
-		fmt.Printf("Error performing %s: %v\n", action, err)
-		return err
-	}
-
-	fmt.Printf("%s initiated successfully.\n", strings.Title(strings.ReplaceAll(action, "-", " ")))
-	return nil
+	return err
 }
 
 func performClusterAction(cmd *cobra.Command, action string) error {
@@ -271,13 +264,7 @@ func performClusterAction(cmd *cobra.Command, action string) error {
 		return fmt.Errorf("unknown action: %s", action)
 	}
 
-	if err != nil {
-		fmt.Printf("Error performing %s: %v\n", action, err)
-		return err
-	}
-
-	fmt.Printf("%s initiated successfully.\n", strings.Title(strings.ReplaceAll(action, "-", " ")))
-	return nil
+	return err
 }
 
 func performUpgradeAction(cmd *cobra.Command, action, version string) error {
@@ -305,13 +292,7 @@ func performUpgradeAction(cmd *cobra.Command, action, version string) error {
 		return fmt.Errorf("unknown action: %s", action)
 	}
 
-	if err != nil {
-		fmt.Printf("Error performing %s: %v\n", action, err)
-		return err
-	}
-
-	fmt.Printf("%s initiated successfully.\n", strings.Title(strings.ReplaceAll(action, "-", " ")))
-	return nil
+	return err
 }
 
 func performToggleAction(cmd *cobra.Command, action string) error {
@@ -360,17 +341,7 @@ func performToggleAction(cmd *cobra.Command, action string) error {
 		return fmt.Errorf("unknown action: %s", action)
 	}
 
-	if err != nil {
-		fmt.Printf("Error toggling %s: %v\n", action, err)
-		return err
-	}
-
-	status := "disabled"
-	if enable {
-		status = "enabled"
-	}
-	fmt.Printf("%s %s successfully.\n", strings.Title(action), status)
-	return nil
+	return err
 }
 
 func init() {

cmd/instance_config.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
@@ -41,28 +42,15 @@ var instanceConfigListCmd = &cobra.Command{
 
 		config, err := c.GetRabbitMQConfig(idFlag)
 		if err != nil {
-			fmt.Printf("Error getting configuration: %v\n", err)
 			return err
 		}
 
-		if len(config) == 0 {
-			fmt.Println("No configuration found.")
-			return nil
-		}
-
-		// Print table header
-		fmt.Printf("%-40s %-30s\n", "KEY", "VALUE")
-		fmt.Printf("%-40s %-30s\n", "---", "-----")
-
-		// Print configuration data
-		for key, value := range config {
-			valueStr := fmt.Sprintf("%v", value)
-			if len(valueStr) > 30 {
-				valueStr = valueStr[:27] + "..."
-			}
-			fmt.Printf("%-40s %-30s\n", key, valueStr)
+		output, err := json.MarshalIndent(config, "", "  ")
+		if err != nil {
+			return fmt.Errorf("failed to format response: %v", err)
 		}
 
+		fmt.Println(string(output))
 		return nil
 	},
 }
@@ -91,14 +79,17 @@ var instanceConfigGetCmd = &cobra.Command{
 
 		config, err := c.GetRabbitMQConfig(idFlag)
 		if err != nil {
-			fmt.Printf("Error getting configuration: %v\n", err)
 			return err
 		}
 
 		if value, exists := config[settingName]; exists {
-			fmt.Printf("%s: %v\n", settingName, value)
+			output, err := json.MarshalIndent(map[string]interface{}{settingName: value}, "", "  ")
+			if err != nil {
+				return fmt.Errorf("failed to format response: %v", err)
+			}
+			fmt.Println(string(output))
 		} else {
-			fmt.Printf("Setting '%s' not found\n", settingName)
+			return fmt.Errorf("setting '%s' not found", settingName)
 		}
 
 		return nil
@@ -149,14 +140,7 @@ var instanceConfigSetCmd = &cobra.Command{
 			settingName: value,
 		}
 
-		err = c.UpdateRabbitMQConfig(idFlag, config)
-		if err != nil {
-			fmt.Printf("Error updating configuration: %v\n", err)
-			return err
-		}
-
-		fmt.Printf("Configuration setting '%s' updated to: %v\n", settingName, value)
-		return nil
+		return c.UpdateRabbitMQConfig(idFlag, config)
 	},
 }
 

cmd/instance_create.go

@@ -86,7 +86,6 @@ Optional flags:
 
 		resp, err := c.CreateInstance(req)
 		if err != nil {
-			fmt.Printf("Error creating instance: %v\n", err)
 			return err
 		}
 
@@ -97,9 +96,8 @@ Optional flags:
 			}
 
 			if err := waitForInstanceReady(c, resp.ID, timeout); err != nil {
-				// Instance was created but failed to become ready
 				output, _ := json.MarshalIndent(resp, "", "  ")
-				fmt.Printf("Instance created but not ready:\n%s\n", string(output))
+				fmt.Println(string(output))
 				return fmt.Errorf("wait failed: %w", err)
 			}
 		}
@@ -109,7 +107,7 @@ Optional flags:
 			return fmt.Errorf("failed to format response: %v", err)
 		}
 
-		fmt.Printf("Instance created successfully:\n%s\n", string(output))
+		fmt.Println(string(output))
 		return nil
 	},
 }

cmd/instance_delete.go

@@ -58,14 +58,7 @@ WARNING: This action cannot be undone. All data will be lost.`,
 
 		c := client.New(apiKey)
 
-		err = c.DeleteInstance(instanceID)
-		if err != nil {
-			fmt.Printf("Error deleting instance: %v\n", err)
-			return err
-		}
-
-		fmt.Printf("Instance %d deleted successfully.\n", instanceID)
-		return nil
+		return c.DeleteInstance(instanceID)
 	},
 }
 

cmd/instance_get.go

@@ -1,9 +1,9 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"cloudamqp-cli/client"
 	"github.com/spf13/cobra"
@@ -35,22 +35,15 @@ var instanceGetCmd = &cobra.Command{
 
 		instance, err := c.GetInstance(instanceID)
 		if err != nil {
-			fmt.Printf("Error getting instance: %v\n", err)
 			return err
 		}
 
-		// Format output as "Name = Value"
-		fmt.Printf("Name = %s\n", instance.Name)
-		fmt.Printf("Plan = %s\n", instance.Plan)
-		fmt.Printf("Region = %s\n", instance.Region)
-		fmt.Printf("Tags = %s\n", strings.Join(instance.Tags, ","))
-		fmt.Printf("Hostname = %s\n", instance.HostnameExternal)
-		ready := "No"
-		if instance.Ready {
-			ready = "Yes"
+		output, err := json.MarshalIndent(instance, "", "  ")
+		if err != nil {
+			return fmt.Errorf("failed to format response: %v", err)
 		}
-		fmt.Printf("Ready = %s\n", ready)
 
+		fmt.Println(string(output))
 		return nil
 	},
 }

cmd/instance_list.go

@@ -26,7 +26,6 @@ var instanceListCmd = &cobra.Command{
 
 		instances, err := c.ListInstances()
 		if err != nil {
-			fmt.Printf("Error listing instances: %v\n", err)
 			return err
 		}
 

cmd/instance_nodes.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 
@@ -41,7 +42,6 @@ var instanceNodesListCmd = &cobra.Command{
 
 		nodes, err := c.ListNodes(idFlag)
 		if err != nil {
-			fmt.Printf("Error listing nodes: %v\n", err)
 			return err
 		}
 
@@ -97,13 +97,15 @@ var instanceNodesVersionsCmd = &cobra.Command{
 
 		versions, err := c.GetAvailableVersions(idFlag)
 		if err != nil {
-			fmt.Printf("Error getting available versions: %v\n", err)
 			return err
 		}
 
-		fmt.Printf("Available versions:\n")
-		fmt.Printf("RabbitMQ versions: %v\n", versions.RabbitMQVersions)
-		fmt.Printf("Erlang versions: %v\n", versions.ErlangVersions)
+		output, err := json.MarshalIndent(versions, "", "  ")
+		if err != nil {
+			return fmt.Errorf("failed to format response: %v", err)
+		}
+
+		fmt.Println(string(output))
 		return nil
 	},
 }

cmd/instance_plugins.go

@@ -41,7 +41,6 @@ var instancePluginsListCmd = &cobra.Command{
 
 		plugins, err := c.ListPlugins(idFlag)
 		if err != nil {
-			fmt.Printf("Error listing plugins: %v\n", err)
 			return err
 		}
 
@@ -86,14 +85,7 @@ var instancePluginsEnableCmd = &cobra.Command{
 
 		c := client.New(apiKey)
 
-		err = c.EnablePlugin(idFlag, pluginName)
-		if err != nil {
-			fmt.Printf("Error enabling plugin '%s': %v\n", pluginName, err)
-			return err
-		}
-
-		fmt.Printf("Plugin '%s' enabled successfully.\n", pluginName)
-		return nil
+		return c.EnablePlugin(idFlag, pluginName)
 	},
 }
 
@@ -118,14 +110,7 @@ var instancePluginsDisableCmd = &cobra.Command{
 
 		c := client.New(apiKey)
 
-		err = c.DisablePlugin(idFlag, pluginName)
-		if err != nil {
-			fmt.Printf("Error disabling plugin '%s': %v\n", pluginName, err)
-			return err
-		}
-
-		fmt.Printf("Plugin '%s' disabled successfully.\n", pluginName)
-		return nil
+		return c.DisablePlugin(idFlag, pluginName)
 	},
 }
 

cmd/instance_resize.go

@@ -64,17 +64,7 @@ Available disk sizes: 0, 25, 50, 100, 250, 500, 1000, 2000 GB`,
 			AllowDowntime: allowDowntime,
 		}
 
-		err = c.ResizeInstanceDisk(instanceID, req)
-		if err != nil {
-			fmt.Printf("Error resizing instance disk: %v\n", err)
-			return err
-		}
-
-		fmt.Printf("Disk resize initiated for instance %d. Additional disk size: %d GB\n", instanceID, diskSize)
-		if allowDowntime {
-			fmt.Println("Note: Downtime is allowed for this resize operation.")
-		}
-		return nil
+		return c.ResizeInstanceDisk(instanceID, req)
 	},
 }