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

[master] Account for included states that only include other states used as requisites #65326

Merged

Conversation

garethgreenaway
Copy link
Contributor

@garethgreenaway garethgreenaway commented Oct 2, 2023

What does this PR do?

Keep track when an included file only includes sls files but is a requisite.

What issues does this PR fix or reference?

Fixes: #65080

Previous Behavior

If the contents of an included state file only includes other state files that original state file cannot be used as a requisite.

New Behavior

Keep track of included files to ensure they can be used as requisites if they only include other state 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.

@garethgreenaway garethgreenaway requested a review from a team as a code owner October 2, 2023 20:20
@garethgreenaway garethgreenaway requested review from whytewolf and removed request for a team October 2, 2023 20:20
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title Account for included states that only include other states used as requisites [master] Account for included states that only include other states used as requisites Oct 2, 2023
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 20:39 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 20:39 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 20:39 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 20:39 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 20:57 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 21:00 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 22:31 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 22:31 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 22:31 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 22:31 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 22:50 — with GitHub Actions Inactive
whytewolf
whytewolf previously approved these changes Oct 2, 2023
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 22:58 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 23:48 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 23:48 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 23:48 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 2, 2023 23:48 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 3, 2023 00:04 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci October 3, 2023 00:08 — with GitHub Actions Inactive
whytewolf
whytewolf previously approved these changes Nov 22, 2023
salt/state.py Outdated Show resolved Hide resolved
tests/pytests/integration/states/test_include.py Outdated Show resolved Hide resolved
dmurphy18 and others added 2 commits December 4, 2023 13:42
@dmurphy18 dmurphy18 dismissed s0undt3ch’s stale review December 8, 2023 17:31

committed one suggestion and given the state of the team, leaving the tests where Gareth originally placed them

@dmurphy18 dmurphy18 merged commit 41d69cf into saltstack:master Dec 8, 2023
515 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[3006.x][BUG] A state can't require a sls containing only includes
4 participants