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

cloudwatch_log_groups_info - Fix throttling issue when describing cloudwatch log groups #2019

Merged
merged 1 commit into from
Mar 21, 2024
Merged

cloudwatch_log_groups_info - Fix throttling issue when describing cloudwatch log groups #2019

merged 1 commit into from
Mar 21, 2024

Conversation

abikouo
Copy link
Contributor

@abikouo abikouo commented Mar 14, 2024

SUMMARY

Closes #2011

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

cloudwatch_log_groups_info

@abikouo abikouo mentioned this pull request Mar 14, 2024
Closed
1 task
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/2c4c66f1dca740159b519af057af3088

✔️ ansible-galaxy-importer SUCCESS in 5m 51s
✔️ build-ansible-collection SUCCESS in 15m 46s
✔️ ansible-test-splitter SUCCESS in 6m 22s
✔️ integration-amazon.aws-1 SUCCESS in 6m 15s
Skipped 43 jobs

@abikouo abikouo added backport-6 PR should be backported to the stable-6 branch backport-7 PR should be backported to the stable-7 branch labels Mar 15, 2024
@abikouo abikouo added the mergeit Merge the PR (SoftwareFactory) label Mar 21, 2024
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 16s
✔️ build-ansible-collection SUCCESS in 15m 28s
✔️ ansible-test-splitter SUCCESS in 7m 25s
✔️ integration-amazon.aws-1 SUCCESS in 7m 21s
Skipped 43 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Pull request merge failed: Required status check "ansible/gate" is expected.

@abikouo abikouo force-pushed the cloudwatch_log_group_info_tag_20240314 branch from fee4578 to 256ef48 Compare March 21, 2024 13:47
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/5d8ae1b9557c470ea589c3e5103541e0

✔️ ansible-galaxy-importer SUCCESS in 5m 22s
✔️ build-ansible-collection SUCCESS in 15m 47s
✔️ ansible-test-splitter SUCCESS in 5m 54s
✔️ integration-amazon.aws-1 SUCCESS in 7m 38s
Skipped 43 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 41s
✔️ build-ansible-collection SUCCESS in 14m 39s
✔️ ansible-test-splitter SUCCESS in 6m 29s
✔️ integration-amazon.aws-1 SUCCESS in 7m 42s
Skipped 43 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 196a875 into ansible-collections:main Mar 21, 2024
39 checks passed
@patchback Patchback
Copy link

patchback bot commented Mar 21, 2024 •
edited
Loading

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

❌ Failed to cleanly apply 196a875 on top of patchback/backports/stable-6/196a87506d5e8bab0abaa78549d8e35af4001071/pr-2019

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

patchback bot commented Mar 21, 2024 •
edited
Loading

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/196a87506d5e8bab0abaa78549d8e35af4001071/pr-2019

Backported as #2022

🤖 @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 Mar 21, 2024
@abikouo @patchback
Fix throttling issue when describing cloudwatch log groups (#2019)
cf39292 
cloudwatch_log_groups_info - Fix throttling issue when describing cloudwatch log groups

SUMMARY

Closes #2011

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

cloudwatch_log_groups_info

Reviewed-by: Mandar Kulkarni <[email protected]>
Reviewed-by: Helen Bailey <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 196a875)
@patchback patchback bot mentioned this pull request Mar 21, 2024
Merged
abikouo added a commit that referenced this pull request Mar 21, 2024
@abikouo
Merge pull request #2022 from ansible-collections/patchback/backports…
a1efa38 
…/stable-7/196a87506d5e8bab0abaa78549d8e35af4001071/pr-2019

