Updated Branches: refs/heads/1.6.x 2addcbf9d -> cbcfc9023
Disable timed temporary signed URLs for AWS-S3 This functionality uncovered subtleties in URL parameter encoding which result in random failures integration tests. References JCLOUDS-200. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/cbcfc902 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/cbcfc902 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/cbcfc902 Branch: refs/heads/1.6.x Commit: cbcfc90239321acc7338640109a1b1fdf9ee7910 Parents: 2addcbf Author: Andrew Gaul <[email protected]> Authored: Tue Aug 6 14:15:02 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Tue Aug 6 14:19:47 2013 -0700 ---------------------------------------------------------------------- .../org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java | 7 ++----- .../jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/cbcfc902/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java index dc33ec2..02d1b38 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobRequestSigner.java @@ -72,17 +72,14 @@ public class AWSS3BlobRequestSigner extends S3BlobRequestSigner<AWSS3AsyncClient public HttpRequest signGetBlob(String container, String name, long timeInSeconds) { checkNotNull(container, "container"); checkNotNull(name, "name"); - HttpRequest request = processor.apply(Invocation.create(getMethod, ImmutableList.<Object> of(container, name))); - return cleanRequest(signForTemporaryAccess(request, timeInSeconds)); + throw new UnsupportedOperationException(); } @Override public HttpRequest signPutBlob(String container, Blob blob, long timeInSeconds) { checkNotNull(container, "container"); checkNotNull(blob, "blob"); - HttpRequest request = processor.apply(Invocation.create(createMethod, - ImmutableList.<Object>of(container, blobToObject.apply(blob)))); - return cleanRequest(signForTemporaryAccess(request, timeInSeconds)); + throw new UnsupportedOperationException(); } private HttpRequest signForTemporaryAccess(HttpRequest request, long timeInSeconds) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/cbcfc902/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java index 0b38b0b..eb27888 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java @@ -50,7 +50,7 @@ public class AWSS3BlobSignerExpectTest extends S3BlobSignerExpectTest { .addHeader("Date", DATE).build(); } - @Test + @Test(expectedExceptions = UnsupportedOperationException.class) public void testSignGetBlobWithTime() { BlobStore getBlobWithTime = requestsSendResponses(init()); HttpRequest compare = getBlobWithTime(); @@ -68,7 +68,7 @@ public class AWSS3BlobSignerExpectTest extends S3BlobSignerExpectTest { .addHeader("Date", DATE).build(); } - @Test + @Test(expectedExceptions = UnsupportedOperationException.class) public void testSignPutBlobWithTime() throws Exception { BlobStore signPutBloblWithTime = requestsSendResponses(init()); Blob blob = signPutBloblWithTime.blobBuilder(name).payload(text).contentType("text/plain").build();
