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

Fix deserialization of S3 snapshot repository without settings #587

Conversation

Xtansia
Copy link
Collaborator

@Xtansia Xtansia commented Apr 9, 2024

Description

Fixes deserialization of S3 snapshot repository without settings

Issues Resolved

Fixes #573

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@Xtansia Xtansia force-pushed the fix/573-s3-snapshot-repository-deserialization branch from e6e4882 to a266d86 Compare April 9, 2024 01:29
@Xtansia Xtansia marked this pull request as ready for review April 9, 2024 02:34
@dblock dblock merged commit df942ab into opensearch-project:main Apr 10, 2024
43 checks passed
@Xtansia Xtansia deleted the fix/573-s3-snapshot-repository-deserialization branch April 10, 2024 22:17
@Xtansia Xtansia added backport 1.x Backport to 1.x branch backport 1.7 Backport to the 1.7 branch labels Apr 10, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-587-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 df942ab3d545cad71b1dc1c9222d6d4410c092c2
# Push it to GitHub
git push --set-upstream origin backport/backport-587-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-587-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.7 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.7 1.7
# Navigate to the new working tree
cd .worktrees/backport-1.7
# Create a new branch
git switch --create backport/backport-587-to-1.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 df942ab3d545cad71b1dc1c9222d6d4410c092c2
# Push it to GitHub
git push --set-upstream origin backport/backport-587-to-1.7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.7

Then, create a pull request where the base branch is 1.7 and the compare/head branch is backport/backport-587-to-1.7.

Xtansia added a commit to Xtansia/opensearch-net that referenced this pull request Apr 10, 2024
…earch-project#587)

* Add failing reproduction test case

Signed-off-by: Thomas Farr <[email protected]>

* Add parameterless constructor to S3Repository

Signed-off-by: Thomas Farr <[email protected]>

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit df942ab)
dblock pushed a commit that referenced this pull request Apr 11, 2024
…#596)

* Add failing reproduction test case

Signed-off-by: Thomas Farr <[email protected]>

* Add parameterless constructor to S3Repository

Signed-off-by: Thomas Farr <[email protected]>

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit df942ab)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 11, 2024
…#596)

* Add failing reproduction test case

Signed-off-by: Thomas Farr <[email protected]>

* Add parameterless constructor to S3Repository

Signed-off-by: Thomas Farr <[email protected]>

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit df942ab)
(cherry picked from commit 241ad92)
Xtansia added a commit that referenced this pull request Apr 11, 2024
…#596) (#597)

* Add failing reproduction test case

Signed-off-by: Thomas Farr <[email protected]>

* Add parameterless constructor to S3Repository

Signed-off-by: Thomas Farr <[email protected]>

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit df942ab)
(cherry picked from commit 241ad92)

Co-authored-by: Thomas Farr <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x Backport to 1.x branch backport 1.7 Backport to the 1.7 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] S3 snapshot repositories without settings fail to deserialize
2 participants