Add capability to specify state args as a dict #68368
Open
Conversation
This file contains hidden or 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
b2a27d9 to
a8b7362
Compare
twangboy
requested changes
Oct 31, 2025
Alright I'll look at updating docs when I get some time. |
lkubb
reviewed
Nov 3, 2025
salt/state.py
Outdated
| K = TypeVar("K") | ||
| V = TypeVar("V") | ||
| Pair = tuple[K, V] | ||
| HighDataStateArgsDef = Union[Mapping[K, V], Iterable[Union[Mapping[K, V], str]]] |
There was a problem hiding this comment.
Suggested change
| HighDataStateArgsDef = Union[Mapping[K, V], Iterable[Union[Mapping[K, V], str]]] | |
| HighDataStateArgsDef = Mapping[K, V] | Iterable[Mapping[K, V] | str] |
Minor suggestion: AFAIK 3008.0 is Python 3.10+ only, so you can use the | type operator. Unsure why pyupgrade does not catch this.
salt/state.py
Outdated
| self.states[ | ||
| "{}.{}".format(low["state"], low["fun"]) | ||
| ] # pylint: disable=W0106 | ||
| self.states[f"{low['state']}.{low['fun']}"] # pylint: disable=W0106 |
There was a problem hiding this comment.
nit: (inherited from the old code) This should have been # pylint: disable=expression-not-assigned (for clarity), but might need # pylint: disable=pointless-statement now. Maybe you can try removing the disable and see if it's necessary at all.
Also add some more type hints and change some format calls to f strings. Fix state retry tests with invalid assumptions of duration and comment.
7296a1f to
42fd957
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Also add some more type hints and change some format calls to f strings. Fix state retry tests with invalid assumptions of duration and comment.
What does this PR do?
Adds the ability to specify arguments to a state as a dictionary instead of having to specify a list of individual key: value pairs
What issues does this PR fix or reference?
Fixes #68367
Previous Behavior
Could only specify arguments to a state like this
New Behavior
Can specify arguments to a state like this
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No