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

backport-3: Stabilize ec2_eip module (#936) #946

Merged
merged 1 commit into from
Feb 23, 2022
Merged

backport-3: Stabilize ec2_eip module (#936) #946

merged 1 commit into from
Feb 23, 2022

Conversation

markuman
Copy link
Member

@markuman markuman commented Feb 22, 2022 •
edited
Loading

Backport into stable-3 of #936 with commit id: d0596e3734170873b0166aae01630eb51f880b4f

SUMMARY

fixed check_mode issues
added integration tests for check_mode / idempotency
updated json returned when state = absent for clarity
removed json_query references
fixes #159

Depends-On: ansible-collections/amazon.aws#672
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
ec2_eip

Reviewed-by: Mark Woolley
Reviewed-by: Mark Chappell
Reviewed-by: Alina Buzachis
Reviewed-by: Joseph Torcasso
Reviewed-by: Jill R

SUMMARY
ISSUE TYPE
  • Bugfix Pull Request
  • Docs Pull Request
  • Feature Pull Request
  • New Module Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION

@jatorcasso @markuman
Stabilize ec2_eip module (#936)
d0570f7 
Stabilize ec2_eip module

SUMMARY

fixed check_mode issues
added integration tests for check_mode / idempotency
updated json returned when state = absent for clarity
removed json_query references
fixes #159

Depends-On: ansible-collections/amazon.aws#672
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
ec2_eip

Reviewed-by: Mark Woolley <[email protected]>
Reviewed-by: Mark Chappell <None>
Reviewed-by: Alina Buzachis <None>
Reviewed-by: Joseph Torcasso <None>
Reviewed-by: Jill R <None>
@markuman markuman added the backport-3 PR should be backported to the stable-3 branch label Feb 22, 2022
@ansibullbot
Copy link

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

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

Build succeeded.

@markuman markuman added the mergeit Merge the PR (SoftwareFactory) label Feb 23, 2022
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit a54d252 into ansible-collections:stable-3 Feb 23, 2022
@patchback
Copy link

patchback bot commented Feb 23, 2022 •
edited
Loading

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

❌ Failed to cleanly apply a54d252 on top of patchback/backports/stable-3/a54d252d95b606bf1fac1a048b99959071f7ff23/pr-946

Backporting merged PR #946 into stable-3

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

abikouo pushed a commit to abikouo/community.aws that referenced this pull request Oct 24, 2023
@tremble
Remove deprecated @AWSRetry.backoff usage (ansible-collections#946)
1cfe01b 
Remove deprecated AWSRetry.backoff usage

SUMMARY
AWSRetry.backoff was deprecated (and originally slated for removal in 4.0.0) remove usage.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME
plugins/module_utils/acm.py
plugins/module_utils/waf.py
ADDITIONAL INFORMATION

Reviewed-by: Gonéri Le Bouder <[email protected]>
Reviewed-by: Bikouo Aubin <None>
Reviewed-by: Alina Buzachis <None>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport-3 PR should be backported to the stable-3 branch bug This issue/PR relates to a bug community_review integration tests/integration mergeit Merge the PR (SoftwareFactory) module module plugins plugin (any type) tests tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@markuman @ansibullbot @jatorcasso