Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix salt-call event.send call with grains and pillar #61256

Merged
merged 3 commits into from
Jan 4, 2022

Conversation

cbosdo
Copy link
Contributor

@cbosdo cbosdo commented Nov 18, 2021

What does this PR do?

Convert the __grains__ and __pillar__ loaders into dictionaries to avoid mangling the data when sending the event.

What issues does this PR fix or reference?

Fixes: #61252

Merge requirements satisfied?

Commits signed with GPG?

Yes

@cbosdo cbosdo requested a review from a team as a code owner November 18, 2021 13:49
@cbosdo cbosdo requested review from Ch3LL and removed request for a team November 18, 2021 13:49
agraul
agraul previously approved these changes Nov 18, 2021
@github-actions
Copy link

Hi! I'm your friendly PR bot!

You might be wondering what I'm doing commenting here on your PR.

Yes, as a matter of fact, I am...

I'm just here to help us improve the documentation. I can't respond to
questions or anything, but what I can do, I do well!

Okay... so what do you do?

I detect modules that are missing docstrings or "CLI Example" on existing docstrings!
When I was created we had a lot of these. The documentation for these
modules need some love and attention to make Salt better for our users.

So what does that have to do with my PR?

I noticed that in this PR there are some files changed that have some of these
issues. So I'm leaving this comment to let you know your options.

Okay, what are they?

Well, my favorite, is that since you were making changes here I'm hoping that
you would be the most familiar with this module and be able to add some other
examples or fix any of the reported issues.

If I can, then what?

Well, you can either add them to this PR or add them to another PR. Either way is fine!

Well... what if I can't, or don't want to?

That's also fine! We appreciate all contributions to the Salt Project. If you
can't add those other examples, either because you're too busy, or unfamiliar,
or you just aren't interested, we still appreciate the contributions that
you've made already.

Whatever approach you decide to take, just drop a comment here letting us know!

Detected Issues (click me)
[INFO] Initializing environment for https://github.com/saltstack/pip-tools-compile-impersonate.
[INFO] Initializing environment for https://github.com/asottile/pyupgrade.
[INFO] Initializing environment for https://github.com/saltstack/pre-commit-remove-import-headers.
[INFO] Initializing environment for https://github.com/s0undt3ch/salt-rewrite.
[INFO] Initializing environment for https://github.com/timothycrosley/isort.
[INFO] Initializing environment for https://github.com/timothycrosley/isort:toml.
[INFO] Initializing environment for https://github.com/psf/black.
[INFO] Initializing environment for https://github.com/asottile/blacken-docs.
[INFO] Initializing environment for https://github.com/asottile/blacken-docs:black==21.7b0.
[INFO] Initializing environment for https://github.com/PyCQA/bandit.
[INFO] Initializing environment for https://github.com/saltstack/invoke-pre-commit.
[INFO] Initializing environment for https://github.com/saltstack/invoke-pre-commit:blessings,distro,jinja2,msgpack,pyyaml.
[INFO] Initializing environment for https://github.com/saltstack/mirrors-nox.
[INFO] Initializing environment for https://github.com/saltstack/mirrors-nox:pip>=20.2.4,<21.2,setuptools<58.0.
[INFO] Installing environment for https://github.com/saltstack/invoke-pre-commit.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
Check Known Missing Docstrings...........................................Passed
- hook id: invoke
- duration: 1.36s

Thanks again!

salt/modules/event.py Outdated Show resolved Hide resolved
@Ch3LL Ch3LL added the Phosphorus v3005.0 Release code name and version label Dec 10, 2021
salt/modules/event.py Outdated Show resolved Hide resolved
@cbosdo
Copy link
Contributor Author

cbosdo commented Dec 15, 2021

@dwoz just applied your suggestion. Thanks for the review

@Ch3LL Ch3LL requested a review from dwoz December 15, 2021 20:13
@Ch3LL Ch3LL merged commit 374723c into saltstack:master Jan 4, 2022
@cbosdo cbosdo deleted the event-send-fix branch January 31, 2022 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Phosphorus v3005.0 Release code name and version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] event.send with_grains=True fails silently
4 participants