(maint) Fix apply prep for inventory v2 #1303
Merged
Conversation
This file contains 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
Previously the default plugin_hooks from config were not being set on a Target2 object. This was causing failures in apply prep https://github.com/puppetlabs/bolt/blob/345131e31c02a3047c1607ce3b6df0a484976542/bolt-modules/boltlib/lib/puppet/functions/apply_prep.rb#L103 which assumes that `plugin_hooks` will have a value. This commit updates the inventory 2 update_target_state to consider the `plugin_hooks` set in config. The merge order in order of precedence is target level in inventory, group level in inventory, specified in bolt.yaml, default.
donoghuc
force-pushed
the
fix-apply-prep-inv2
branch
from
55f3aa2
to
5aef470
Compare
|
CLA signed by all contributors. |
nicklewis
approved these changes
Oct 11, 2019
lucywyman
reviewed
Oct 14, 2019
| let(:plugins) { Bolt::Plugin.new(config, pal, Bolt::Analytics::NoopClient.new) } | ||
| let(:inventory) { Bolt::Inventory.create_version(data, config, plugins) } | ||
| let(:target) { inventory.get_target(hostname) } | ||
| let(:targets) { inventory.get_targets(hostname) } |
There was a problem hiding this comment.
I don't think this gets used anywhere?
There was a problem hiding this comment.
Yes, targets is used in the before each block.
lucywyman
approved these changes
Oct 14, 2019
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.
Previously the default plugin_hooks from config were not being set on a Target2 object. This was causing failures in apply prep
bolt/bolt-modules/boltlib/lib/puppet/functions/apply_prep.rb
Line 103 in 345131e
plugin_hookswill have a value. This commit updates the inventory 2 update_target_state to consider theplugin_hooksset in config. The merge order in order of precedence is target level in inventory, group level in inventory, specified in bolt.yaml, default.