Ensure the output of the api sub command goes to stdout, fix patch content-type

Author: tyler-mairose-sp

cmd/api/delete.go

@@ -98,7 +98,7 @@ func newDeleteCmd() *cobra.Command {
 			}
 
 			if jsonPath != "" {
-				cmd.Print(string(responseBody))
+				fmt.Fprint(cmd.OutOrStdout(), string(responseBody))
 			} else {
 				cmd.Println(string(responseBody))
 				fmt.Printf("Status: %s\n", resp.Status)

cmd/api/get.go

@@ -120,7 +120,7 @@ func newGetCmd() *cobra.Command {
 			}
 
 			if jsonPath != "" {
-				cmd.Print(string(body))
+				fmt.Fprint(cmd.OutOrStdout(), string(body))
 			} else {
 				cmd.Println(string(body))
 				fmt.Printf("Status: %s\n", resp.Status)

cmd/api/patch.go

@@ -66,12 +66,14 @@ func newPatchCmd() *cobra.Command {
 				return fmt.Errorf("either --body or --body-file must be provided")
 			}
 
+			// Prepare headers
+			headers := make(map[string]string)
+
 			if contentType == "" {
-				contentType = "application/json"
+				contentType = "application/json-patch+json"
 			}
 
-			// Prepare headers
-			headers := make(map[string]string)
+			headers["Content-Type"] = contentType
 			// Always add Accept header for JSON
 			headers["Accept"] = "application/json"
 			// Add any additional headers
@@ -126,10 +128,10 @@ func newPatchCmd() *cobra.Command {
 				}
 				fmt.Printf("Response saved to %s\n", outputFile)
 			} else {
-				cmd.Println(string(responseBody))
+				fmt.Fprint(cmd.OutOrStdout(), string(responseBody))
 			}
 
-			fmt.Printf("Status: %s\n", resp.Status)
+			fmt.Printf("\nStatus: %s\n", resp.Status)
 			return nil
 		},
 	}
@@ -139,7 +141,7 @@ func newPatchCmd() *cobra.Command {
 	cmd.Flags().StringVarP(&bodyContent, "body", "b", "", "Request body content as a string")
 	cmd.Flags().StringVarP(&outputFile, "output", "o", "", "Output file to save the response (if not specified, prints to stdout)")
 	cmd.Flags().BoolVarP(&prettyPrint, "pretty", "p", false, "Pretty print JSON response")
-	cmd.Flags().StringVarP(&contentType, "content-type", "c", "application/json", "Content type of the request body")
+	cmd.Flags().StringVarP(&contentType, "content-type", "c", "", "Content type of the request body")
 	cmd.Flags().StringVarP(&jsonPath, "jsonpath", "j", "", "JSONPath expression to evaluate on the response")
 
 	return cmd

cmd/api/post.go

@@ -119,7 +119,7 @@ func newPostCmd() *cobra.Command {
 			}
 
 			if jsonPath != "" {
-				cmd.Print(string(responseBody))
+				fmt.Fprint(cmd.OutOrStdout(), string(responseBody))
 			} else {
 				cmd.Println(string(responseBody))
 				fmt.Printf("Status: %s\n", resp.Status)

cmd/api/put.go

@@ -119,7 +119,7 @@ func newPutCmd() *cobra.Command {
 			}
 
 			if jsonPath != "" {
-				cmd.Print(string(responseBody))
+				fmt.Fprint(cmd.OutOrStdout(), string(responseBody))
 			} else {
 				cmd.Println(string(responseBody))
 				fmt.Printf("Status: %s\n", resp.Status)

cmd/reassign/reassign.md

@@ -18,12 +18,6 @@ You can reassign ownership for the following supported object types:
 
 ==Example==
 
-Use this command to interactively choose the identities and object types you wish to reassign.
-
-```bash
-sail reassign
-```
-
 Reassign all objects from one identity to another
 
 ```bash

cmd/rule/list.go

@@ -23,7 +23,7 @@ func newListCommand() *cobra.Command {
 
 	var description = string("Export of all rules")
 	var objectOptions string
-	var includeTypes = []string{"RULE"}
+	var includeTypes = []string{"RULE", "CONNECTOR_RULE"}
 	var excludeTypes []string
 
 	var cloud bool