Rename NATS server terminology to Choria Broker#225
Merged
Conversation
The Ruby MCollective server_resolver splits middleware_hosts on ':', so 'nats://broker:4222' produces three elements instead of two and breaks the NATS connection. The correct format is 'host:port' without the nats:// prefix because the NATS connector adds the scheme itself when constructing URIs. Signed-off-by: nmburgan <13688219+nmburgan@users.noreply.github.com>
bastelfreak
approved these changes
Apr 22, 2026
6011e34 to
2a349a8
Compare
jay7x
approved these changes
Apr 23, 2026
7877175 to
3162743
Compare
Rename nats-servers and nats-connection-timeout to match Choria's user-facing terminology. CLI flags become --choria-brokers and --choria-broker-timeout. Internal transport config keys use the bare forms (brokers, broker-timeout) consistent with all other choria options. The CLI parser splits comma-separated broker lists into arrays, matching the --targets pattern. When a broker address omits the port, default to 4222. Also replace [x].flatten with Array(x) in client.rb for clarity, and add CLI parser tests for the new choria flags. Signed-off-by: nmburgan <13688219+nmburgan@users.noreply.github.com>
3162743 to
139d85f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Short description
"NATS" is an implementation detail of the Choria broker. Rename to
match Choria's user-facing terminology and bring the options in line
with the choria- prefix used by all other Choria transport options.
When choria-brokers is not provided, the client checks the config
file, then SRV records, then falls back to puppet:4222.
Also updates instructions to not specify "nats://" in the broker strings, since this was incorrect and would result in breakage.
Checklist
I have:
Signed-off-byannotation to each of my commits