Fix state includes in a dynamic environment #61201
Conversation
nicholasmhughes
requested review from
twangboy
and removed request for
a team
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 Okay... so what do you do? I detect modules that are missing docstrings or "CLI Example" on existing docstrings! 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 Okay, what are they? Well, my favorite, is that since you were making changes here I'm hoping that 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 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: 2.12s Thanks again! |
|
re-run pr-centos-7-x86_64-py3-pytest |
|
re-run pr-centos-7-x86_64-py3-tcp-pytest |
| @@ -3450,7 +3450,7 @@ def __contains__(self, saltenv): | |||
| def __getitem__(self, saltenv): | |||
| if saltenv != "base": | |||
| self._fill() | |||
| if self._avail[saltenv] is None: | |||
| if saltenv not in self._avail or self._avail[saltenv] is None: | |||
There was a problem hiding this comment.
Missed the review period - I was going to suggest this could be simplified as:
| if saltenv not in self._avail or self._avail[saltenv] is None: | |
| if self._avail.get(saltenv) is None: |
What does this PR do?
Including another state when running with a dynamic saltenv in
file_rootsthrows an error. See issue for more info.What issues does this PR fix or reference?
Fixes: #61200
Previous Behavior
Error thrown if running a state which includes another state when using dynamic environments.
New Behavior
Properly search the dynamic environment name for included files.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.