Skip to content

[Backport 3.1] Use AwsV4HttpSigner instead of Aws4Signer #4164

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: 3.1
Choose a base branch
from
Open

[Backport 3.1] Use AwsV4HttpSigner instead of Aws4Signer #4164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/ConnectorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,23 @@
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
import software.amazon.awssdk.auth.signer.Aws4Signer;
import software.amazon.awssdk.auth.signer.params.Aws4SignerParams;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.http.SdkHttpFullRequest;
import software.amazon.awssdk.http.SdkHttpMethod;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner;
import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;

@Log4j2
public class ConnectorUtils {

private static final Aws4Signer signer;
private static final AwsV4HttpSigner signer;
public static final String SKIP_VALIDATE_MISSING_PARAMETERS = "skip_validating_missing_parameters";

public static final List<String> SUPPORTED_REMOTE_SERVERS_FOR_DEFAULT_ACTION_TYPES = List
.of("sagemaker", "openai", "bedrock", "cohere");

static {
signer = Aws4Signer.create();
signer = AwsV4HttpSigner.create();
}

public static RemoteInferenceInputDataSet processInput(
Expand Down Expand Up @@ -292,14 +291,16 @@ public static SdkHttpFullRequest signRequest(
? AwsBasicCredentials.create(accessKey, secretKey)
: AwsSessionCredentials.create(accessKey, secretKey, sessionToken);

Aws4SignerParams params = Aws4SignerParams
.builder()
.awsCredentials(credentials)
.signingName(signingName)
.signingRegion(Region.of(region))
.build();

return signer.sign(request, params);
SignedRequest signedRequest = signer
.sign(
r -> r
.identity(credentials)
.request(request)
.payload(request.contentStreamProvider().orElse(null))
.putProperty(AwsV4HttpSigner.SERVICE_SIGNING_NAME, signingName)
.putProperty(AwsV4HttpSigner.REGION_NAME, region)
);
return (SdkHttpFullRequest) signedRequest.request();
}

public static SdkHttpFullRequest buildSdkRequest(
Expand Down
Loading