Skip to content

Commit

Permalink
(puppetlabsGH-537) Small updates based on PR review
Browse files Browse the repository at this point in the history
  • Loading branch information
nmaludy committed Oct 15, 2019
1 parent ab7a7c4 commit c1b2393
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 17 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
* **New stub for `out::message` available for `BoltSpec::Plans`** ([#1217](https://github.com/puppetlabs/bolt/pull/1217))

Users can now use `BoltSpec::Plans` to test plans that contain calls to `out::message`.

* **New sub command `bolt group show`** ([#537](https://github.com/puppetlabs/bolt/issues/537))

The CLI now provides a new command `bolt group show` that will list all of the groups in the inventory file.

## 1.31.1

Expand Down
3 changes: 1 addition & 2 deletions lib/bolt/bolt_option_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
module Bolt
class BoltOptionParser < OptionParser
OPTIONS = { inventory: %w[nodes targets query rerun description],
group: %w[nodes targets query rerun description],
authentication: %w[user password private-key host-key-check ssl ssl-verify],
escalation: %w[run-as sudo-password],
run_context: %w[concurrency inventoryfile save-rerun],
Expand All @@ -33,7 +32,7 @@ def get_help_text(subcommand, action = nil)
{ flags: OPTIONS[:inventory] + OPTIONS[:global] + %w[format inventoryfile boltdir configfile],
banner: INVENTORY_HELP }
when 'group'
{ flags: OPTIONS[:group] + OPTIONS[:global] + %w[format inventoryfile boltdir configfile],
{ flags: OPTIONS[:global] + %w[format inventoryfile boltdir configfile],
banner: GROUP_HELP }
when 'plan'
case action
Expand Down
16 changes: 1 addition & 15 deletions spec/integration/inventory_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -409,21 +409,7 @@ def fact_plan(name = 'facts_test')
}
} }
] }
],
config: {
ssh: { 'host-key-check' => false },
winrm: { ssl: false, 'ssl-verify' => false }
},
vars: {
daffy: "duck"
},
facts: {
scooby: 'doo',
cloud: {
provider: 'Azure',
foo: 'bar'
}
} }
] }
end

it 'lists groups in inventory' do
Expand Down

0 comments on commit c1b2393

Please sign in to comment.