Make legacy and modern syntax detection work for module.wait #63006
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
redbaron4
requested review from
garethgreenaway
and removed request for
a team
PR#61772 added the ability to detect modern or legacy syntax for module.run to allow both styles to co-exist. Those changes did not fully address module.wait semantics which led to all module.wait syntaxes to be treated as legacy. Using modern syntax led to state failure in such cases. This commit adds additional keys that may be generated when module.wait is used to the list of kwargs ignored by detection algorithm. It also adds functional tests for module.wait test cases. Fixes #62988
dwoz
approved these changes
Nov 4, 2022
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.
What does this PR do?
This PR fixes
module.runsyntax detection when usingmodule.wait. It also adds test cases formodule.waituse-case.What issues does this PR fix or reference?
Fixes: #62988
Previous Behavior
module.runsyntax detection did not work formodule.waitbecause of additionalkwargspassed. This led to allmodule.waitsyntaxes to be treated as legacy and states to fail if modern style was being usedNew Behavior
sfunand__reqs__has been added to list of items ignored inkwargswhen deciding ifmodule.runsyntax is legacy or modern.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No