diff --git a/README.md b/README.md index 698163f..662b5a7 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ String signature = Signer.builder() .header("Host", "examplebucket.s3.amazonaws.com") .header("x-amz-date", "20130524T000000Z") .header("x-amz-content-sha256", contentSha256) - .buildS3(request, contentSha256) + .build(request, "s3", contentSha256) .getSignature(); } ``` @@ -45,7 +45,23 @@ String signature = Signer.builder() .header("Host", "glacier.us-east-1.amazonaws.com") .header("x-amz-date", "20120525T002453Z") .header("x-amz-glacier-version", "2012-06-01") - .buildGlacier(request, contentSha256) + .build(request, "glacier", contentSha256) + .getSignature(); +} +``` + +### Mediaconvert + +```java +public class Example { +String contentSha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; +HttpRequest request = new HttpRequest("GET", new URI("")); +String signature = Signer.builder() + .awsCredentials(new AwsCredentials(ACCESS_KEY, SECRET_KEY)) + .region("") + .header("Host", "") + .header("x-amz-date", "20120525T002453Z") + .build(request, "mediaconvert", contentSha256) .getSignature(); } ``` \ No newline at end of file diff --git a/src/main/java/uk/co/lucasweb/aws/v4/signer/Signer.java b/src/main/java/uk/co/lucasweb/aws/v4/signer/Signer.java index c1bddd5..9242e6e 100644 --- a/src/main/java/uk/co/lucasweb/aws/v4/signer/Signer.java +++ b/src/main/java/uk/co/lucasweb/aws/v4/signer/Signer.java @@ -146,11 +146,13 @@ public Signer build(HttpRequest request, String service, String contentSha256) { CredentialScope scope = new CredentialScope(dateWithoutTimestamp, service, region); return new Signer(canonicalRequest, awsCredentials, date, scope); } - + + @Deprecated public Signer buildS3(HttpRequest request, String contentSha256) { return build(request, S3, contentSha256); } - + + @Deprecated public Signer buildGlacier(HttpRequest request, String contentSha256) { return build(request, GLACIER, contentSha256); } diff --git a/src/test/java/uk/co/lucasweb/aws/v4/signer/SignerTest.java b/src/test/java/uk/co/lucasweb/aws/v4/signer/SignerTest.java index b3a910d..c499196 100644 --- a/src/test/java/uk/co/lucasweb/aws/v4/signer/SignerTest.java +++ b/src/test/java/uk/co/lucasweb/aws/v4/signer/SignerTest.java @@ -38,7 +38,7 @@ public void shouldSignRequest() throws Exception { .header("Host", "glacier.us-east-1.amazonaws.com") .header("x-amz-date", "20120525T002453Z") .header("x-amz-glacier-version", "2012-06-01") - .buildGlacier(request, hash) + .build(request, "glacier", hash) .getSignature(); String expectedSignature = "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20120525/us-east-1/glacier/aws4_request, " + @@ -57,7 +57,7 @@ public void shouldSignRequestWithQueryParam() throws Exception { .header("Host", "examplebucket.s3.amazonaws.com") .header("x-amz-date", "20130524T000000Z") .header("x-amz-content-sha256", hash) - .buildS3(request, hash) + .build(request, "s3", hash) .getSignature(); String expectedSignature = "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request, " + @@ -88,7 +88,7 @@ public void shouldSignStreamingRequest() throws Exception { .header("x-amz-glacier-version", "2012-06-01") .header("x-amz-sha256-tree-hash", treeHash) .header("X-Amz-Target", "Glacier.UploadMultipartPart") - .buildGlacier(request, contentHash) + .build(request, "glacier", contentHash) .getSignature(); String expectedSignature = "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20150424/us-east-1/glacier/aws4_request, " +