Merge pull request #1282 from ripienaar/gwayz_account_dets

Support gateway account details

Author: ripienaar

cli/server_request_command.go

@@ -51,14 +51,15 @@ type SrvRequestCmd struct {
 	includeAll        bool
 	includeDetails    bool
 
-	detail        bool
-	sortOpt       string
-	cidFilter     uint64
-	stateFilter   string
-	userFilter    string
-	accountFilter string
-	subjectFilter string
-	nameFilter    string
+	detail               bool
+	sortOpt              string
+	cidFilter            uint64
+	stateFilter          string
+	userFilter           string
+	accountFilter        string
+	subjectFilter        string
+	nameFilter           string
+	accountSubscriptions bool
 
 	jsServerOnly bool
 	jsEnabled    bool
@@ -100,6 +101,7 @@ func configureServerRequestCommand(srv *fisk.CmdClause) {
 	gwyz.Arg("filter-name", "Filter results on gateway name").PlaceHolder("NAME").StringVar(&c.nameFilter)
 	gwyz.Flag("filter-account", "Show only a certain account in account detail").PlaceHolder("ACCOUNT").StringVar(&c.accountFilter)
 	gwyz.Flag("accounts", "Show account detail").UnNegatableBoolVar(&c.detail)
+	gwyz.Flag("subscriptions", "Show subscription details").Default("true").BoolVar(&c.accountSubscriptions)
 
 	healthz := req.Command("jetstream-health", "Request JetStream health status").Alias("healthz").Action(c.healthz)
 	healthz.Arg("wait", "Wait for a certain number of responses").Uint32Var(&c.waitFor)
@@ -397,6 +399,11 @@ func (c *SrvRequestCmd) gwyz(_ *fisk.ParseContext) error {
 		EventFilterOptions: c.reqFilter(),
 	}
 
+	if c.accountFilter != "" && c.detail {
+		opts.GatewayzOptions.AccountSubscriptions = c.accountSubscriptions
+		opts.GatewayzOptions.AccountSubscriptionsDetail = c.accountSubscriptions
+	}
+
 	res, err := c.doReq("GATEWAYZ", &opts, nc)
 	if err != nil {
 		return err

go.mod

@@ -61,6 +61,7 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
 	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
 	golang.org/x/net v0.35.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect

go.sum

@@ -157,6 +157,8 @@ github.com/synadia-io/jwt-auth-builder.go v0.0.4/go.mod h1:8WYR7+nLQcDMBpocuPgdF
 github.com/tylertreat/hdrhistogram-writer v0.0.0-20210816161836-2e440612a39f h1:SGznmvCovewbaSgBsHgdThtWsLj5aCLX/3ZXMLd1UD0=
 github.com/tylertreat/hdrhistogram-writer v0.0.0-20210816161836-2e440612a39f/go.mod h1:IY84XkhrEJTdHYLNy/zObs8mXuUAp9I65VyarbPSCCY=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
+go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=