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

[3006.x] fix yaml output #66783

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Conversation

tomdoherty
Copy link

@tomdoherty tomdoherty commented Aug 7, 2024

In b9be2de, OrderedDict was replaced with HashableOrderedDict. Add logic to yamldumper to handle the new type.

What does this PR do?

What issues does this PR fix or reference?

Fixes #66594

Previous Behavior

% sudo salt-call state.show_sls salt.netbox-download --out=yaml
local: NULL
%

New Behavior

% sudo salt-call state.show_sls salt.netbox-download --out=yaml
local:
  salt.netbox-download_manage_file_netbox-download.sh:
    file:
    - name: /bootstrap/netbox-download.sh
    - source: salt://salt/netbox-download/files/netbox-download.sh
    - mode: '0755'
    - managed
    - order: 10002
...

Merge requirements satisfied?

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

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices, including the
PR Guidelines.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@tomdoherty tomdoherty requested a review from a team as a code owner August 7, 2024 14:25
@tomdoherty tomdoherty requested a review from twangboy August 7, 2024 14:25
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title fix yaml output [master] fix yaml output Aug 7, 2024
@dmurphy18
Copy link
Contributor

@tomdoherty This might be better done on the 3006.x branch, given it is a 3006 bug, and the fix will see release sooner that any fix from the master branch. Fixes on 3006.x are merge-forwarded to 3007.x and master branches.

@tomdoherty tomdoherty changed the base branch from master to 3006.x September 18, 2024 12:05
@tomdoherty tomdoherty requested a review from a team as a code owner September 18, 2024 12:05
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title [master] fix yaml output [3006.x] fix yaml output Sep 18, 2024
@tomdoherty tomdoherty force-pushed the tomdoherty-fix-yaml-output branch from 01b3c5e to afebba3 Compare September 18, 2024 12:07
@tomdoherty
Copy link
Author

@tomdoherty This might be better done on the 3006.x branch, given it is a 3006 bug, and the fix will see release sooner that any fix from the master branch. Fixes on 3006.x are merge-forwarded to 3007.x and master branches.

Thanks for the heads-up @dmurphy18! Done

In b9be2de, OrderedDict was replaced with HashableOrderedDict.
Add logic to yamldumper to handle the new type.
@tomdoherty tomdoherty force-pushed the tomdoherty-fix-yaml-output branch from 2fe075b to b7b29ec Compare September 19, 2024 08:51
Copy link

welcome bot commented Sep 20, 2024

Congratulations on your first PR being merged! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] [Regression] yaml output broken in 3006.8
4 participants