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

Added support for signing service name (partial support for OpenSearch Serverless) #324

Merged
merged 5 commits into from
Jan 18, 2023

Conversation

dblock
Copy link
Member

@dblock dblock commented Jan 11, 2023

Signed-off-by: dblock [email protected]

Description

Added support for signing service name. This is a necessary prerequisite for OpenSearch Serverless.

Issues Resolved

Related to #287

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.

@dblock dblock force-pushed the opensearch-serverless branch 2 times, most recently from 5998b8e to f530a36 Compare January 12, 2023 21:29
@dblock dblock force-pushed the opensearch-serverless branch from f530a36 to 1f2a00d Compare January 12, 2023 21:35
@@ -96,20 +96,42 @@ public AwsSdk2Transport(
@Nonnull String host,
@Nonnull Region signingRegion,
@CheckForNull AwsSdk2TransportOptions options) {
this(httpClient, null, host, signingRegion, options);
this(httpClient, null, host, "es", signingRegion, options);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
this(httpClient, null, host, "es", signingRegion, options);
this(httpClient, null, host, "os", signingRegion, options);

Copy link
Collaborator

Choose a reason for hiding this comment

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

Seem like es -> elasticsearch? :)

Copy link
Collaborator

@reta reta Jan 13, 2023

Choose a reason for hiding this comment

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

Oh sorry, I see it now - the value is coming from AWS, it the values are limited by these two choices, make it an enum? signingServiceName looks like pretty free style choice ...

Copy link
Member Author

Choose a reason for hiding this comment

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

I think I'd prefer it to be a string because I am not so sure that list is finite. I'm trying to find out whether the signing service name can be other than es and aoss in the case of a proxy. Can we leave it as is for now?

reta
reta previously approved these changes Jan 13, 2023
@dblock dblock requested a review from VachaShah January 14, 2023 17:24
@dblock dblock merged commit 6096034 into opensearch-project:main Jan 18, 2023
@dblock dblock added the backport 2.x Backport to 2.x branch label Jan 18, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.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-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-324-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6096034b0599ebb416d3ea8ff2fe40d86b12674c
# Push it to GitHub
git push --set-upstream origin backport/backport-324-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

dblock added a commit to dblock/opensearch-java that referenced this pull request Jan 18, 2023
Signed-off-by: dblock <[email protected]>

Signed-off-by: dblock <[email protected]>
(cherry picked from commit 6096034)
dblock added a commit to dblock/opensearch-java that referenced this pull request Jan 18, 2023
Signed-off-by: dblock <[email protected]>

Signed-off-by: dblock <[email protected]>
(cherry picked from commit 6096034)
@dblock dblock mentioned this pull request Jan 18, 2023
reta pushed a commit that referenced this pull request Jan 19, 2023
Signed-off-by: dblock <[email protected]>

Signed-off-by: dblock <[email protected]>
(cherry picked from commit 6096034)
@BrendonFaleiro BrendonFaleiro mentioned this pull request Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants