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.

Sign up for GitHub

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

ec2_vpc_igw: fix NoneType error #695

Merged
merged 5 commits into from
Mar 4, 2022
Merged

ec2_vpc_igw: fix NoneType error #695

merged 5 commits into from
Mar 4, 2022

Conversation

jatorcasso
Copy link
Contributor

@jatorcasso jatorcasso commented Mar 3, 2022 •
edited
Loading

SUMMARY
ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

ec2_vpc_igw

ADDITIONAL INFORMATION

@ansibullbot
Copy link

cc @jillr @s-hertel @tremble
click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug community_review module module needs_triage plugins plugin (any type) labels Mar 3, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@alinabuzachis
Use paginator for describe internet gateways and add retry_codes='Inv…
40565c3 
…alidInternetGatewayID.NotFound' to ensure_ec2_tags

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

jillr
jillr approved these changes Mar 3, 2022
View reviewed changes
Copy link
Collaborator

@jillr jillr left a comment

Choose a reason for hiding this comment

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

Changelog verbiages need to be updated since the ultimate solution was not a manual waiter, I'm +1 to merge once the CI from that final commit has finished.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@jatorcasso jatorcasso changed the title ec2_vpc_igw: add manual waiter to fix NoneType error ec2_vpc_igw: fix NoneType error Mar 4, 2022
@alinabuzachis alinabuzachis added backport-2 PR should be backported to the stable-2 branch backport-3 PR should be backported to the stable-3 branch mergeit Merge the PR (SoftwareFactory) labels Mar 4, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 1965b05 into ansible-collections:main Mar 4, 2022
@patchback
Copy link

patchback bot commented Mar 4, 2022 •
edited
Loading

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

❌ Failed to cleanly apply 1965b05 on top of patchback/backports/stable-2/1965b0531421879c16631d2ba461f8d43a085cc6/pr-695

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

@patchback
Copy link

patchback bot commented Mar 4, 2022 •
edited
Loading

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

❌ Failed to cleanly apply 1965b05 on top of patchback/backports/stable-3/1965b0531421879c16631d2ba461f8d43a085cc6/pr-695

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

This was referenced Mar 4, 2022
Merged
Merged
alinabuzachis pushed a commit to alinabuzachis/amazon.aws that referenced this pull request Mar 11, 2022
@jatorcasso @alinabuzachis
ec2_vpc_igw: fix NoneType error (ansible-collections#695)
038c7fa 
`ec2_vpc_igw`: fix NoneType error

SUMMARY

use paginator for describe internet gateways and add retry_codes='InvalidInternetGatewayID.NotFound' (thanks @alinabuzachis)
Fixes ansible-collections#647

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
ec2_vpc_igw
ADDITIONAL INFORMATION

previously added InternetGatewayAttached waiter but problem still persists (ansible-collections#691)

Reviewed-by: Abhijeet Kasurde <None>
Reviewed-by: Jill R <None>
(cherry picked from commit 1965b05)
alinabuzachis pushed a commit to alinabuzachis/amazon.aws that referenced this pull request Mar 11, 2022
@jatorcasso @alinabuzachis
ec2_vpc_igw: fix NoneType error (ansible-collections#695)
96e5e65 
`ec2_vpc_igw`: fix NoneType error

SUMMARY

use paginator for describe internet gateways and add retry_codes='InvalidInternetGatewayID.NotFound' (thanks @alinabuzachis)
Fixes ansible-collections#647

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
ec2_vpc_igw
ADDITIONAL INFORMATION

previously added InternetGatewayAttached waiter but problem still persists (ansible-collections#691)

Reviewed-by: Abhijeet Kasurde <None>
Reviewed-by: Jill R <None>
(cherry picked from commit 1965b05)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Mar 18, 2022
@alinabuzachis
ec2_vpc_igw: fix NoneType error (#695) (#706)
1f760fe 
`ec2_vpc_igw`: fix NoneType error (#695)

ec2_vpc_igw: fix NoneType error
SUMMARY
use paginator for describe internet gateways and add retry_codes='InvalidInternetGatewayID.NotFound' (thanks @alinabuzachis)
Fixes #647
ISSUE TYPE
Bugfix Pull Request
COMPONENT NAME
ec2_vpc_igw
ADDITIONAL INFORMATION
previously added InternetGatewayAttached waiter but problem still persists (#691)
Reviewed-by: Abhijeet Kasurde 
Reviewed-by: Jill R 
(cherry picked from commit 1965b05)
SUMMARY


ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Mar 18, 2022
@alinabuzachis
ec2_vpc_igw: fix NoneType error (#695) (#705)
64b73d7 
`ec2_vpc_igw`: fix NoneType error (#695)

ec2_vpc_igw: fix NoneType error
SUMMARY
use paginator for describe internet gateways and add retry_codes='InvalidInternetGatewayID.NotFound' (thanks @alinabuzachis)
Fixes #647
ISSUE TYPE
Bugfix Pull Request
COMPONENT NAME
ec2_vpc_igw
ADDITIONAL INFORMATION
previously added InternetGatewayAttached waiter but problem still persists (#691)
Reviewed-by: Abhijeet Kasurde 
Reviewed-by: Jill R 
(cherry picked from commit 1965b05)
SUMMARY


ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION
@renovate renovate bot mentioned this pull request Jul 13, 2022
Closed
1 task
@renovate renovate bot mentioned this pull request Sep 18, 2022
Closed
1 task
@renovate renovate bot mentioned this pull request Oct 4, 2022
Closed
1 task
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Oct 24, 2023
@ansible-zuul
Merge pull request ansible-collections#695 from mandar242/issues-694-…
a7c1ac3 
…s3_sync-integration-test

s3_sync: Integration test fix: empty buckets before deleting

SUMMARY

Added tasks to empty buckets before deleting them.
S3 requires a bucket to be empty before it can be deleted.
The integration tests in the s3_sync try to delete the buckets without emptying them.
Fixes ansible-collections#694.

ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

tests/integration/targets/s3_sync

Reviewed-by: Markus Bergholz <git@osuv.de>
Reviewed-by: Jill R <None>
Reviewed-by: None <None>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Akasurde Akasurde Akasurde approved these changes

@jillr jillr jillr approved these changes

Assignees
No one assigned
Labels
backport-2 PR should be backported to the stable-2 branch backport-3 PR should be backported to the stable-3 branch bug This issue/PR relates to a bug community_review mergeit Merge the PR (SoftwareFactory) module module needs_triage plugins plugin (any type)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

'NoneType' object is not subscriptable error in ec2_vpc_igw module
5 participants
@jatorcasso @ansibullbot @Akasurde @jillr @alinabuzachis