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

vdo: Use yaml.safe_load() instead of yaml.load() #5632

Merged
merged 2 commits into from
Nov 30, 2022

Conversation

leegarrett
Copy link
Contributor

yaml.load() without specifying a Loader= is deprecated and unsafe.

For details, see
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

SUMMARY

Fixes #5631

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

vdo

Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for your contribution! Can you please add a changelog fragment? Thanks.

@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-4 labels Nov 30, 2022
@ansibullbot
Copy link
Collaborator

@ansibullbot ansibullbot added bug This issue/PR relates to a bug has_issue module module plugins plugin (any type) small_patch Hopefully easy to review system labels Nov 30, 2022
yaml.load() without specifying a Loader= is deprecated and unsafe.

For details, see
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation
…ml-load.yml

Co-authored-by: Felix Fontein <felix@fontein.de>
@leegarrett
Copy link
Contributor Author

Done, and also committed your suggestion. Thanks for the quick response!

@felixfontein felixfontein merged commit 428e181 into ansible-collections:main Nov 30, 2022
@patchback
Copy link

patchback bot commented Nov 30, 2022

Backport to stable-4: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 428e181 on top of patchback/backports/stable-4/428e181440dc92378c7326d9d2bfadda052ce372/pr-5632

Backporting merged PR #5632 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4/428e181440dc92378c7326d9d2bfadda052ce372/pr-5632 upstream/stable-4
  4. Now, cherry-pick PR vdo: Use yaml.safe_load() instead of yaml.load() #5632 contents into that branch:
    $ git cherry-pick -x 428e181440dc92378c7326d9d2bfadda052ce372
    If it'll yell at you with something like fatal: Commit 428e181440dc92378c7326d9d2bfadda052ce372 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 428e181440dc92378c7326d9d2bfadda052ce372
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR vdo: Use yaml.safe_load() instead of yaml.load() #5632 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4/428e181440dc92378c7326d9d2bfadda052ce372/pr-5632
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Nov 30, 2022
@patchback
Copy link

patchback bot commented Nov 30, 2022

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/428e181440dc92378c7326d9d2bfadda052ce372/pr-5632

Backported as #5636

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Nov 30, 2022
* vdo: Use yaml.safe_load() instead of yaml.load()

yaml.load() without specifying a Loader= is deprecated and unsafe.

For details, see
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

* Update changelogs/fragments/5632-vdo-Use-yaml-safe-load-instead-of-yaml-load.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Lee Garrett <lgarrett@rocketjump.eu>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 428e181)
@patchback
Copy link

patchback bot commented Nov 30, 2022

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/428e181440dc92378c7326d9d2bfadda052ce372/pr-5632

Backported as #5637

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein
Copy link
Collaborator

@leegarrett thanks a lot again for reporting and fixing this! :)

patchback bot pushed a commit that referenced this pull request Nov 30, 2022
* vdo: Use yaml.safe_load() instead of yaml.load()

yaml.load() without specifying a Loader= is deprecated and unsafe.

For details, see
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

* Update changelogs/fragments/5632-vdo-Use-yaml-safe-load-instead-of-yaml-load.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Lee Garrett <lgarrett@rocketjump.eu>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 428e181)
felixfontein pushed a commit that referenced this pull request Nov 30, 2022
* vdo: Use yaml.safe_load() instead of yaml.load()

yaml.load() without specifying a Loader= is deprecated and unsafe.

For details, see
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

* Update changelogs/fragments/5632-vdo-Use-yaml-safe-load-instead-of-yaml-load.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Lee Garrett <lgarrett@rocketjump.eu>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 428e181)

Co-authored-by: Lee Garrett <leegarrett@users.noreply.github.com>
felixfontein pushed a commit that referenced this pull request Nov 30, 2022
* vdo: Use yaml.safe_load() instead of yaml.load()

yaml.load() without specifying a Loader= is deprecated and unsafe.

For details, see
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

* Update changelogs/fragments/5632-vdo-Use-yaml-safe-load-instead-of-yaml-load.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Lee Garrett <lgarrett@rocketjump.eu>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 428e181)

Co-authored-by: Lee Garrett <leegarrett@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue/PR relates to a bug has_issue module module plugins plugin (any type) system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

vdo plugin uses deprecated yaml.load() without defining Loader=
3 participants