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.

Sign up for GitHub

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

Jump to bottom

[master] Stop loading utils modules into __utils__ if they don't define __virtual__ #64425

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

[master] Stop loading utils modules into __utils__ if they don't define __virtual__ #64425

wants to merge 49 commits into from

Conversation

s0undt3ch
Copy link
Collaborator

What does this PR do?

See title

What issues does this PR fix or reference?

Refs: #62191

@s0undt3ch s0undt3ch requested a review from a team as a code owner June 6, 2023 06:41
@s0undt3ch s0undt3ch requested review from garethgreenaway and removed request for a team June 6, 2023 06:41
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title [WIP] Stop loading utils modules into __utils__ if they don't define __virtual__ [master][WIP] Stop loading utils modules into __utils__ if they don't define __virtual__ Jun 6, 2023
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 11:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 11:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 11:51 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 11:53 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 12:23 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 12:28 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch force-pushed the hotfix/stop-loading-utils branch from 0dd2bf9 to 44edd0a Compare June 6, 2023 16:03
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 16:37 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 16:37 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 16:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 16:39 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 17:00 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 17:00 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 17:54 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 17:54 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 17:54 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 17:54 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 17:54 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 17:54 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 18:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 18:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 18:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 18:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 18:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci June 6, 2023 18:38 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch force-pushed the hotfix/stop-loading-utils branch from 44edd0a to 7831f9b Compare June 6, 2023 18:52
@s0undt3ch
Fix tests/pytests/unit/proxy/nxos/test_nxos_nxapi.py
e0e4d34 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix tests/pytests/unit/states/test_btrfs.py
db9dcf7 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix tests/pytests/unit/states/test_win_dns_client.py
fbc1d26 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix tests/pytests/unit/states/file/test_prepend.py
affbc87 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix tests/pytests/unit/modules/win_lgpo/test_adv_audit_settings.py
6da0ebf 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix `tests/pytests/functional/states/win_lgpo/test_adv_audit_settings…
c511e63 
…_state.py`

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix tests/pytests/unit/modules/test_git.py
5622f7b 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Idem execution and state modules no longer use __utils__
417bda3 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Remove unnecessary __virtual__ functions from "safe" salt utils mod…
69173ac 
…ules

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Adjust win lgpo code for proper functional testing
071270b 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix __utils__ usage in salt/modules/{scp_mod,travisci}.py
d8e2747 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Add an AST checker to prevent __utils__ usage
9723605 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix win lgpo tests
3242bf0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Show a deprecation warning on __utils__ access that will go away in 3010
f79f57d 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Bubble up any warnings raised into state results.
bb49ef6 
Any warnings raised by Python's `warnings` module are now included in state returns under the `warnings` key.
This allows for, as an example, Salt deprecation warnings from execution modules to bubble up into state returns as opposed to only be buried in the logs.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Add changelog and update release notes
b035d0e 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Fix tests now that we capture warnings and they're returned in state …
0cae5a7 
…results

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Account for, and test, both pre and post 3009 behaviors
e45c2eb 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch
Ignore a DeprecationWarning which is breaking the test assertions
f6e6673 
```
DeprecationWarning: the load_module() method is deprecated and slated for removal in Python 3.12; use exec_module() instead
```

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch s0undt3ch force-pushed the hotfix/stop-loading-utils branch from e3843c8 to f6e6673 Compare December 15, 2023 22:50
@dwoz dwoz added this to the Argon v3008.0 milestone Dec 18, 2023
@s0undt3ch s0undt3ch self-assigned this Jan 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ch3LL Ch3LL Ch3LL requested changes

@twangboy twangboy twangboy left review comments

@garethgreenaway garethgreenaway Awaiting requested review from garethgreenaway garethgreenaway was automatically assigned from saltstack/team-core

At least 1 approving review is required to merge this pull request.

Assignees

@s0undt3ch s0undt3ch

Labels
None yet
Projects
None yet
Milestone
Argon v3008.0
Development

Successfully merging this pull request may close these issues.
4 participants
@s0undt3ch @twangboy @Ch3LL @dwoz