Allow assets to be found based on their leader

Signed-off-by: R.I.Pienaar <[email protected]>

Author: ripienaar

cli/consumer_command.go

@@ -114,6 +114,7 @@ type consumerCmd struct {
 	fReplicas   uint
 	fInvert     bool
 	fExpression string
+	fLeader     string
 }
 
 func configureConsumerCommand(app commandHost) {
@@ -206,6 +207,7 @@ func configureConsumerCommand(app commandHost) {
 	consFind.Flag("idle", "Display consumers with no new deliveries for a period").DurationVar(&c.fIdle)
 	consFind.Flag("created", "Display consumers created longer ago than duration").PlaceHolder("DURATION").DurationVar(&c.fCreated)
 	consFind.Flag("replicas", "Display consumers with fewer or equal replicas than the value").PlaceHolder("REPLICAS").UintVar(&c.fReplicas)
+	consFind.Flag("leader", "Display only clustered streams with a specific leader").PlaceHolder("SERVER").StringVar(&c.fLeader)
 	consFind.Flag("invert", "Invert the check - before becomes after, with becomes without").BoolVar(&c.fInvert)
 	consFind.Flag("expression", "Match consumers using an expression language").StringVar(&c.fExpression)
 
@@ -332,6 +334,9 @@ func (c *consumerCmd) findAction(_ *fisk.ParseContext) error {
 	if c.fExpression != "" {
 		opts = append(opts, jsm.ConsumerQueryExpression(c.fExpression))
 	}
+	if c.fLeader != "" {
+		opts = append(opts, jsm.ConsumerQueryLeaderServer(c.fLeader))
+	}
 
 	found, err := stream.QueryConsumers(opts...)
 	if err != nil {

cli/stream_command.go

@@ -141,6 +141,7 @@ type streamCmd struct {
 	fMirrored    bool
 	fMirroredSet bool
 	fExpression  string
+	fLeader      string
 
 	listNames    bool
 	vwStartId    int
@@ -300,6 +301,7 @@ Finding streams with certain subjects configured:
 	strFind.Flag("replicas", "Display streams with fewer or equal replicas than the value").PlaceHolder("REPLICAS").UintVar(&c.fReplicas)
 	strFind.Flag("sourced", "Display that sources data from other streams").IsSetByUser(&c.fSourcedSet).UnNegatableBoolVar(&c.fSourced)
 	strFind.Flag("mirrored", "Display that mirrors data from other streams").IsSetByUser(&c.fMirroredSet).UnNegatableBoolVar(&c.fMirrored)
+	strFind.Flag("leader", "Display only clustered streams with a specific leader").PlaceHolder("SERVER").StringVar(&c.fLeader)
 	strFind.Flag("names", "Show just the stream names").Short('n').UnNegatableBoolVar(&c.listNames)
 	strFind.Flag("invert", "Invert the check - before becomes after, with becomes without").BoolVar(&c.fInvert)
 	strFind.Flag("expression", "Match streams using an expression language").StringVar(&c.fExpression)
@@ -786,6 +788,9 @@ func (c *streamCmd) findAction(_ *fisk.ParseContext) (err error) {
 	if c.fExpression != "" {
 		opts = append(opts, jsm.StreamQueryExpression(c.fExpression))
 	}
+	if c.fLeader != "" {
+		opts = append(opts, jsm.StreamQueryLeaderServer(c.fLeader))
+	}
 
 	found, err := c.mgr.QueryStreams(opts...)
 	if err != nil {

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/klauspost/compress v1.17.9
 	github.com/mattn/go-isatty v0.0.20
-	github.com/nats-io/jsm.go v0.1.1-0.20240730140702-7412cdaa18da
+	github.com/nats-io/jsm.go v0.1.1-0.20240805084700-bd1b67e6e31b
 	github.com/nats-io/jwt/v2 v2.5.8
 	github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240724152920-81805a2cd269
 	github.com/nats-io/nats.go v1.36.0

go.sum

@@ -50,9 +50,8 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-tpm v0.9.0 h1:sQF6YqWMi+SCXpsmS3fd21oPy/vSddwZry4JnmltHVk=
 github.com/google/go-tpm v0.9.0/go.mod h1:FkNVkc6C+IsvDI9Jw1OveJmxGZUUaKxtrpOS47QWKfU=
-github.com/google/go-tpm v0.9.1 h1:0pGc4X//bAlmZzMKf8iz6IsDo1nYTbYJ6FZN/rg4zdM=
-github.com/google/go-tpm v0.9.1/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
 github.com/google/pprof v0.0.0-20240509144519-723abb6459b7 h1:velgFPYr1X9TDwLIfkV7fWqsFlf7TeP11M/7kPd/dVI=
 github.com/google/pprof v0.0.0-20240509144519-723abb6459b7/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
@@ -105,8 +104,10 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/jsm.go v0.1.1-0.20240730140702-7412cdaa18da h1:deLWy/tJeTJaP4xHaOxlaUW3MlJdNYKzYNDBx0kCMC8=
-github.com/nats-io/jsm.go v0.1.1-0.20240730140702-7412cdaa18da/go.mod h1:vjS4evCupAu70OOAxuj+GqdTNaERUHCbQ0GZ4z1gO8o=
+github.com/nats-io/jsm.go v0.1.1-0.20240730142126-363a3030eec1 h1:pcbtJWZ8NuXCyei4kFZYqhKVFb0Px15vADMMtACQRdY=
+github.com/nats-io/jsm.go v0.1.1-0.20240730142126-363a3030eec1/go.mod h1:vjS4evCupAu70OOAxuj+GqdTNaERUHCbQ0GZ4z1gO8o=
+github.com/nats-io/jsm.go v0.1.1-0.20240805084700-bd1b67e6e31b h1:s8iOxO6bLxKlyJcdLbbFxArwSgnvuyvcM6VpFgSL2fE=
+github.com/nats-io/jsm.go v0.1.1-0.20240805084700-bd1b67e6e31b/go.mod h1:vjS4evCupAu70OOAxuj+GqdTNaERUHCbQ0GZ4z1gO8o=
 github.com/nats-io/jwt/v2 v2.5.8 h1:uvdSzwWiEGWGXf+0Q+70qv6AQdvcvxrv9hPM0RiPamE=
 github.com/nats-io/jwt/v2 v2.5.8/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A=
 github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240724152920-81805a2cd269 h1:aZdINfGXdG+6xYLNrlxcdfKb9ttp9Ppk9rqD0d7KErs=