Skip to content

(#2314) Re-enable choria broker object and initialize natscli context #2315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skel84 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

(#2314) Re-enable choria broker object and initialize natscli context #2315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion cmd/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/choria-io/go-choria/build"
"github.com/choria-io/go-choria/choria"
"github.com/nats-io/jsm.go"
"github.com/nats-io/jsm.go/natscontext"
"github.com/nats-io/nats.go/jetstream"
natscli "github.com/nats-io/natscli/cli"
"github.com/nats-io/natscli/options"
Expand All @@ -34,7 +35,7 @@ func (b *brokerCommand) Setup() (err error) {
b.cmd.Flag("connect-timeout", "Connection timeout").Default("5s").DurationVar(&b.timeout)

opts, err := natscli.ConfigureInCommand(b.cmd, &options.Options{NoCheats: true, Timeout: 5 * time.Second}, false,
"audit", "run", "cheat", "rtt", "latency", "backup", "restore", "bench", "schema", "errors", "kv", "object", "micro", "context", "auth", "service")
"audit", "run", "cheat", "rtt", "latency", "backup", "restore", "bench", "schema", "errors", "kv", "micro", "context", "auth", "service")
if err != nil {
return err
}
Expand Down Expand Up @@ -73,6 +74,12 @@ func (b *brokerCommand) prepareNatsCli(pc *fisk.ParseContext, opts *options.Opti

natscli.SetContext(ctx)
natscli.SetVersion(build.Version)
if opts.Config == nil {
ctxCfg, ctxErr := natscontext.New("", false)
if ctxErr == nil {
opts.Config = ctxCfg
}
}

should := []bool{
strings.HasPrefix(cmd, "broker top"),
Expand Down
Loading