(MODULES-6268) Fix error when switching monthly trigger types #17
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 when changing from a monthly day of week to a monthly date trigger type (and vice versa) Puppet would raise an error. This was due to Puppet using the same schedule name (monthly) for two distinct trigger types in windows API. This commit adds an additional check to the tiggers_same? method which also evaluates the underlying trigger type, not just the Puppet representation to determine if two triggers are indeed the same. This commit also adds tests for this scenario.
michaeltlombardi
approved these changes
Feb 21, 2018
Iristyle
reviewed
Feb 28, 2018
| @@ -241,6 +241,7 @@ def flush | |||
| def triggers_same?(current_trigger, desired_trigger) | |||
| return false unless current_trigger['schedule'] == desired_trigger['schedule'] | |||
| return false if current_trigger.has_key?('enabled') && !current_trigger['enabled'] | |||
| return false if translate_hash_to_trigger(desired_trigger)['trigger_type'] != translate_hash_to_trigger(current_trigger)['trigger_type'] | |||
There was a problem hiding this comment.
I think this is an unnecessary conversion for 2 reasons:
- the
'schedule'value should be setting thetrigger_type, so those should be directly comparable betweendesired_triggerandcurrent_trigger- see https://github.com/puppetlabs/puppetlabs-scheduled_task/blob/master/lib/puppet/provider/scheduled_task/taskscheduler_api2.rb#L297 - We call
translate_hash_to_triggera few lines later... so if the first point holds untrue for some reason, probably don't need to build the same object multiple times
There was a problem hiding this comment.
After discussing with @glennsarti, realized that in its current state, we do need to perform the conversion to compare because there are 2 different types of "monthly" schedules.
That said, we identified some room for improvement in the overall flow of trigger hash building / initial resource population and will file a new ticket for refactoring some of that, which will introduce some refactoring here as well.
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 when changing from a monthly day of week to a monthly date trigger
type (and vice versa) Puppet would raise an error. This was due to Puppet using
the same schedule name (monthly) for two distinct trigger types in windows API.
This commit adds an additional check to the tiggers_same? method which also
evaluates the underlying trigger type, not just the Puppet representation to
determine if two triggers are indeed the same. This commit also adds tests for
this scenario.