fix for salt.runner.mine not returning any data #68188 #68263
+9
−1
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
twangboy
requested changes
Aug 15, 2025
| @@ -17,8 +19,14 @@ def get(tgt, fun, tgt_type="glob"): | |||
| salt-run mine.get '*' network.interfaces | |||
| """ | |||
| masterapi = salt.daemons.masterapi.RemoteFuncs(__opts__) | |||
|
|
|||
| id = __opts__["id"] | |||
| pattern = re.escape("_master") + r"$" | |||
There was a problem hiding this comment.
id = id.rstrip("_master")
There was a problem hiding this comment.
That can strip more than expected:
>>> "foo-retsam_master".rstrip("_master")
'foo-'Why not just unconditionally
load = {
"id": __opts__["id"].removesuffix("_master")
#...below?
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 removes the appended _master from the created master id.
What issues does this PR fix or reference?
Fixes the salt-run mine.get call not returning any data
Previous Behavior
If salt-run mine.get was called, no data was ever returned
New Behavior
now salt-run mine.get does return the requested mine data
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No