Merge pull request #466 from dsidirop/ksidirop/NCLI-0465-connection-name-flag

#465 connection name flag

Author: ripienaar

.gitignore

@@ -47,3 +47,4 @@ pkg
 dist
 natscli
 nats/nats
+nats/main

cli/cli.go

@@ -69,6 +69,8 @@ type Options struct {
 	TlsCA string
 	// Timeout is how long to wait for operations
 	Timeout time.Duration
+	// ConnectionName is the name to use for the underlying NATS connection
+	ConnectionName string
 	// Username is the username or token to connect with
 	Username string
 	// Password is the password to connect with

cli/util.go

@@ -395,8 +395,13 @@ func natsOpts() []nats.Option {
 	copts, err := opts.Config.NATSOptions()
 	kingpin.FatalIfError(err, "configuration error")
 
+	connectionName := strings.TrimSpace(opts.ConnectionName)
+	if len(connectionName) == 0 {
+		connectionName = "NATS CLI Version " + Version
+	}
+
 	return append(copts, []nats.Option{
-		nats.Name("NATS CLI Version " + Version),
+		nats.Name(connectionName),
 		nats.MaxReconnects(-1),
 		nats.DisconnectErrHandler(func(nc *nats.Conn, err error) {
 			if err != nil {

nats/main.go

@@ -47,6 +47,7 @@ See 'nats cheat' for a quick cheatsheet of commands
 	ncli.Flag("server", "NATS server urls").Short('s').Envar("NATS_URL").PlaceHolder("NATS_URL").StringVar(&opts.Servers)
 	ncli.Flag("user", "Username or Token").Envar("NATS_USER").PlaceHolder("NATS_USER").StringVar(&opts.Username)
 	ncli.Flag("password", "Password").Envar("NATS_PASSWORD").PlaceHolder("NATS_PASSWORD").StringVar(&opts.Password)
+	ncli.Flag("connection-name", "Nickname to use for the underlying NATS Connection").Default("NATS CLI Version " + version).PlaceHolder("NAME").StringVar(&opts.ConnectionName)
 	ncli.Flag("creds", "User credentials").Envar("NATS_CREDS").PlaceHolder("NATS_CREDS").StringVar(&opts.Creds)
 	ncli.Flag("nkey", "User NKEY").Envar("NATS_NKEY").PlaceHolder("NATS_NKEY").StringVar(&opts.Nkey)
 	ncli.Flag("tlscert", "TLS public certificate").Envar("NATS_CERT").PlaceHolder("NATS_CERT").ExistingFileVar(&opts.TlsCert)
@@ -55,9 +56,9 @@ See 'nats cheat' for a quick cheatsheet of commands
 	ncli.Flag("timeout", "Time to wait on responses from NATS").Default("5s").Envar("NATS_TIMEOUT").PlaceHolder("NATS_TIMEOUT").DurationVar(&opts.Timeout)
 	ncli.Flag("js-api-prefix", "Subject prefix for access to JetStream API").PlaceHolder("PREFIX").StringVar(&opts.JsApiPrefix)
 	ncli.Flag("js-event-prefix", "Subject prefix for access to JetStream Advisories").PlaceHolder("PREFIX").StringVar(&opts.JsEventPrefix)
-	ncli.Flag("js-domain", "JetStream domain to access").PlaceHolder("PREFIX").PlaceHolder("DOMAIN").StringVar(&opts.JsDomain)
+	ncli.Flag("js-domain", "JetStream domain to access").PlaceHolder("DOMAIN").StringVar(&opts.JsDomain)
 	ncli.Flag("inbox-prefix", "Custom inbox prefix to use for inboxes").PlaceHolder("PREFIX").StringVar(&opts.InboxPrefix)
-	ncli.Flag("domain", "JetStream domain to access").PlaceHolder("PREFIX").PlaceHolder("DOMAIN").Hidden().StringVar(&opts.JsDomain)
+	ncli.Flag("domain", "JetStream domain to access").PlaceHolder("DOMAIN").Hidden().StringVar(&opts.JsDomain)
 	ncli.Flag("context", "Configuration context").Envar("NATS_CONTEXT").StringVar(&opts.CfgCtx)
 	ncli.Flag("trace", "Trace API interactions").BoolVar(&opts.Trace)