Merge pull request #1165 from ripienaar/minor_ux

Minor UX updates
nats-io · Oct 7, 2024 · e042b43 · e042b43
2 parents 2f5d688 + 33e9a3c
commit e042b43
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/cli/pub_command.go b/cli/pub_command.go
@@ -266,7 +266,14 @@ func (c *pubCmd) doJetstream(nc *nats.Conn, progress *uiprogress.Bar) error {
 			progress.Incr()
 		}
 
-		fmt.Printf(">>> Stream: %v Sequence: %s Duplicate: %t Domain: %q\n", ack.Stream, f(ack.Sequence), ack.Duplicate, ack.Domain)
+		fmt.Printf(">>> Stream: %s Sequence: %s", ack.Stream, f(ack.Sequence))
+		if ack.Domain != "" {
+			fmt.Printf(" Domain: %q", ack.Domain)
+		}
+		if ack.Duplicate {
+			fmt.Printf(" Duplicate: true")
+		}
+		fmt.Println()
 
 		// If applicable, account for the wait duration in a publish sleep.
 		if c.cnt > 1 && c.sleep > 0 {

diff --git a/cli/server_request_command.go b/cli/server_request_command.go
@@ -139,7 +139,7 @@ func configureServerRequestCommand(srv *fisk.CmdClause) {
 	healthz.Flag("details", "Include extended details about all failures").Default("true").BoolVar(&c.includeDetails)
 
 	profilez := req.Command("profile", "Run a profile").Action(c.profilez)
-	profilez.Arg("profile", "Specify the name of the profile to run (allocs, heap, goroutine, mutex, threadcreate, block, cpu)").StringVar(&c.profileName)
+	profilez.Arg("profile", "Specify the name of the profile to run (allocs, heap, goroutine, mutex, threadcreate, block, cpu)").Required().EnumVar(&c.profileName, "allocs", "heap", "goroutine", "mutex", "threadcreate", "block", "cpu")
 	profilez.Arg("dir", "Set the output directory for profile files").Default(".").ExistingDirVar(&c.profileDir)
 	profilez.Flag("level", "Set the debug level of the profile").IntVar(&c.profileDebug)
 

diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/nats-io/jsm.go v0.1.1-0.20240925194717-21ca5720ba1e
 	github.com/nats-io/jwt/v2 v2.7.0
-	github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240925161109-4c21aa3ac686
+	github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241004162106-225cd3dd6eca
 	github.com/nats-io/nats.go v1.37.0
 	github.com/nats-io/nkeys v0.4.7
 	github.com/nats-io/nuid v1.0.1

diff --git a/go.sum b/go.sum
@@ -110,8 +110,8 @@ github.com/nats-io/jsm.go v0.1.1-0.20240925194717-21ca5720ba1e h1:gqWFexXLEEyvJV
 github.com/nats-io/jsm.go v0.1.1-0.20240925194717-21ca5720ba1e/go.mod h1:ATEgF+8pfA1tQ79KBHuspyUsXQrHYDkh5WRT+Ie0XiU=
 github.com/nats-io/jwt/v2 v2.7.0 h1:J+ZnaaMGQi3xSB8iOhVM5ipiWCDrQvgEoitTwWFyOYw=
 github.com/nats-io/jwt/v2 v2.7.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A=
-github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240925161109-4c21aa3ac686 h1:Kav0QoU/92ToG/V4O1rnjGtC9Y7UiC0otXl3FmGWMiI=
-github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240925161109-4c21aa3ac686/go.mod h1:7ME9V++zVk2hoBe5VOvq/WMQuOuNeyhG63bOwWWokZY=
+github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241004162106-225cd3dd6eca h1:EcjPbDziop5sCVOpWOhUXTcQPAg1of3p+MgczwJubUo=
+github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241004162106-225cd3dd6eca/go.mod h1:LkVD8QXFfIxYsQCn3r0NHJk48PIg2XY1RqVBDTQwYuU=
 github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE=
 github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
 github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=