fix: API inconsistencies and silent failure fixes (#2)

Author: samdulam

cmd/admin.go

@@ -4,6 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"strconv"
+	"strings"
+	"time"
 
 	"github.com/spf13/cobra"
 	"github.com/portainer/portainerctl/internal/client"
@@ -88,13 +91,8 @@ func backupCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			c, err := client.MustClient(); if err != nil { return err }
 			body := map[string]interface{}{"Password": backupPass}
-			data, err := c.RawGet("/backup")
-			if err != nil {
-				// POST for backup
-				_ = c.Post("/backup", body, nil)
-				output.Success("Backup initiated.")
-				return nil
-			}
+			data, err := c.RawPost("/backup", body)
+			if err != nil { return err }
 			outFile := backupOutput
 			if outFile == "" { outFile = "portainer-backup.tar.gz" }
 			if err := os.WriteFile(outFile, data, 0600); err != nil { return err }
@@ -297,27 +295,41 @@ func userActivityCmd() *cobra.Command {
 		},
 	}
 
+	var authCsvRange, authCsvOutput string
 	authLogsCsvCmd := &cobra.Command{
-		Use: "auth-logs-csv", Short: "Download authentication logs as CSV",
+		Use:   "auth-logs-csv",
+		Short: "Download authentication logs as CSV",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			after, err := parseDayRange(authCsvRange)
+			if err != nil { return err }
 			c, err := client.MustClient(); if err != nil { return err }
-			data, err := c.RawGet("/useractivity/authlogs.csv")
+			path := "/useractivity/authlogs.csv"
+			if after > 0 { path += fmt.Sprintf("?after=%d", after) }
+			data, err := c.RawGet(path)
 			if err != nil { return err }
-			fmt.Print(string(data))
-			return nil
+			return writeCsvOutput(data, authCsvOutput)
 		},
 	}
+	authLogsCsvCmd.Flags().StringVar(&authCsvRange, "range", "", "Time range: 1d–7d (e.g. 2d = last 2 days)")
+	authLogsCsvCmd.Flags().StringVar(&authCsvOutput, "output-file", "", "Save CSV to file instead of printing")
 
+	var logsCsvRange, logsCsvOutput string
 	logsCsvCmd := &cobra.Command{
-		Use: "logs-csv", Short: "Download user activity logs as CSV",
+		Use:   "logs-csv",
+		Short: "Download user activity logs as CSV",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			after, err := parseDayRange(logsCsvRange)
+			if err != nil { return err }
 			c, err := client.MustClient(); if err != nil { return err }
-			data, err := c.RawGet("/useractivity/logs.csv")
+			path := "/useractivity/logs.csv"
+			if after > 0 { path += fmt.Sprintf("?after=%d", after) }
+			data, err := c.RawGet(path)
 			if err != nil { return err }
-			fmt.Print(string(data))
-			return nil
+			return writeCsvOutput(data, logsCsvOutput)
 		},
 	}
+	logsCsvCmd.Flags().StringVar(&logsCsvRange, "range", "", "Time range: 1d–7d (e.g. 2d = last 2 days)")
+	logsCsvCmd.Flags().StringVar(&logsCsvOutput, "output-file", "", "Save CSV to file instead of printing")
 
 	cmd.AddCommand(authLogsCmd, logsCmd, authLogsCsvCmd, logsCsvCmd)
 	return cmd
@@ -717,3 +729,29 @@ func supportCmd() *cobra.Command {
 	cmd.AddCommand(downloadCmd, debugLogCmd)
 	return cmd
 }
+
+func parseDayRange(r string) (int64, error) {
+	if r == "" {
+		return 0, nil
+	}
+	if !strings.HasSuffix(r, "d") {
+		return 0, fmt.Errorf("invalid range %q: use format like 1d, 2d, up to 7d", r)
+	}
+	n, err := strconv.Atoi(strings.TrimSuffix(r, "d"))
+	if err != nil || n < 1 || n > 7 {
+		return 0, fmt.Errorf("invalid range %q: must be between 1d and 7d", r)
+	}
+	return time.Now().Add(-time.Duration(n) * 24 * time.Hour).Unix(), nil
+}
+
+func writeCsvOutput(data []byte, outputFile string) error {
+	if outputFile != "" {
+		if err := os.WriteFile(outputFile, data, 0600); err != nil {
+			return err
+		}
+		output.Success("Saved to " + outputFile)
+		return nil
+	}
+	fmt.Print(string(data))
+	return nil
+}

cmd/registries_webhooks.go

@@ -50,6 +50,8 @@ func registryTypeLabel(t int) string {
 		return "dockerhub"
 	case 7:
 		return "ecr"
+	case 8:
+		return "github"
 	default:
 		return strconv.Itoa(t)
 	}
@@ -183,6 +185,7 @@ func registryCmd() *cobra.Command {
 	}
 
 	var pingURL, pingUser, pingPass string
