|
58 | 58 | import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; |
59 | 59 | import software.amazon.awssdk.auth.credentials.AwsCredentials; |
60 | 60 | import software.amazon.awssdk.auth.credentials.AwsSessionCredentials; |
61 | | -import software.amazon.awssdk.auth.signer.Aws4Signer; |
62 | | -import software.amazon.awssdk.auth.signer.params.Aws4SignerParams; |
63 | 61 | import software.amazon.awssdk.core.sync.RequestBody; |
64 | 62 | import software.amazon.awssdk.http.SdkHttpFullRequest; |
65 | 63 | import software.amazon.awssdk.http.SdkHttpMethod; |
66 | | -import software.amazon.awssdk.regions.Region; |
| 64 | +import software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner; |
| 65 | +import software.amazon.awssdk.http.auth.spi.signer.SignedRequest; |
67 | 66 |
|
68 | 67 | @Log4j2 |
69 | 68 | public class ConnectorUtils { |
70 | 69 |
|
71 | | - private static final Aws4Signer signer; |
| 70 | + private static final AwsV4HttpSigner signer; |
72 | 71 | public static final String SKIP_VALIDATE_MISSING_PARAMETERS = "skip_validating_missing_parameters"; |
73 | 72 |
|
74 | 73 | static { |
75 | | - signer = Aws4Signer.create(); |
| 74 | + signer = AwsV4HttpSigner.create(); |
76 | 75 | } |
77 | 76 |
|
78 | 77 | public static RemoteInferenceInputDataSet processInput( |
@@ -293,14 +292,16 @@ public static SdkHttpFullRequest signRequest( |
293 | 292 | ? AwsBasicCredentials.create(accessKey, secretKey) |
294 | 293 | : AwsSessionCredentials.create(accessKey, secretKey, sessionToken); |
295 | 294 |
|
296 | | - Aws4SignerParams params = Aws4SignerParams |
297 | | - .builder() |
298 | | - .awsCredentials(credentials) |
299 | | - .signingName(signingName) |
300 | | - .signingRegion(Region.of(region)) |
301 | | - .build(); |
302 | | - |
303 | | - return signer.sign(request, params); |
| 295 | + SignedRequest signedRequest = signer |
| 296 | + .sign( |
| 297 | + r -> r |
| 298 | + .identity(credentials) |
| 299 | + .request(request) |
| 300 | + .payload(request.contentStreamProvider().orElse(null)) |
| 301 | + .putProperty(AwsV4HttpSigner.SERVICE_SIGNING_NAME, signingName) |
| 302 | + .putProperty(AwsV4HttpSigner.REGION_NAME, region) |
| 303 | + ); |
| 304 | + return (SdkHttpFullRequest) signedRequest.request(); |
304 | 305 | } |
305 | 306 |
|
306 | 307 | public static SdkHttpFullRequest buildSdkRequest( |
|
0 commit comments