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

snap: fix regex to support option values with whitespaces #5475

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Nov 6, 2022

SUMMARY

Allow whitespaces in options' values.

Fixes #5466

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

plugins/modules/snap.py

@ansibullbot
Copy link
Collaborator

@ansibullbot ansibullbot added bug This issue/PR relates to a bug integration tests/integration module module os packaging plugins plugin (any type) tests tests labels Nov 6, 2022
@felixfontein felixfontein merged commit 8fb2228 into ansible-collections:main Nov 6, 2022
@patchback
Copy link

patchback bot commented Nov 6, 2022

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/8fb2228125113782b6d87da03a016a9e01079f06/pr-5475

Backported as #5479

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

@felixfontein
Copy link
Collaborator

@russoz thanks for fixing this!

patchback bot pushed a commit that referenced this pull request Nov 6, 2022
* snap: fix regex to support option values with whitespaces

* add changelog fragment

(cherry picked from commit 8fb2228)
@patchback
Copy link

patchback bot commented Nov 6, 2022

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

❌ Failed to cleanly apply 8fb2228 on top of patchback/backports/stable-4/8fb2228125113782b6d87da03a016a9e01079f06/pr-5475

Backporting merged PR #5475 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/8fb2228125113782b6d87da03a016a9e01079f06/pr-5475 upstream/stable-4
  4. Now, cherry-pick PR snap: fix regex to support option values with whitespaces #5475 contents into that branch:
    $ git cherry-pick -x 8fb2228125113782b6d87da03a016a9e01079f06
    If it'll yell at you with something like fatal: Commit 8fb2228125113782b6d87da03a016a9e01079f06 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 8fb2228125113782b6d87da03a016a9e01079f06
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR snap: fix regex to support option values with whitespaces #5475 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4/8fb2228125113782b6d87da03a016a9e01079f06/pr-5475
  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 pushed a commit that referenced this pull request Nov 6, 2022
)

* snap: fix regex to support option values with whitespaces

* add changelog fragment

(cherry picked from commit 8fb2228)

Co-authored-by: Alexei Znamensky <[email protected]>
@github-actions
Copy link

github-actions bot commented Nov 6, 2022

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

@russoz russoz deleted the 5466-snap-whitespace-regex branch November 6, 2022 18:32
russoz added a commit to russoz-ansible/community.general that referenced this pull request Nov 10, 2022
…llections#5475)

* snap: fix regex to support option values with whitespaces

* add changelog fragment
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 integration tests/integration module module os packaging plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

community.general.snap options value truncated at first whitespace character
3 participants