Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix(cli): pagination not working correctly via arcane-cli (#2286)
Kyle Mendellcb2d92e33de8
diff --git a/cli/go.mod b/cli/go.modindex 097d04599..717167c0d 100644--- a/cli/go.mod+++ b/cli/go.mod@@ -8,7 +8,7 @@ require (charm.land/lipgloss/v2 v2.0.2github.com/charmbracelet/x/term v0.2.2github.com/fatih/color v1.19.0- github.com/getarcaneapp/arcane/types v1.16.4+ github.com/getarcaneapp/arcane/types v1.17.2github.com/go-viper/mapstructure/v2 v2.5.0github.com/mattn/go-runewidth v0.0.22github.com/sirupsen/logrus v1.9.4@@ -62,9 +62,9 @@ require (github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirectgo.opentelemetry.io/auto/sdk v1.2.1 // indirectgo.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect- go.opentelemetry.io/otel v1.40.0 // indirect- go.opentelemetry.io/otel/metric v1.40.0 // indirect- go.opentelemetry.io/otel/trace v1.40.0 // indirect+ go.opentelemetry.io/otel v1.43.0 // indirect+ go.opentelemetry.io/otel/metric v1.43.0 // indirect+ go.opentelemetry.io/otel/trace v1.43.0 // indirectgo.yaml.in/yaml/v3 v3.0.4 // indirectgo.yaml.in/yaml/v4 v4.0.0-rc.4 // indirectgolang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirectdiff --git a/cli/go.sum b/cli/go.sumindex 40f6aedca..924502c2c 100644--- a/cli/go.sum+++ b/cli/go.sum@@ -55,8 +55,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkgithub.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=-github.com/getarcaneapp/arcane/types v1.16.4 h1:IHZqn7p3e+nrn3H1//keCNeVgOe1sAxx7DiKilngC5Q=-github.com/getarcaneapp/arcane/types v1.16.4/go.mod h1:+1l8GSRoiz0Zygztr/ZIJyxHaGt3+06DspnSU5u+5+Q=+github.com/getarcaneapp/arcane/types v1.17.2 h1:NllyBCRukusIG6hrNNLojd622jr4KTVivZC0u7LpRJ4=+github.com/getarcaneapp/arcane/types v1.17.2/go.mod h1:iAliNkkpfuylrr8Va92S9Af57gzkCozeUN170ZJROAQ=github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=@@ -134,16 +134,11 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZgo.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=-go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=-go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=-go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=-go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=-go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=-go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=-go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=-go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=-go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=-go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=+go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=+go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=+go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=+go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=+go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=go.withmatt.com/size v0.0.0-20250220224316-11aee5773e67 h1:nHPqmzoLZv+9OqER7S2oXnIBDAbIaIKKrVtNtDvJzjc=go.withmatt.com/size v0.0.0-20250220224316-11aee5773e67/go.mod h1:WFmSrzphcXaSV4LG3YfIw42bPHDK8A6WsAYZCxyys/c=go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=diff --git a/cli/internal/cmdutil/pagination.go b/cli/internal/cmdutil/pagination.gonew file mode 100644index 000000000..52ad94379--- /dev/null+++ b/cli/internal/cmdutil/pagination.go@@ -0,0 +1,41 @@+package cmdutil++import (+ "fmt"+ "net/url"+ "strconv"++ "github.com/spf13/cobra"+)++// ApplyPaginationParams appends limit and start query params to a list path.+// It preserves any existing query parameters on the path.+func ApplyPaginationParams(+ cmd *cobra.Command,+ path string,+ resource string,+ limitFlagName string,+ limitFlagValue int,+ fallbackDefault int,+ startFlagName string,+ start int,+) (string, error) {+ parsed, err := url.Parse(path)+ if err != nil {+ return "", fmt.Errorf("failed to parse path: %w", err)+ }++ query := parsed.Query()+ effectiveLimit := EffectiveLimit(cmd, resource, limitFlagName, limitFlagValue, fallbackDefault)+ if effectiveLimit > 0 {+ query.Set("limit", strconv.Itoa(effectiveLimit))+ }+ if cmd != nil {+ if flag := cmd.Flags().Lookup(startFlagName); flag != nil && flag.Changed {+ query.Set("start", strconv.Itoa(start))+ }+ }++ parsed.RawQuery = query.Encode()+ return parsed.String(), nil+}diff --git a/cli/internal/integrationtest/command_helpers_test.go b/cli/internal/integrationtest/command_helpers_test.goindex ca7a92719..dbb623d48 100644--- a/cli/internal/integrationtest/command_helpers_test.go+++ b/cli/internal/integrationtest/command_helpers_test.go@@ -10,6 +10,8 @@ import ("testing"clipkg "github.com/getarcaneapp/arcane/cli/pkg"+ "github.com/spf13/cobra"+ "github.com/spf13/pflag")var stdoutCaptureMuInternal sync.Mutex@@ -37,6 +39,7 @@ func executeCLIIntegrationCommandInternal(t *testing.T, args []string) (string,t.Helper()root := clipkg.RootCommand()+ resetCommandFlagsInternal(t, root)errOut := &strings.Builder{}root.SetErr(errOut)root.SetArgs(args)@@ -70,3 +73,40 @@ func executeCLIIntegrationCommandInternal(t *testing.T, args []string) (string,return outBuf, errOut.String(), runErr}++func resetCommandFlagsInternal(t *testing.T, root *cobra.Command) {+ t.Helper()++ if root == nil {+ return+ }++ resetFlagSetInternal(t, root.PersistentFlags())+ resetFlagSetInternal(t, root.Flags())+ for _, cmd := range root.Commands() {+ resetCommandFlagsInternal(t, cmd)+ }+}++func resetFlagSetInternal(t *testing.T, flagSet *pflag.FlagSet) {+ t.Helper()++ if flagSet == nil {+ return+ }++ flagSet.VisitAll(func(flag *pflag.Flag) {+ defValue := flag.DefValue+ switch flag.Value.Type() {+ case "stringSlice", "stringArray":+ if defValue == "[]" {+ defValue = ""+ }+ }++ if err := flag.Value.Set(defValue); err != nil {+ t.Fatalf("reset flag %s: %v", flag.Name, err)+ }+ flag.Changed = false+ })+}diff --git a/cli/internal/integrationtest/pagination_test.go b/cli/internal/integrationtest/pagination_test.gonew file mode 100644index 000000000..98230795e--- /dev/null+++ b/cli/internal/integrationtest/pagination_test.go@@ -0,0 +1,318 @@+package integrationtest++import (+ "encoding/json"+ "net/http"+ "net/http/httptest"+ "strings"+ "sync"+ "testing"+)++func TestContainersListSendsLimitAndStart(t *testing.T) {+ var (+ mu sync.Mutex+ gotPath string+ gotQuery string+ )++ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ mu.Lock()+ gotPath = r.URL.Path+ gotQuery = r.URL.RawQuery+ mu.Unlock()++ w.Header().Set("Content-Type", "application/json")+ _, _ = w.Write([]byte(`{+ "success": true,+ "data": [+ {"id":"abc123","names":["/nginx"],"image":"nginx:latest","state":"running","status":"Up 1 hour"}+ ],+ "pagination": {"totalPages":4,"totalItems":20,"currentPage":3,"itemsPerPage":5}+ }`))+ }))+ defer srv.Close()++ configPath := writeCLIIntegrationConfigInternal(t, srv.URL)+ outBuf, errOut, err := executeCLIIntegrationCommandInternal(+ t,+ []string{"--config", configPath, "containers", "list", "--json", "--limit", "5", "--start", "10"},+ )+ if err != nil {+ t.Fatalf("execute: %v (%s)", err, errOut)+ }++ mu.Lock()+ defer mu.Unlock()++ if gotPath != "/api/environments/0/containers" {+ t.Fatalf("path = %q, want %q", gotPath, "/api/environments/0/containers")+ }+ if !(strings.Contains(gotQuery, "limit=5") && strings.Contains(gotQuery, "start=10")) {+ t.Fatalf("query = %q, want limit=5 and start=10", gotQuery)+ }++ var got map[string]any+ if err := json.Unmarshal([]byte(strings.TrimSpace(outBuf)), &got); err != nil {+ t.Fatalf("json parse failed: %v\noutput=%s", err, outBuf)+ }+ if _, ok := got["pagination"]; !ok {+ t.Fatalf("expected pagination in output: %v", got)+ }+}++func TestContainersListExplicitStartZeroSendsStartZero(t *testing.T) {+ var (+ mu sync.Mutex+ gotPath string+ gotQuery string+ )++ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ mu.Lock()+ gotPath = r.URL.Path+ gotQuery = r.URL.RawQuery+ mu.Unlock()++ w.Header().Set("Content-Type", "application/json")+ _, _ = w.Write([]byte(`{+ "success": true,+ "data": [],+ "pagination": {"totalPages":2,"totalItems":26,"currentPage":1,"itemsPerPage":20}+ }`))+ }))+ defer srv.Close()++ configPath := writeCLIIntegrationConfigInternal(t, srv.URL)+ _, errOut, err := executeCLIIntegrationCommandInternal(+ t,+ []string{"--config", configPath, "containers", "list", "--json", "--start", "0"},+ )+ if err != nil {+ t.Fatalf("execute: %v (%s)", err, errOut)+ }++ mu.Lock()+ defer mu.Unlock()++ if gotPath != "/api/environments/0/containers" {+ t.Fatalf("path = %q, want %q", gotPath, "/api/environments/0/containers")+ }+ if !(strings.Contains(gotQuery, "start=0") && strings.Contains(gotQuery, "limit=20")) {+ t.Fatalf("query = %q, want start=0 and limit=20", gotQuery)+ }+}++func TestContainersListTextShowsShowingSummary(t *testing.T) {+ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ w.Header().Set("Content-Type", "application/json")+ _, _ = w.Write([]byte(`{+ "success": true,+ "data": [+ {"id":"abc123","names":["/nginx"],"image":"nginx:latest","state":"running","status":"Up 1 hour"}+ ],+ "pagination": {"totalPages":2,"totalItems":26,"currentPage":1,"itemsPerPage":20}+ }`))+ }))+ defer srv.Close()++ configPath := writeCLIIntegrationConfigInternal(t, srv.URL)+ outBuf, errOut, err := executeCLIIntegrationCommandInternal(+ t,+ []string{"--config", configPath, "containers", "list", "--json=false"},+ )+ if err != nil {+ t.Fatalf("execute: %v (%s)", err, errOut)+ }+ if !strings.Contains(outBuf, "Showing: 1/26 containers") {+ t.Fatalf("expected showing summary in output, got:\n%s", outBuf)+ }+}++func TestContainersListAllSkipsPaginationParams(t *testing.T) {+ var (+ mu sync.Mutex+ gotPath string+ gotQuery string+ )++ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ mu.Lock()+ gotPath = r.URL.Path+ gotQuery = r.URL.RawQuery+ mu.Unlock()++ w.Header().Set("Content-Type", "application/json")+ _, _ = w.Write([]byte(`{+ "success": true,+ "data": [],+ "pagination": {"totalPages":1,"totalItems":0,"currentPage":1,"itemsPerPage":0}+ }`))+ }))+ defer srv.Close()++ configPath := writeCLIIntegrationConfigInternal(t, srv.URL)+ _, errOut, err := executeCLIIntegrationCommandInternal(+ t,+ []string{"--config", configPath, "containers", "list", "--json", "--all"},+ )+ if err != nil {+ t.Fatalf("execute: %v (%s)", err, errOut)+ }++ mu.Lock()+ defer mu.Unlock()++ if gotPath != "/api/environments/0/containers" {+ t.Fatalf("path = %q, want %q", gotPath, "/api/environments/0/containers")+ }+ if gotQuery != "all=true" {+ t.Fatalf("query = %q, want %q", gotQuery, "all=true")+ }+}++func TestAdminEventsListEnvSendsLimitAndStart(t *testing.T) {+ var (+ mu sync.Mutex+ gotPath string+ gotQuery string+ )++ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ mu.Lock()+ gotPath = r.URL.Path+ gotQuery = r.URL.RawQuery+ mu.Unlock()++ w.Header().Set("Content-Type", "application/json")+ _, _ = w.Write([]byte(`{+ "success": true,+ "data": [+ {+ "id":"evt-1",+ "type":"container.start",+ "severity":"info",+ "title":"Container started",+ "timestamp":"2026-04-08T12:00:00Z",+ "createdAt":"2026-04-08T12:00:00Z"+ }+ ],+ "pagination": {"totalPages":5,"totalItems":15,"currentPage":3,"itemsPerPage":3}+ }`))+ }))+ defer srv.Close()++ configPath := writeCLIIntegrationConfigInternal(t, srv.URL)+ _, errOut, err := executeCLIIntegrationCommandInternal(+ t,+ []string{"--config", configPath, "admin", "events", "list-env", "--json", "--limit", "3", "--start", "6"},+ )+ if err != nil {+ t.Fatalf("execute: %v (%s)", err, errOut)+ }++ mu.Lock()+ defer mu.Unlock()++ if gotPath != "/api/events/environment/0" {+ t.Fatalf("path = %q, want %q", gotPath, "/api/events/environment/0")+ }+ if !(strings.Contains(gotQuery, "limit=3") && strings.Contains(gotQuery, "start=6")) {+ t.Fatalf("query = %q, want limit=3 and start=6", gotQuery)+ }+}++func TestTemplatesListJSONIncludesPaginatedEnvelope(t *testing.T) {+ var (+ mu sync.Mutex+ gotPath string+ gotQuery string+ )++ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ mu.Lock()+ gotPath = r.URL.Path+ gotQuery = r.URL.RawQuery+ mu.Unlock()++ w.Header().Set("Content-Type", "application/json")+ _, _ = w.Write([]byte(`{+ "success": true,+ "data": [+ {"name":"nginx","isCustom":false,"isRemote":false,"description":"Nginx template"}+ ],+ "pagination": {"totalPages":3,"totalItems":15,"currentPage":3,"itemsPerPage":7}+ }`))+ }))+ defer srv.Close()++ configPath := writeCLIIntegrationConfigInternal(t, srv.URL)+ outBuf, errOut, err := executeCLIIntegrationCommandInternal(+ t,+ []string{"--config", configPath, "templates", "list", "--json", "--limit", "7", "--start", "14"},+ )+ if err != nil {+ t.Fatalf("execute: %v (%s)", err, errOut)+ }++ mu.Lock()+ if gotPath != "/api/templates" {+ mu.Unlock()+ t.Fatalf("path = %q, want %q", gotPath, "/api/templates")+ }+ if !(strings.Contains(gotQuery, "limit=7") && strings.Contains(gotQuery, "start=14")) {+ mu.Unlock()+ t.Fatalf("query = %q, want limit=7 and start=14", gotQuery)+ }+ mu.Unlock()++ var got map[string]any+ if err := json.Unmarshal([]byte(strings.TrimSpace(outBuf)), &got); err != nil {+ t.Fatalf("json parse failed: %v\noutput=%s", err, outBuf)+ }+ if _, ok := got["success"]; !ok {+ t.Fatalf("expected success key in output: %v", got)+ }+ if _, ok := got["data"]; !ok {+ t.Fatalf("expected data key in output: %v", got)+ }+ if _, ok := got["pagination"]; !ok {+ t.Fatalf("expected pagination key in output: %v", got)+ }+}++func TestTemplatesListAllRejectsExplicitPaginationFlags(t *testing.T) {+ var (+ mu sync.Mutex+ called bool+ )++ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ mu.Lock()+ called = true+ mu.Unlock()+ w.Header().Set("Content-Type", "application/json")+ _, _ = w.Write([]byte(`{"success":true,"data":[]}`))+ }))+ defer srv.Close()++ configPath := writeCLIIntegrationConfigInternal(t, srv.URL)+ _, errOut, err := executeCLIIntegrationCommandInternal(+ t,+ []string{"--config", configPath, "templates", "list", "--all", "--limit", "50"},+ )+ if err == nil {+ t.Fatal("expected command error, got nil")+ }+ if !strings.Contains(err.Error(), "--all cannot be combined with explicit pagination flags") {+ t.Fatalf("unexpected error: %v", err)+ }+ if !strings.Contains(errOut, "--all cannot be combined with explicit pagination flags") {+ t.Fatalf("unexpected stderr output: %s", errOut)+ }+ mu.Lock()+ defer mu.Unlock()+ if called {+ t.Fatal("expected command to fail before issuing HTTP request")+ }+}diff --git a/cli/internal/output/output.go b/cli/internal/output/output.goindex 4c79979e9..4e54b679d 100644--- a/cli/internal/output/output.go+++ b/cli/internal/output/output.go@@ -154,6 +154,11 @@ func KeyValue(key string, value any) {fmt.Printf("%s: %v\n", render(keyStyle, keyText), render(valueStyle, valueText))}+// Showing prints a pagination summary in the form "Showing: shown/total label".+func Showing(shown int, total int64, label string) {+ fmt.Printf("\nShowing: %d/%d %s\n", shown, total, label)+}+func hasAnsi(s string) bool {if s == "" {return falsediff --git a/cli/internal/types/config.go b/cli/internal/types/config.goindex 204d788db..dff0f52fd 100644--- a/cli/internal/types/config.go+++ b/cli/internal/types/config.go@@ -30,6 +30,8 @@ var KnownPaginatedResources = []string{"environments","registries","templates",+ "repos",+ "gitops-syncs","users","events","apikeys",@@ -56,10 +58,14 @@ func NormalizePaginatedResource(resource string) string {return "projects"case "environment":return "environments"- case "registry", "registrys":+ case "registry", "registries":return "registries"case "template":return "templates"+ case "repo", "repos", "gitrepository", "gitrepositories", "gitrepo", "gitrepos":+ return "repos"+ case "gitops", "gitop", "gitopssync", "gitopssyncs":+ return "gitops-syncs"case "user":return "users"case "event":diff --git a/cli/internal/types/config_test.go b/cli/internal/types/config_test.gonew file mode 100644index 000000000..a556ae258--- /dev/null+++ b/cli/internal/types/config_test.go@@ -0,0 +1,28 @@+package types++import "testing"++func TestConfigLimitForRepos(t *testing.T) {+ cfg := &Config{}+ cfg.SetResourceLimit("repos", 42)++ for _, resource := range []string{"repos", "repo", "git-repositories", "git-repos"} {+ if got := cfg.LimitFor(resource); got != 42 {+ t.Fatalf("LimitFor(%q) = %d, want 42", resource, got)+ }+ }+}++func TestNormalizePaginatedResourceGitOpsSyncAliases(t *testing.T) {+ for _, resource := range []string{+ "gitops-syncs",+ "gitopssyncs",+ "gitops syncs",+ "gitops",+ "gitopssync",+ } {+ if got := NormalizePaginatedResource(resource); got != "gitops-syncs" {+ t.Fatalf("NormalizePaginatedResource(%q) = %q, want %q", resource, got, "gitops-syncs")+ }+ }+}diff --git a/cli/pkg/admin/apikeys/cmd.go b/cli/pkg/admin/apikeys/cmd.goindex 936e0ca63..dab8200e6 100644--- a/cli/pkg/admin/apikeys/cmd.go+++ b/cli/pkg/admin/apikeys/cmd.go@@ -16,6 +16,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput bool)@@ -45,9 +46,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.ApiKeys()- effectiveLimit := cmdutil.EffectiveLimit(cmd, "apikeys", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "apikeys", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -91,7 +92,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d API keys\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "API keys")return nil},}@@ -320,6 +321,7 @@ func init() {// List command flagslistCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of API keys to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")// Create command flagsdiff --git a/cli/pkg/admin/events/cmd.go b/cli/pkg/admin/events/cmd.goindex 73567882b..42bab6f22 100644--- a/cli/pkg/admin/events/cmd.go+++ b/cli/pkg/admin/events/cmd.go@@ -15,6 +15,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput bool)@@ -38,9 +39,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.Events()- effectiveLimit := cmdutil.EffectiveLimit(cmd, "events", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "events", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -84,7 +85,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d events\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "events")return nil},}@@ -100,9 +101,9 @@ var listEnvCmd = &cobra.Command{}path := types.Endpoints.EventsEnvironment(c.EnvID())- effectiveLimit := cmdutil.EffectiveLimit(cmd, "events", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "events", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -146,7 +147,7 @@ var listEnvCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d events\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "events")return nil},}@@ -194,9 +195,11 @@ func init() {EventsCmd.AddCommand(deleteCmd)listCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of events to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")listEnvCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of events to show")+ listEnvCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listEnvCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")deleteCmd.Flags().BoolVarP(&forceFlag, "force", "f", false, "Force deletion without confirmation")diff --git a/cli/pkg/admin/users/cmd.go b/cli/pkg/admin/users/cmd.goindex a6523fd01..b88709d4b 100644--- a/cli/pkg/admin/users/cmd.go+++ b/cli/pkg/admin/users/cmd.go@@ -18,6 +18,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput bool)@@ -56,9 +57,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.Users()- effectiveLimit := cmdutil.EffectiveLimit(cmd, "users", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "users", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -103,7 +104,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d users\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "users")return nil},}@@ -313,6 +314,7 @@ func init() {UsersCmd.AddCommand(deleteCmd)listCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of users to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")createCmd.Flags().StringVar(&userCreateUsername, "username", "", "Username")diff --git a/cli/pkg/containers/cmd.go b/cli/pkg/containers/cmd.goindex 0c916d2fe..8f831cdbb 100644--- a/cli/pkg/containers/cmd.go+++ b/cli/pkg/containers/cmd.go@@ -23,6 +23,7 @@ import (var (containersLimit int+ containersStart intcontainersAll boolforceFlag booljsonOutput bool@@ -67,16 +68,16 @@ var containersListCmd = &cobra.Command{}path := types.Endpoints.Containers(c.EnvID())- effectiveLimit := cmdutil.EffectiveLimit(cmd, "containers", "limit", containersLimit, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?pageSize=%d", path, effectiveLimit)- }if containersAll {- separator := "?"- if strings.Contains(path, "?") {- separator = "&"+ if cmd.Flags().Changed("limit") || cmd.Flags().Changed("start") {+ return fmt.Errorf("--all cannot be combined with explicit pagination flags")+ }+ path = fmt.Sprintf("%s?all=true", path)+ } else {+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "containers", "limit", containersLimit, 20, "start", containersStart)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}- path = fmt.Sprintf("%s%sall=true", path, separator)}resp, err := c.Get(cmd.Context(), path)@@ -116,7 +117,7 @@ var containersListCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d containers\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "containers")return nil},}@@ -653,6 +654,7 @@ func init() {// List command flagscontainersListCmd.Flags().IntVarP(&containersLimit, "limit", "n", 20, "Number of containers to show")+ containersListCmd.Flags().IntVar(&containersStart, "start", 0, "Offset for pagination")containersListCmd.Flags().BoolVarP(&containersAll, "all", "a", false, "Show all containers (including stopped)")containersListCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")diff --git a/cli/pkg/environments/cmd.go b/cli/pkg/environments/cmd.goindex 44f21ac8a..97da6a108 100644--- a/cli/pkg/environments/cmd.go+++ b/cli/pkg/environments/cmd.go@@ -20,6 +20,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput bool)@@ -57,9 +58,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.Environments()- effectiveLimit := cmdutil.EffectiveLimit(cmd, "environments", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "environments", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -99,7 +100,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d environments\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "environments")return nil},}@@ -484,6 +485,7 @@ func init() {// List command flagslistCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of environments to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")// Get command flagsdiff --git a/cli/pkg/gitops/cmd.go b/cli/pkg/gitops/cmd.goindex 75360d9e5..798fd2a26 100644--- a/cli/pkg/gitops/cmd.go+++ b/cli/pkg/gitops/cmd.go@@ -21,6 +21,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput bool)@@ -56,9 +57,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.GitOpsSyncs(c.EnvID())- effectiveLimit := cmdutil.EffectiveLimit(cmd, "gitops-syncs", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "gitops-syncs", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -107,7 +108,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d gitops syncs\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "gitops syncs")return nil},}@@ -558,6 +559,7 @@ func init() {// List command flagslistCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of syncs to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")// Create command flagsdiff --git a/cli/pkg/images/cmd.go b/cli/pkg/images/cmd.goindex d682970e0..7da6ef08a 100644--- a/cli/pkg/images/cmd.go+++ b/cli/pkg/images/cmd.go@@ -100,13 +100,6 @@ var imagesListCmd = &cobra.Command{}q := u.Query()- effectiveLimit := cmdutil.EffectiveLimit(cmd, "images", "limit", imagesLimit, 0)- if effectiveLimit > 0 {- q.Set("limit", fmt.Sprintf("%d", effectiveLimit))- }- if imagesStart > 0 {- q.Set("start", fmt.Sprintf("%d", imagesStart))- }if imagesSort != "" {q.Set("sort", imagesSort)}@@ -118,7 +111,10 @@ var imagesListCmd = &cobra.Command{}u.RawQuery = q.Encode()- path = u.String()+ path, err = cmdutil.ApplyPaginationParams(cmd, u.String(), "images", "limit", imagesLimit, 0, "start", imagesStart)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)+ }log.Debugf("Listing images from: %s", path)@@ -180,7 +176,7 @@ var imagesListCmd = &cobra.Command{}output.Table(headers, rows)- output.Info("Total: %d images", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "images")return nil},diff --git a/cli/pkg/networks/cmd.go b/cli/pkg/networks/cmd.goindex f4e944f04..4780169a5 100644--- a/cli/pkg/networks/cmd.go+++ b/cli/pkg/networks/cmd.go@@ -21,6 +21,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput boolinUseOnlyFlag bool@@ -51,9 +52,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.Networks(c.EnvID())- effectiveLimit := cmdutil.EffectiveLimit(cmd, "networks", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "networks", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -96,7 +97,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d networks\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "networks")return nil},}@@ -314,6 +315,7 @@ func init() {// List command flagslistCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of networks to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")listCmd.Flags().BoolVar(&inUseOnlyFlag, "inuse", false, "Only show networks currently in use")listCmd.Flags().BoolVar(&unusedOnlyFlag, "unused", false, "Only show networks not in use")diff --git a/cli/pkg/projects/cmd.go b/cli/pkg/projects/cmd.goindex bb12f2d99..684a74f74 100644--- a/cli/pkg/projects/cmd.go+++ b/cli/pkg/projects/cmd.go@@ -24,6 +24,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput bool@@ -57,9 +58,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.Projects(c.EnvID())- effectiveLimit := cmdutil.EffectiveLimit(cmd, "projects", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "projects", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -96,7 +97,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d projects\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "projects")return nil},}@@ -589,6 +590,7 @@ func init() {// List command flagslistCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of projects to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")// Get command flagsdiff --git a/cli/pkg/registries/cmd.go b/cli/pkg/registries/cmd.goindex 09e29ad0e..80110ae71 100644--- a/cli/pkg/registries/cmd.go+++ b/cli/pkg/registries/cmd.go@@ -15,6 +15,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput bool@@ -43,9 +44,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.ContainerRegistries()- effectiveLimit := cmdutil.EffectiveLimit(cmd, "registries", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "registries", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -89,7 +90,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d registries\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "registries")return nil},}@@ -311,6 +312,7 @@ func init() {RegistriesCmd.AddCommand(deleteCmd)listCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of registries to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")getCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")diff --git a/cli/pkg/repos/cmd.go b/cli/pkg/repos/cmd.goindex ad7fce004..a21b0bd3d 100644--- a/cli/pkg/repos/cmd.go+++ b/cli/pkg/repos/cmd.go@@ -22,6 +22,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput bool)@@ -79,9 +80,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.GitRepositories()- effectiveLimit := cmdutil.EffectiveLimit(cmd, "repos", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "repos", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -122,7 +123,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d repositories\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "repositories")return nil},}@@ -655,6 +656,7 @@ func init() {// List command flagslistCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of repositories to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")// Create command flagsdiff --git a/cli/pkg/templates/cmd.go b/cli/pkg/templates/cmd.goindex d6341afdf..96042c84a 100644--- a/cli/pkg/templates/cmd.go+++ b/cli/pkg/templates/cmd.go@@ -27,6 +27,7 @@ const maxTemplatePromptOptions = 20var (limitFlag int+ startFlag inttemplateListAll boolforceFlag booljsonOutput bool@@ -68,29 +69,57 @@ var listCmd = &cobra.Command{return err}- path := types.Endpoints.Templates()+ var (+ templates []template.Template+ totalItems int64+ jsonPayload any+ path string+ )+if templateListAll {+ if cmd.Flags().Changed("limit") || cmd.Flags().Changed("start") {+ return fmt.Errorf("--all cannot be combined with explicit pagination flags")+ }path = types.Endpoints.TemplatesAll()+ resp, err := c.Get(cmd.Context(), path)+ if err != nil {+ return fmt.Errorf("failed to list templates: %w", err)+ }+ defer func() { _ = resp.Body.Close() }()++ var result base.ApiResponse[[]template.Template]+ if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {+ return fmt.Errorf("failed to parse response: %w", err)+ }++ templates = result.Data+ totalItems = int64(len(result.Data))+ jsonPayload = result.Data} else {- effectiveLimit := cmdutil.EffectiveLimit(cmd, "templates", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path = types.Endpoints.Templates()+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "templates", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}- }- resp, err := c.Get(cmd.Context(), path)- if err != nil {- return fmt.Errorf("failed to list templates: %w", err)- }- defer func() { _ = resp.Body.Close() }()+ resp, err := c.Get(cmd.Context(), path)+ if err != nil {+ return fmt.Errorf("failed to list templates: %w", err)+ }+ defer func() { _ = resp.Body.Close() }()- var result base.ApiResponse[[]template.Template]- if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {- return fmt.Errorf("failed to parse response: %w", err)+ var result base.Paginated[template.Template]+ if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {+ return fmt.Errorf("failed to parse response: %w", err)+ }++ templates = result.Data+ totalItems = result.Pagination.TotalItems+ jsonPayload = result}if jsonOutput {- resultBytes, err := json.MarshalIndent(result.Data, "", " ")+ resultBytes, err := json.MarshalIndent(jsonPayload, "", " ")if err != nil {return fmt.Errorf("failed to marshal JSON: %w", err)}@@ -99,8 +128,8 @@ var listCmd = &cobra.Command{}headers := []string{"NAME", "CUSTOM", "REMOTE", "DESCRIPTION"}- rows := make([][]string, len(result.Data))- for i, tpl := range result.Data {+ rows := make([][]string, len(templates))+ for i, tpl := range templates {custom := "no"if tpl.IsCustom {custom = "yes"@@ -118,7 +147,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d templates\n", len(result.Data))+ output.Showing(len(templates), totalItems, "templates")return nil},}@@ -1144,6 +1173,7 @@ func init() {TemplatesCmd.AddCommand(fetchCmd)listCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of templates to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVarP(&templateListAll, "all", "a", false, "List all templates (including remote)")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")defaultCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")diff --git a/cli/pkg/volumes/cmd.go b/cli/pkg/volumes/cmd.goindex c4569f975..15caa46c0 100644--- a/cli/pkg/volumes/cmd.go+++ b/cli/pkg/volumes/cmd.go@@ -21,6 +21,7 @@ import (var (limitFlag int+ startFlag intforceFlag booljsonOutput boolinUseOnlyFlag bool@@ -58,9 +59,9 @@ var listCmd = &cobra.Command{}path := types.Endpoints.Volumes(c.EnvID())- effectiveLimit := cmdutil.EffectiveLimit(cmd, "volumes", "limit", limitFlag, 20)- if effectiveLimit > 0 {- path = fmt.Sprintf("%s?limit=%d", path, effectiveLimit)+ path, err = cmdutil.ApplyPaginationParams(cmd, path, "volumes", "limit", limitFlag, 20, "start", startFlag)+ if err != nil {+ return fmt.Errorf("failed to build pagination query: %w", err)}resp, err := c.Get(cmd.Context(), path)@@ -102,7 +103,7 @@ var listCmd = &cobra.Command{}output.Table(headers, rows)- fmt.Printf("\nTotal: %d volumes\n", result.Pagination.TotalItems)+ output.Showing(len(result.Data), result.Pagination.TotalItems, "volumes")return nil},}@@ -445,6 +446,7 @@ func init() {// List command flagslistCmd.Flags().IntVarP(&limitFlag, "limit", "n", 20, "Number of volumes to show")+ listCmd.Flags().IntVar(&startFlag, "start", 0, "Offset for pagination")listCmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")listCmd.Flags().BoolVar(&inUseOnlyFlag, "inuse", false, "Only show volumes currently in use")listCmd.Flags().BoolVar(&unusedOnlyFlag, "unused", false, "Only show volumes not in use")diff --git a/go.work.sum b/go.work.sumindex 70e39a8be..5b5f4d81e 100644--- a/go.work.sum+++ b/go.work.sum@@ -70,6 +70,7 @@ github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.3 h1:2afWGsMzkIcN8Qm4mgPgithub.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.3/go.mod h1:dppbR7CwXD4pgtV9t3wD1812RaLDcBjtblcDF5f1vI0=github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 h1:DHa2U07rk8syqvCge0QIGMCE1WxGj9njT44GH7zNJLQ=github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 h1:owcC2UnmsZycprQ5RfRgjydWhuoxg71LUfyiQdijZuM=github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0/go.mod h1:ZPpqegjbE99EPKsu3iUWV22A04wzGPcAY/ziSIQEEgs=