Update return block - s3_bucket, s3_bucket_info, s3_object #2135

mandar242 · 2024-06-13T20:38:18Z

SUMMARY

Updated return block of following modules

- s3_bucket
- s3_bucket_info
- s3_object

ISSUE TYPE

Docs Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

github-actions · 2024-06-13T20:46:02Z

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 · 2024-06-13T21:24:39Z

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/55564d3272494524937066a6caf31fce

✔️ ansible-galaxy-importer SUCCESS in 3m 22s
✔️ build-ansible-collection SUCCESS in 12m 35s
✔️ ansible-test-splitter SUCCESS in 5m 13s
✔️ integration-amazon.aws-1 SUCCESS in 13m 16s
✔️ integration-amazon.aws-2 SUCCESS in 6m 23s
✔️ integration-amazon.aws-3 SUCCESS in 5m 14s
Skipped 41 jobs

plugins/modules/s3_bucket.py

plugins/modules/s3_bucket_info.py

softwarefactory-project-zuul · 2024-06-18T05:57:15Z

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/77dd22e47337440699b792d425793d03

✔️ ansible-galaxy-importer SUCCESS in 3m 59s
✔️ build-ansible-collection SUCCESS in 12m 53s
✔️ ansible-test-splitter SUCCESS in 5m 14s
✔️ integration-amazon.aws-1 SUCCESS in 10m 53s
✔️ integration-amazon.aws-2 SUCCESS in 5m 25s
✔️ integration-amazon.aws-3 SUCCESS in 4m 55s
Skipped 41 jobs

plugins/modules/s3_bucket_info.py

tremble

Two minor typos but nothing major.

plugins/modules/s3_bucket_info.py

softwarefactory-project-zuul · 2024-06-24T20:02:20Z

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

✔️ ansible-galaxy-importer SUCCESS in 4m 24s
✔️ build-ansible-collection SUCCESS in 12m 53s
✔️ ansible-test-splitter SUCCESS in 5m 16s
✔️ integration-amazon.aws-1 SUCCESS in 11m 16s
✔️ integration-amazon.aws-2 SUCCESS in 4m 59s
✔️ integration-amazon.aws-3 SUCCESS in 7m 54s
Skipped 41 jobs

softwarefactory-project-zuul · 2024-06-25T08:28:31Z

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/0ea2fe14a0324f098afc462d94b88899

✔️ ansible-galaxy-importer SUCCESS in 3m 29s
✔️ build-ansible-collection SUCCESS in 13m 16s
✔️ ansible-test-splitter SUCCESS in 5m 20s
✔️ integration-amazon.aws-1 SUCCESS in 12m 07s
✔️ integration-amazon.aws-2 SUCCESS in 6m 16s
✔️ integration-amazon.aws-3 SUCCESS in 6m 00s
Skipped 41 jobs

softwarefactory-project-zuul · 2024-06-26T06:42:59Z

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/4a28c27e06b84319898b29c14898b4df

✔️ ansible-galaxy-importer SUCCESS in 3m 48s
✔️ build-ansible-collection SUCCESS in 12m 52s
✔️ ansible-test-splitter SUCCESS in 5m 29s
✔️ integration-amazon.aws-1 SUCCESS in 11m 16s
✔️ integration-amazon.aws-2 SUCCESS in 5m 02s
✔️ integration-amazon.aws-3 SUCCESS in 4m 33s
Skipped 41 jobs

softwarefactory-project-zuul · 2024-06-26T16:28:51Z

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

✔️ ansible-galaxy-importer SUCCESS in 4m 34s
✔️ build-ansible-collection SUCCESS in 12m 54s
✔️ ansible-test-splitter SUCCESS in 5m 22s
✔️ integration-amazon.aws-1 SUCCESS in 11m 26s
✔️ integration-amazon.aws-2 SUCCESS in 6m 32s
✔️ integration-amazon.aws-3 SUCCESS in 8m 57s
Skipped 41 jobs

patchback · 2024-08-27T10:00:49Z

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

❌ Failed to cleanly apply 34e3954 on top of patchback/backports/stable-8/34e3954496d43ab76ae0192b795dc6380c8db804/pr-2135

Backporting merged PR #2135 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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/34e3954496d43ab76ae0192b795dc6380c8db804/pr-2135 upstream/stable-8

Now, cherry-pick PR Update return block - s3_bucket, s3_bucket_info, s3_object #2135 contents into that branch:
```
$ git cherry-pick -x 34e3954496d43ab76ae0192b795dc6380c8db804
```
If it'll yell at you with something like fatal: Commit 34e3954496d43ab76ae0192b795dc6380c8db804 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x 34e3954496d43ab76ae0192b795dc6380c8db804
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Update return block - s3_bucket, s3_bucket_info, s3_object #2135 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-8/34e3954496d43ab76ae0192b795dc6380c8db804/pr-2135

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.

