Skip to content

Rename NATS server terminology to Choria Broker#225

Merged
nmburgan merged 2 commits intomainfrom
rename-nats-to-choria-brokers
Apr 27, 2026
Merged

Rename NATS server terminology to Choria Broker#225
nmburgan merged 2 commits intomainfrom
rename-nats-to-choria-brokers

Conversation

@nmburgan
Copy link
Copy Markdown
Member

@nmburgan nmburgan commented Apr 22, 2026

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:

  • read the CONTRIBUTING.md document
  • read and accepted the Developer Certificate of Origin document and added a Signed-off-by annotation to each of my commits
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)

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>
@nmburgan nmburgan changed the title Rename nats to choria brokers Rename NATS server terminology to Choria Broker Apr 22, 2026
@nmburgan nmburgan force-pushed the rename-nats-to-choria-brokers branch from 6011e34 to 2a349a8 Compare April 22, 2026 21:16
@nmburgan nmburgan force-pushed the rename-nats-to-choria-brokers branch 4 times, most recently from 7877175 to 3162743 Compare April 23, 2026 16:10
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>
@nmburgan nmburgan force-pushed the rename-nats-to-choria-brokers branch from 3162743 to 139d85f Compare April 23, 2026 16:14
@nmburgan nmburgan merged commit 313aa89 into main Apr 27, 2026
97 of 100 checks passed
@nmburgan nmburgan deleted the rename-nats-to-choria-brokers branch April 27, 2026 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants