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

Jump to bottom

Fix local port regex in listen_ports_facts #4092

Merged
merged 2 commits into from Jan 31, 2022
Merged

Fix local port regex in listen_ports_facts #4092

merged 2 commits into from Jan 31, 2022

Conversation

gaetan-craft
Copy link
Contributor

SUMMARY

This PR fix the bug reported in #4091 by fixing the regex used to parse ss local connection entry

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

listen_ports_facts

@gaetan-craft gaetan-craft changed the title Fix local port regex Fix local port regex in listen_ports_facts Jan 27, 2022
@ansibullbot
Copy link
Collaborator

cc @ndavison
click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug module module new_contributor Help guide this first time contributor plugins plugin (any type) small_patch Hopefully easy to review system labels Jan 27, 2022
felixfontein
felixfontein reviewed Jan 27, 2022
View reviewed changes
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 for your contribution! Can you please add a changelog fragment? Thanks!

@felixfontein felixfontein added backport-3 check-before-release PR will be looked at again shortly before release and merged if possible. labels Jan 27, 2022
@gaetan-craft
Fix local port regex
256362a 
Thsi PR fix the bug reported in ansible-collections#4091
@ansibullbot ansibullbot added needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR and removed small_patch Hopefully easy to review labels Jan 28, 2022
@gaetan-craft
Copy link
Contributor Author

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

Sure, done

@ansibullbot ansibullbot removed needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Jan 28, 2022
@gaetan-craft @felixfontein
Update changelogs/fragments/4092-fix_local_ports_regex_listen_ports_f…
2a624f8 
…acts.yaml

Co-authored-by: Felix Fontein <felix@fontein.de>
felixfontein
felixfontein approved these changes Jan 29, 2022
View reviewed changes
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.

Looks formally good to me. Would be glad if someone else could check / test this.

@felixfontein
Copy link
Collaborator

CC @moonrail since you added ss support to this module.

@felixfontein
Copy link
Collaborator

I did some very basic testing, and it looks correct to me. If nobody complains by tomorrow evening (i.e. in roughly 24 hours), I'll merge.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Jan 31, 2022
@felixfontein felixfontein merged commit 6a7811f into ansible-collections:main Jan 31, 2022
@patchback
Copy link

patchback bot commented Jan 31, 2022 •
edited

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

❌ Failed to cleanly apply 6a7811f on top of patchback/backports/stable-3/6a7811f6963ad1f5f92342b786e70a809e1c9e08/pr-4092

Backporting merged PR #4092 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-3/6a7811f6963ad1f5f92342b786e70a809e1c9e08/pr-4092 upstream/stable-3
  4. Now, cherry-pick PR Fix local port regex in listen_ports_facts #4092 contents into that branch: 
    $ git cherry-pick -x 6a7811f6963ad1f5f92342b786e70a809e1c9e08
    If it'll yell at you with something like fatal: Commit 6a7811f6963ad1f5f92342b786e70a809e1c9e08 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x 6a7811f6963ad1f5f92342b786e70a809e1c9e08
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix local port regex in listen_ports_facts #4092 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-3/6a7811f6963ad1f5f92342b786e70a809e1c9e08/pr-4092
  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
Copy link
Collaborator

@gaetan-craft thanks for fixing this!

@patchback
Copy link

patchback bot commented Jan 31, 2022 •
edited

Backport to stable-4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4/6a7811f6963ad1f5f92342b786e70a809e1c9e08/pr-4092

Backported as #4128

🤖 @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 Jan 31, 2022
@gaetan-craft @patchback
Fix local port regex in listen_ports_facts (#4092)
a2c4d7b 
* Fix local port regex

Thsi PR fix the bug reported in #4091

* Update changelogs/fragments/4092-fix_local_ports_regex_listen_ports_facts.yaml

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

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 6a7811f)
@patchback patchback bot mentioned this pull request Jan 31, 2022
Merged
felixfontein pushed a commit that referenced this pull request Jan 31, 2022
@patchback @gaetan-craft
Fix local port regex in listen_ports_facts (#4092) (#4128)
0e32064 
* Fix local port regex

Thsi PR fix the bug reported in #4091

* Update changelogs/fragments/4092-fix_local_ports_regex_listen_ports_facts.yaml

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

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 6a7811f)

Co-authored-by: gaetan-craft <97035736+gaetan-craft@users.noreply.github.com>
@Akasurde Akasurde mentioned this pull request Feb 7, 2022
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
bug This issue/PR relates to a bug module module new_contributor Help guide this first time contributor plugins plugin (any type) system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@gaetan-craft @ansibullbot @felixfontein