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

s3_object - fix issue when copying object with provided metadata #2018

Conversation

abikouo
Copy link
Contributor

@abikouo abikouo commented Mar 14, 2024

SUMMARY

Fixes #1991

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

s3_object

Copy link

github-actions bot commented Mar 14, 2024

Docs Build 📝

Thank you for contribution!✨

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

@abikouo abikouo force-pushed the s3_object_copy_metadata branch from f0e3760 to e01b527 Compare March 14, 2024 11:17
@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 14, 2024
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/258c847da12e42f7bcdd9b1043006fc9

✔️ ansible-galaxy-importer SUCCESS in 4m 07s
✔️ build-ansible-collection SUCCESS in 14m 54s
✔️ ansible-test-splitter SUCCESS in 6m 51s
integration-amazon.aws-1 FAILURE in 11m 41s
Skipped 43 jobs

Copy link
Contributor

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

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

Copy link
Contributor

@hakbailey hakbailey left a comment

Choose a reason for hiding this comment

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

👍

Copy link
Contributor

@mandar242 mandar242 left a comment

Choose a reason for hiding this comment

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

Minor comment, otherwise LGTM!

@abikouo abikouo force-pushed the s3_object_copy_metadata branch from a1cb98e to 12eed51 Compare March 21, 2024 10:52
@abikouo abikouo added the mergeit Merge the PR (SoftwareFactory) label Mar 21, 2024
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 5m 14s
✔️ build-ansible-collection SUCCESS in 16m 34s
✔️ ansible-test-splitter SUCCESS in 7m 47s
✔️ integration-amazon.aws-1 SUCCESS in 11m 46s
Skipped 43 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 9a15933 into ansible-collections:main Mar 21, 2024
39 of 40 checks passed
Copy link

patchback bot commented Mar 21, 2024

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

❌ Failed to cleanly apply 9a15933 on top of patchback/backports/stable-6/9a159338223026b95d103773c05080bb9f9bc06f/pr-2018

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

Copy link

patchback bot commented Mar 21, 2024

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/9a159338223026b95d103773c05080bb9f9bc06f/pr-2018

Backported as #2021

🤖 @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
s3_object - fix issue when copying object with provided metadata

SUMMARY

Fixes #1991

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

s3_object

Reviewed-by: Helen Bailey <[email protected]>
Reviewed-by: Mandar Kulkarni <[email protected]>
(cherry picked from commit 9a15933)
abikouo added a commit that referenced this pull request Mar 21, 2024
…/stable-7/9a159338223026b95d103773c05080bb9f9bc06f/pr-2018

[PR #2018/9a159338 backport][stable-7] s3_object - fix issue when copying object with provided metadata
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

s3_object in copy mode cannot change metadata
3 participants