+	var pingType int
 	pingCmd := &cobra.Command{
 		Use:   "ping",
 		Short: "Test connectivity to a registry",
@@ -194,7 +197,7 @@ func registryCmd() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			body := map[string]interface{}{"URL": pingURL, "Username": pingUser, "Password": pingPass}
+			body := map[string]interface{}{"URL": pingURL, "Username": pingUser, "Password": pingPass, "Type": pingType}
 			if err := c.Post("/registries/ping", body, nil); err != nil {
 				return err
 			}
@@ -205,6 +208,7 @@ func registryCmd() *cobra.Command {
 	pingCmd.Flags().StringVar(&pingURL, "url", "", "Registry URL")
 	pingCmd.Flags().StringVar(&pingUser, "user", "", "Username")
 	pingCmd.Flags().StringVar(&pingPass, "pass", "", "Password")
+	pingCmd.Flags().IntVar(&pingType, "type", 3, "Registry type: 1=quay, 2=azure, 3=custom, 4=gitlab, 5=proget, 6=dockerhub, 7=ecr, 8=github")
 
 	cmd.AddCommand(listCmd, getCmd, createCmd, deleteCmd, reposCmd, pingCmd)
 	return cmd

cmd/stack.go

@@ -344,6 +344,7 @@ func stackCmd() *cobra.Command {
 	deployK8sGitCmd.Flags().StringVar(&deployBranch, "branch", "main", "Git branch")
 	deployK8sGitCmd.Flags().StringVar(&deployPath, "path", "manifest.yaml", "Manifest file path in repo")
 
+	var redeployEnvID int
 	redeployCmd := &cobra.Command{
 		Use:   "redeploy <id>",
 		Short: "Redeploy a GitOps-backed stack (pull latest from Git)",
@@ -353,49 +354,66 @@ func stackCmd() *cobra.Command {
 			if err != nil {
 				return err
 			}
+			path := "/stacks/" + args[0] + "/git/redeploy"
+			if redeployEnvID > 0 {
+				path += fmt.Sprintf("?endpointId=%d", redeployEnvID)
+			}
 			var result interface{}
-			if err := c.Put("/stacks/"+args[0]+"/git/redeploy", map[string]interface{}{}, &result); err != nil {
+			if err := c.Put(path, map[string]interface{}{}, &result); err != nil {
 				return err
 			}
 			output.Success("Stack " + args[0] + " redeployed from Git.")
 			return nil
 		},
 	}
+	redeployCmd.Flags().IntVar(&redeployEnvID, "env", 0, "Environment ID (required for stacks created before v1.18.0)")
 
+	var startEnvID int
 	startCmd := &cobra.Command{
 		Use:   "start <id>",
 		Short: "Start a stopped stack",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
+			if startEnvID == 0 {
+				return fmt.Errorf("--env is required")
+			}
 			c, err := client.MustClient()
 			if err != nil {
 				return err
 			}
 			var result interface{}
-			if err := c.Post("/stacks/"+args[0]+"/start", nil, &result); err != nil {
+			path := fmt.Sprintf("/stacks/%s/start?endpointId=%d", args[0], startEnvID)
+			if err := c.Post(path, nil, &result); err != nil {
 				return err
 			}
 			output.Success("Stack " + args[0] + " started.")
 			return nil
 		},
 	}
+	startCmd.Flags().IntVar(&startEnvID, "env", 0, "Environment ID (required)")
 
+	var stopEnvID int
 	stopCmd := &cobra.Command{
 		Use:   "stop <id>",
 		Short: "Stop a running stack",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
+			if stopEnvID == 0 {
+				return fmt.Errorf("--env is required")
+			}
 			c, err := client.MustClient()
 			if err != nil {
 				return err
 			}
-			if err := c.Post("/stacks/"+args[0]+"/stop", nil, nil); err != nil {
+			path := fmt.Sprintf("/stacks/%s/stop?endpointId=%d", args[0], stopEnvID)
+			if err := c.Post(path, nil, nil); err != nil {
 				return err
 			}
 			output.Success("Stack " + args[0] + " stopped.")
 			return nil
 		},
 	}
+	stopCmd.Flags().IntVar(&stopEnvID, "env", 0, "Environment ID (required)")
 
 	var deleteEnvID int
 	deleteCmd := &cobra.Command{

internal/client/client.go

@@ -136,18 +136,58 @@ func (c *Client) DeleteWithBody(path string, body interface{}) error {
 	return c.do(req, nil)
 }
 
-// RawGet returns the raw response body — used for passthrough commands (kubectl proxy, docker proxy).
+// RawPost sends a POST and returns the raw response body — used for binary responses like backup.
+func (c *Client) RawPost(path string, body interface{}) ([]byte, error) {
+	req, err := c.newRequest("POST", path, body)
+	if err != nil {
+		return nil, err
+	}
+	resp, err := c.http.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("request failed: %w", err)
+	}
+	defer resp.Body.Close()
+	data, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("reading response: %w", err)
+	}
+	if resp.StatusCode >= 400 {
+		var apiErr APIError
+		apiErr.Status = resp.StatusCode
+		_ = json.Unmarshal(data, &apiErr)
+		if apiErr.Message == "" {
+			apiErr.Message = string(data)
+		}
+		return nil, &apiErr
+	}
+	return data, nil
+}
+
+// RawGet returns the raw response body — used for binary/passthrough responses.
 func (c *Client) RawGet(path string) ([]byte, error) {
 	req, err := c.newRequest("GET", path, nil)
 	if err != nil {
 		return nil, err
 	}
 	resp, err := c.http.Do(req)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("request failed: %w", err)
 	}
 	defer resp.Body.Close()
-	return io.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("reading response: %w", err)
+	}
+	if resp.StatusCode >= 400 {
+		var apiErr APIError
+		apiErr.Status = resp.StatusCode
+		_ = json.Unmarshal(data, &apiErr)
+		if apiErr.Message == "" {
+			apiErr.Message = string(data)
+		}
+		return nil, &apiErr
+	}
+	return data, nil
 }
 
 // ProxyRequest forwards an arbitrary method+path+body through the Portainer API proxy.