amazon.aws
amazon.aws copied to clipboard
s3_object - fix issue when copying object with provided metadata
SUMMARY
Fixes #1991
ISSUE TYPE
- Bugfix Pull Request
COMPONENT NAME
s3_object
Docs Build 📝
Thank you for contribution!✨
This PR has been merged and your docs changes will be incorporated when they are next published.
Build failed. https://ansible.softwarefactory-project.io/zuul/buildset/258c847da12e42f7bcdd9b1043006fc9
:heavy_check_mark: ansible-galaxy-importer SUCCESS in 4m 07s :heavy_check_mark: build-ansible-collection SUCCESS in 14m 54s :heavy_check_mark: ansible-test-splitter SUCCESS in 6m 51s :x: integration-amazon.aws-1 FAILURE in 11m 41s Skipped 43 jobs
Build succeeded. https://ansible.softwarefactory-project.io/zuul/buildset/059af354478948b7b879c34647d8a2fb
:heavy_check_mark: ansible-galaxy-importer SUCCESS in 5m 16s :heavy_check_mark: build-ansible-collection SUCCESS in 14m 39s :heavy_check_mark: ansible-test-splitter SUCCESS in 6m 04s :heavy_check_mark: integration-amazon.aws-1 SUCCESS in 12m 41s Skipped 43 jobs
Build succeeded (gate pipeline). https://ansible.softwarefactory-project.io/zuul/buildset/a74fa0060865469db60fb0e02a0b9720
:heavy_check_mark: ansible-galaxy-importer SUCCESS in 5m 14s :heavy_check_mark: build-ansible-collection SUCCESS in 16m 34s :heavy_check_mark: ansible-test-splitter SUCCESS in 7m 47s :heavy_check_mark: integration-amazon.aws-1 SUCCESS in 11m 46s Skipped 43 jobs
Backport to stable-6: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply 9a159338223026b95d103773c05080bb9f9bc06f on top of patchback/backports/stable-6/9a159338223026b95d103773c05080bb9f9bc06f/pr-2018
Backporting merged PR #2018 into main
- Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your
originremote. - 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-6/9a159338223026b95d103773c05080bb9f9bc06f/pr-2018 upstream/stable-6 - Now, cherry-pick PR #2018 contents into that branch:
If it'll yell at you with something like$ git cherry-pick -x 9a159338223026b95d103773c05080bb9f9bc06ffatal: Commit 9a159338223026b95d103773c05080bb9f9bc06f is a merge but no -m option was given., add-m 1as follows instead:$ git cherry-pick -m1 -x 9a159338223026b95d103773c05080bb9f9bc06f - At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #2018 as close to the original as possible.
- Push this branch to your fork on GitHub:
$ git push origin patchback/backports/stable-6/9a159338223026b95d103773c05080bb9f9bc06f/pr-2018 - 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.
Backport to stable-7: 💚 backport PR created
✅ Backport PR branch: patchback/backports/stable-7/9a159338223026b95d103773c05080bb9f9bc06f/pr-2018
Backported as https://github.com/ansible-collections/amazon.aws/pull/2021
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.