…ollections#2135) SUMMARY Updated return block of following modules - s3_bucket - s3_bucket_info - s3_object ISSUE TYPE Docs Pull Request COMPONENT NAME ADDITIONAL INFORMATION Reviewed-by: Helen Bailey <[email protected]> Reviewed-by: Mandar Kulkarni <[email protected]> Reviewed-by: Mark Chappell Reviewed-by: Alina Buzachis

…2236) SUMMARY Updated return block of following modules s3_bucket s3_bucket_info s3_object ISSUE TYPE Docs Pull Request COMPONENT NAME ADDITIONAL INFORMATION Manual backport (because #2062 / #2177 was manually backported) Reviewed-by: Alina Buzachis

mandar242 mentioned this pull request Jun 13, 2024

amazon.aws.s3_bucket_info incorrect return value #2116

Closed

1 task

hakbailey reviewed Jun 17, 2024

View reviewed changes

mandar242 force-pushed the s3_return_block_updates branch from f36d3db to d55c3d0 Compare June 18, 2024 05:25

mandar242 force-pushed the s3_return_block_updates branch from d55c3d0 to b7bef5a Compare June 20, 2024 19:12

mandar242 requested a review from hakbailey June 20, 2024 23:48

hakbailey reviewed Jun 21, 2024

View reviewed changes

plugins/modules/s3_bucket_info.py Outdated Show resolved Hide resolved

plugins/modules/s3_bucket_info.py Show resolved Hide resolved

mandar242 requested a review from hakbailey June 22, 2024 19:49

tremble approved these changes Jun 24, 2024

View reviewed changes

plugins/modules/s3_bucket_info.py Outdated Show resolved Hide resolved

plugins/modules/s3_bucket_info.py Outdated Show resolved Hide resolved

mandar242 force-pushed the s3_return_block_updates branch from 35b8624 to e1bd28a Compare June 24, 2024 19:36

mandar242 force-pushed the s3_return_block_updates branch from e1bd28a to 3a3cb5e Compare June 25, 2024 07:14

alinabuzachis approved these changes Jun 25, 2024

View reviewed changes

mandar242 added 12 commits June 25, 2024 23:17

update return block - s3_bucket_info

c57679c

update return block - s3_bucket

4de1c54

sanity fixes s3_bucket

7422fb2

sanity fixes s3_bucket_info

1a81124

update return block - s3_object

2abcda5

add changelog fragment

dd54976

modified based on feedback

ce0a45f

modified based on feedback

a826e5f

modified based on feedback

5ac286f

modified based on feedback

974f660

modified based on feedback

405f3b7

minor fixes

96d7d8b

mandar242 force-pushed the s3_return_block_updates branch from de50d19 to 96d7d8b Compare June 26, 2024 06:17

hakbailey approved these changes Jun 26, 2024

View reviewed changes

mandar242 added the mergeit Merge the PR (SoftwareFactory) label Jun 26, 2024

softwarefactory-project-zuul bot merged commit 34e3954 into ansible-collections:main Jun 26, 2024
37 checks passed

tremble added the backport-8 PR should be backported to the stable-8 branch label Aug 27, 2024

mandar242 deleted the s3_return_block_updates branch October 29, 2024 20:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update return block - s3_bucket, s3_bucket_info, s3_object #2135

Update return block - s3_bucket, s3_bucket_info, s3_object #2135

mandar242 commented Jun 13, 2024

github-actions bot commented Jun 13, 2024 •

edited

Loading

softwarefactory-project-zuul bot commented Jun 13, 2024

softwarefactory-project-zuul bot commented Jun 18, 2024

tremble left a comment

softwarefactory-project-zuul bot commented Jun 24, 2024

softwarefactory-project-zuul bot commented Jun 25, 2024

softwarefactory-project-zuul bot commented Jun 26, 2024

softwarefactory-project-zuul bot commented Jun 26, 2024

patchback bot commented Aug 27, 2024 •

edited

Loading

Update return block - s3_bucket, s3_bucket_info, s3_object #2135

Update return block - s3_bucket, s3_bucket_info, s3_object #2135

Conversation

mandar242 commented Jun 13, 2024

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

github-actions bot commented Jun 13, 2024 • edited Loading

Docs Build 📝

softwarefactory-project-zuul bot commented Jun 13, 2024

softwarefactory-project-zuul bot commented Jun 18, 2024

tremble left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Jun 24, 2024

softwarefactory-project-zuul bot commented Jun 25, 2024

softwarefactory-project-zuul bot commented Jun 26, 2024

softwarefactory-project-zuul bot commented Jun 26, 2024

patchback bot commented Aug 27, 2024 • edited Loading

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

Backporting merged PR #2135 into main

github-actions bot commented Jun 13, 2024 •

edited

Loading

patchback bot commented Aug 27, 2024 •

edited

Loading