Skip to content

Remove S3 & Glacier Service Name Dependencies #8

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
beizix wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove S3 & Glacier Service Name Dependencies #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a68b5
Remove S3 & Glacier Service Name Dependencies
beizix Mar 2, 2018
1c7ba57
Deprecate s3, glacier methods
beizix Mar 4, 2018
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
20 changes: 18 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
```
Expand All @@ -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("<YOUR_ENDPOINT>"));
String signature = Signer.builder()
.awsCredentials(new AwsCredentials(ACCESS_KEY, SECRET_KEY))
.region("<YOUR_REGION>")
.header("Host", "<YOUR_HOST>")
.header("x-amz-date", "20120525T002453Z")
.build(request, "mediaconvert", contentSha256)
.getSignature();
}
```
6 changes: 4 additions & 2 deletions src/main/java/uk/co/lucasweb/aws/v4/signer/Signer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/uk/co/lucasweb/aws/v4/signer/SignerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, " +
Expand All @@ -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, " +
Expand Down Expand Up @@ -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, " +
Expand Down