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

[3006.x] File source_hash ignored salt:... #64227

Merged
merged 6 commits into from
May 4, 2023
Merged

[3006.x] File source_hash ignored salt:... #64227

merged 6 commits into from
May 4, 2023

Conversation

cmcmarrow
Copy link
Contributor

@cmcmarrow cmcmarrow commented May 3, 2023 •
edited
Loading

What does this PR do?

file.managed: source_hash ignored when contents_pillar or source=salt://... is used

What issues does this PR fix or reference?

Fixes: #63810

Previous Behavior

Remove this section if not relevant
file.managed: source_hash ignored when contents_pillar or source=salt://... is used

New Behavior

Remove this section if not relevant
an error is raised

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

@cmcmarrow cmcmarrow requested a review from a team as a code owner May 3, 2023 18:31
@cmcmarrow cmcmarrow requested review from Ch3LL and removed request for a team May 3, 2023 18:31
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title File m doc [3006.x] File m doc May 3, 2023
@cmcmarrow cmcmarrow changed the title [3006.x] File m doc [3006.x] File source_hash ignored salt:... May 3, 2023
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 19:12 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 19:12 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 19:15 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 20:27 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 20:28 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 20:33 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch linked an issue May 3, 2023 that may be closed by this pull request
[BUG] file.managed: source_hash ignored when contents_pillar or source=salt://... is used #63810
Closed
9 tasks
@cmcmarrow cmcmarrow force-pushed the file_m_doc branch 2 times, most recently from 53ddf1f to 55d3258 Compare May 3, 2023 22:40
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 23:51 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 23:51 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 3, 2023 23:51 — with GitHub Actions Inactive
@anilsil anilsil requested a review from s0undt3ch May 4, 2023 02:17
@cmcmarrow cmcmarrow temporarily deployed to ci May 4, 2023 03:09 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 4, 2023 03:09 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 4, 2023 03:09 — with GitHub Actions Inactive
twangboy
twangboy previously approved these changes May 4, 2023
View reviewed changes
@anilsil anilsil added this to the Sulfur v3006.1 milestone May 4, 2023
@cmcmarrow cmcmarrow temporarily deployed to ci May 4, 2023 05:11 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 4, 2023 05:11 — with GitHub Actions Inactive
@cmcmarrow cmcmarrow temporarily deployed to ci May 4, 2023 05:11 — with GitHub Actions Inactive
s0undt3ch
s0undt3ch reviewed May 4, 2023
View reviewed changes
salt/states/file.py Outdated Show resolved Hide resolved
salt/states/file.py Outdated Show resolved Hide resolved
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 07:04 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 07:04 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 07:04 — with GitHub Actions Inactive
@s0undt3ch
HTTPS is also valid. Switch to parametrized test.
eeaf895 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 08:01 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 08:01 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 08:02 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 08:58 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 08:58 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch temporarily deployed to ci May 4, 2023 08:58 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch merged commit 42d3eaa into saltstack:3006.x May 4, 2023
@s0undt3ch s0undt3ch deleted the file_m_doc branch May 4, 2023 09:32
@cmcmarrow cmcmarrow added test:no-fast Disable Fast Tests test:core Enable Core Tests test:slow Enable Slow Tests and removed test:core Enable Core Tests test:slow Enable Slow Tests test:no-fast Disable Fast Tests labels May 4, 2023
@anilsil anilsil mentioned this pull request May 4, 2023
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s0undt3ch s0undt3ch s0undt3ch left review comments

@twangboy twangboy twangboy left review comments

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

Assignees
No one assigned
Labels
Sulfur v3006.1
Projects
None yet
Milestone
Sulfur v3006.1
Development

Successfully merging this pull request may close these issues.

[BUG] file.managed: source_hash ignored when contents_pillar or source=salt://... is used
4 participants
@cmcmarrow @s0undt3ch @twangboy @anilsil