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

rds_instance: fix promotion_tier type #1475

Conversation

gootdude
Copy link
Contributor

SUMMARY

Change promotion_tier type to integer

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

rds_instance.py

ADDITIONAL INFORMATION

@github-actions
Copy link

github-actions bot commented Apr 26, 2023

Docs Build 📝

Thank you for contribution!✨

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

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/858dc283faa24754b1a8ec9d855590f3

✔️ ansible-galaxy-importer SUCCESS in 4m 10s
✔️ build-ansible-collection SUCCESS in 12m 32s
✔️ ansible-test-splitter SUCCESS in 4m 44s
✔️ integration-amazon.aws-1 SUCCESS in 16m 27s
✔️ integration-amazon.aws-2 SUCCESS in 34m 54s
✔️ integration-amazon.aws-3 SUCCESS in 40m 20s
✔️ integration-amazon.aws-4 SUCCESS in 26m 44s
✔️ integration-amazon.aws-5 SUCCESS in 20m 26s
✔️ integration-amazon.aws-6 SUCCESS in 15m 39s
✔️ integration-amazon.aws-7 SUCCESS in 18m 07s
✔️ integration-amazon.aws-8 SUCCESS in 19m 18s
✔️ integration-amazon.aws-9 SUCCESS in 19m 15s
✔️ integration-amazon.aws-10 SUCCESS in 23m 54s
✔️ integration-amazon.aws-11 SUCCESS in 12m 51s
✔️ integration-community.aws-1 SUCCESS in 37m 44s
✔️ integration-community.aws-2 SUCCESS in 25m 53s
✔️ integration-community.aws-3 SUCCESS in 16m 19s
Skipped 30 jobs

@tremble tremble added this to the 5.5.0 milestone Apr 27, 2023
@alinabuzachis alinabuzachis added the backport-5 PR should be backported to the stable-5 branch label May 3, 2023
@alinabuzachis alinabuzachis requested a review from tremble May 3, 2023 16:51
Copy link
Contributor

@tremble tremble left a comment

Choose a reason for hiding this comment

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

@@ -334,7 +334,7 @@
description:
- An integer that specifies the order in which an Aurora Replica is promoted to the primary instance after a failure of
the existing primary instance.
type: str
Copy link
Contributor

Choose a reason for hiding this comment

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

nominally this would be a "breaking" change, however passing anything here would currently result in an exception, so I think we let this pass.

@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label May 4, 2023
@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 03s
✔️ build-ansible-collection SUCCESS in 12m 45s
✔️ ansible-test-splitter SUCCESS in 5m 14s
✔️ integration-amazon.aws-1 SUCCESS in 16m 15s
✔️ integration-amazon.aws-2 SUCCESS in 37m 38s
✔️ integration-amazon.aws-3 SUCCESS in 38m 21s
✔️ integration-amazon.aws-4 SUCCESS in 29m 03s
✔️ integration-amazon.aws-5 SUCCESS in 25m 30s
✔️ integration-amazon.aws-6 SUCCESS in 18m 34s
✔️ integration-amazon.aws-7 SUCCESS in 17m 34s
✔️ integration-amazon.aws-8 SUCCESS in 22m 03s
✔️ integration-amazon.aws-9 SUCCESS in 22m 16s
✔️ integration-amazon.aws-10 SUCCESS in 24m 55s
✔️ integration-amazon.aws-11 SUCCESS in 14m 05s
Skipped 33 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit bc3ee14 into ansible-collections:main May 4, 2023
@patchback
Copy link

patchback bot commented May 4, 2023

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

❌ Failed to cleanly apply bc3ee14 on top of patchback/backports/stable-5/bc3ee145f341a39b532eb32aab503411b0b7ebfe/pr-1475

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

alinabuzachis pushed a commit to alinabuzachis/amazon.aws that referenced this pull request May 4, 2023
rds_instance: fix promotion_tier type

SUMMARY

Change promotion_tier type to integer

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

rds_instance.py
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis
Reviewed-by: Mark Chappell
softwarefactory-project-zuul bot pushed a commit that referenced this pull request May 4, 2023
[manual backport stable-5] rds_instance: fix promotion_tier type (#1475)

SUMMARY
Change promotion_tier type to integer
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
rds_instance.py
ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Oct 24, 2023
…le-collections#1475)

tests/ec2_vpc_egress_igw: avoid a InvalidVpcId.Malformed error

Ensures the "test failure with non-existent VPC ID" test uses a properly
formatted VPC ID.
Otherwise, the API now returns the following error:
"error": {
    "code": "InvalidVpcId.Malformed",
    "message": "The vpc ID vpc-012345678 is malformed"
},

Reviewed-by: Mark Chappell <None>
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Oct 9, 2024
…le-collections#1475)

tests/ec2_vpc_egress_igw: avoid a InvalidVpcId.Malformed error

Ensures the "test failure with non-existent VPC ID" test uses a properly
formatted VPC ID.
Otherwise, the API now returns the following error:
"error": {
    "code": "InvalidVpcId.Malformed",
    "message": "The vpc ID vpc-012345678 is malformed"
},

Reviewed-by: Mark Chappell <None>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@fe83fcb
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Oct 14, 2024
…le-collections#1475)

tests/ec2_vpc_egress_igw: avoid a InvalidVpcId.Malformed error

Ensures the "test failure with non-existent VPC ID" test uses a properly
formatted VPC ID.
Otherwise, the API now returns the following error:
"error": {
    "code": "InvalidVpcId.Malformed",
    "message": "The vpc ID vpc-012345678 is malformed"
},

Reviewed-by: Mark Chappell <None>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@fe83fcb
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Oct 15, 2024
…le-collections#1475)

tests/ec2_vpc_egress_igw: avoid a InvalidVpcId.Malformed error

Ensures the "test failure with non-existent VPC ID" test uses a properly
formatted VPC ID.
Otherwise, the API now returns the following error:
"error": {
    "code": "InvalidVpcId.Malformed",
    "message": "The vpc ID vpc-012345678 is malformed"
},

Reviewed-by: Mark Chappell <None>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@fe83fcb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-5 PR should be backported to the stable-5 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants