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

ec2_vpc_nacl_info - Fix failure when listing NetworkACLs (#2425) #2429

Merged

Conversation

branic
Copy link
Contributor

@branic branic commented Dec 20, 2024

SUMMARY

Only fail listing NetworkACLs if specific ACLs were requested and not found.

Fixes: #2425

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

ec2_vpc_nacl_info

ADDITIONAL INFORMATION

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/72056561c5d8462cb46d2935dd07aa13

✔️ ansible-galaxy-importer SUCCESS in 4m 23s
✔️ build-ansible-collection SUCCESS in 10m 05s
✔️ ansible-test-splitter SUCCESS in 4m 35s
✔️ integration-amazon.aws-1 SUCCESS in 7m 23s
Skipped 43 jobs

@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label Jan 14, 2025
@tremble tremble added the backport-8 PR should be backported to the stable-8 branch label Jan 14, 2025
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/7bca272315c4458498d1f8dbea66a79b

✔️ ansible-galaxy-importer SUCCESS in 4m 58s
✔️ build-ansible-collection SUCCESS in 11m 14s
✔️ ansible-test-splitter SUCCESS in 4m 17s
✔️ integration-amazon.aws-1 SUCCESS in 8m 40s
Skipped 43 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 7b5212d into ansible-collections:main Jan 14, 2025
50 checks passed
Copy link

patchback bot commented Jan 14, 2025

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

❌ Failed to cleanly apply 7b5212d on top of patchback/backports/stable-8/7b5212d38d6f0f80064cdea1dc20408b5caffab2/pr-2429

Backporting merged PR #2429 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/amazon.aws.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-8/7b5212d38d6f0f80064cdea1dc20408b5caffab2/pr-2429 upstream/stable-8
  4. Now, cherry-pick PR ec2_vpc_nacl_info - Fix failure when listing NetworkACLs (#2425) #2429 contents into that branch:
    $ git cherry-pick -x 7b5212d38d6f0f80064cdea1dc20408b5caffab2
    If it'll yell at you with something like fatal: Commit 7b5212d38d6f0f80064cdea1dc20408b5caffab2 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 7b5212d38d6f0f80064cdea1dc20408b5caffab2
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR ec2_vpc_nacl_info - Fix failure when listing NetworkACLs (#2425) #2429 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-8/7b5212d38d6f0f80064cdea1dc20408b5caffab2/pr-2429
  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.

Copy link

patchback bot commented Jan 14, 2025

Backport to stable-9: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-9/7b5212d38d6f0f80064cdea1dc20408b5caffab2/pr-2429

Backported as #2463

🤖 @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 14, 2025
SUMMARY

Only fail listing NetworkACLs if specific ACLs were requested and not found.
Fixes: #2425

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

ec2_vpc_nacl_info
ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
(cherry picked from commit 7b5212d)
Copy link

Docs Build 📝

Thank you for contribution!✨

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

@tremble tremble added the backport_failed Backport failed, needs review label Jan 14, 2025
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Jan 14, 2025
…) (#2463)

This is a backport of PR #2429 as merged into main (7b5212d).
SUMMARY

Only fail listing NetworkACLs if specific ACLs were requested and not found.
Fixes: #2425

ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

ec2_vpc_nacl_info
ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
@branic branic deleted the fix_issue_2425 branch January 14, 2025 21:20
alinabuzachis pushed a commit to alinabuzachis/amazon.aws that referenced this pull request Jan 15, 2025
…lections#2425) (ansible-collections#2429)

SUMMARY

Only fail listing NetworkACLs if specific ACLs were requested and not found.
Fixes: ansible-collections#2425

ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

ec2_vpc_nacl_info
ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
alinabuzachis pushed a commit to alinabuzachis/amazon.aws that referenced this pull request Jan 15, 2025
…lections#2425) (ansible-collections#2429)

SUMMARY

Only fail listing NetworkACLs if specific ACLs were requested and not found.
Fixes: ansible-collections#2425

ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

ec2_vpc_nacl_info
ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport_failed Backport failed, needs review backport-8 PR should be backported to the stable-8 branch backport-9 mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

e2c_vpc_nacl_info fails if no NACL are found
2 participants