[PR #2019/196a8750 backport][stable-7] cloudwatch_log_groups_info - Fix throttling issue when describing cloudwatch log groups
hakbailey pushed a commit to hakbailey/amazon.aws that referenced this pull request Apr 1, 2024
@abikouo @hakbailey
Fix throttling issue when describing cloudwatch log groups (ansible-c…
b4f9574 
…ollections#2019)

cloudwatch_log_groups_info - Fix throttling issue when describing cloudwatch log groups

SUMMARY

Closes ansible-collections#2011

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

cloudwatch_log_groups_info

Reviewed-by: Mandar Kulkarni <[email protected]>
Reviewed-by: Helen Bailey <[email protected]>
Reviewed-by: Alina Buzachis
(cherry picked from commit 196a875)
@hakbailey hakbailey mentioned this pull request Apr 1, 2024
Merged
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Apr 2, 2024
@hakbailey
Manual backport: Fix throttling issue when describing cloudwatch log …
0aa365c 
…groups (#2019) (#2029)

Manual backport: Fix throttling issue when describing cloudwatch log groups (#2019)

Manual backport of #2019

Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Helen Bailey <[email protected]>
abikouo added a commit to abikouo/amazon.aws that referenced this pull request Oct 15, 2024
@abikouo
autoscaling_instance_refresh - prepare modules for promotion (ansible…
a578d69 
…-collections#2150)

SUMMARY
Closes ansible-collections#2120
Closes ansible-collections#2019
Closes ansible-collections#2016
Prepare modules autoscaling_instance_refresh and autoscaling_instance_refresh_info for promotion:

Refactor modules to use common code from ansible_collections.amazon.aws.plugins.module_utils.autoscaling
Add type hinting
Update integration tests

ISSUE TYPE

Feature Pull Request

Reviewed-by: GomathiselviS
Reviewed-by: Bikouo Aubin
Reviewed-by: Alina Buzachis

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@d59fa93
abikouo added a commit to abikouo/amazon.aws that referenced this pull request Oct 15, 2024
@abikouo
autoscaling_instance_refresh - prepare modules for promotion (ansible…
6991e0d 
…-collections#2150)

SUMMARY
Closes ansible-collections#2120
Closes ansible-collections#2019
Closes ansible-collections#2016
Prepare modules autoscaling_instance_refresh and autoscaling_instance_refresh_info for promotion:

Refactor modules to use common code from ansible_collections.amazon.aws.plugins.module_utils.autoscaling
Add type hinting
Update integration tests

ISSUE TYPE

Feature Pull Request

Reviewed-by: GomathiselviS
Reviewed-by: Bikouo Aubin
Reviewed-by: Alina Buzachis

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@d59fa93
abikouo added a commit to abikouo/amazon.aws that referenced this pull request Oct 15, 2024
@abikouo
autoscaling_instance_refresh - prepare modules for promotion (ansible…
e699fa1 
…-collections#2150)

SUMMARY
Closes ansible-collections#2120
Closes ansible-collections#2019
Closes ansible-collections#2016
Prepare modules autoscaling_instance_refresh and autoscaling_instance_refresh_info for promotion:

Refactor modules to use common code from ansible_collections.amazon.aws.plugins.module_utils.autoscaling
Add type hinting
Update integration tests

ISSUE TYPE

Feature Pull Request

Reviewed-by: GomathiselviS
Reviewed-by: Bikouo Aubin
Reviewed-by: Alina Buzachis

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@d59fa93
abikouo added a commit to abikouo/amazon.aws that referenced this pull request Oct 15, 2024
@abikouo
autoscaling_instance_refresh - prepare modules for promotion (ansible…
c5a1e64 
…-collections#2150)

SUMMARY
Closes ansible-collections#2120
Closes ansible-collections#2019
Closes ansible-collections#2016
Prepare modules autoscaling_instance_refresh and autoscaling_instance_refresh_info for promotion:

Refactor modules to use common code from ansible_collections.amazon.aws.plugins.module_utils.autoscaling
Add type hinting
Update integration tests

ISSUE TYPE

Feature Pull Request

Reviewed-by: GomathiselviS
Reviewed-by: Bikouo Aubin
Reviewed-by: Alina Buzachis

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@d59fa93
abikouo added a commit to abikouo/amazon.aws that referenced this pull request Oct 16, 2024
@abikouo
autoscaling_instance_refresh - prepare modules for promotion (ansible…
b0e8b32 
…-collections#2150)

SUMMARY
Closes ansible-collections#2120
Closes ansible-collections#2019
Closes ansible-collections#2016
Prepare modules autoscaling_instance_refresh and autoscaling_instance_refresh_info for promotion:

Refactor modules to use common code from ansible_collections.amazon.aws.plugins.module_utils.autoscaling
Add type hinting
Update integration tests

ISSUE TYPE

Feature Pull Request

Reviewed-by: GomathiselviS
Reviewed-by: Bikouo Aubin
Reviewed-by: Alina Buzachis

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@d59fa93
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alinabuzachis alinabuzachis alinabuzachis approved these changes

@mandar242 mandar242 mandar242 approved these changes

@hakbailey hakbailey hakbailey approved these changes

Assignees
No one assigned
Labels
backport-6 PR should be backported to the stable-6 branch backport-7 PR should be backported to the stable-7 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

The cloudwatchlogs_log_group_info module generates throttling exceptions
4 participants
@abikouo @hakbailey @mandar242 @alinabuzachis