You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/02/04 22:44:00 UTC
jclouds git commit: JCLOUDS-794: Use bogus URL for generic S3 endpoint
Repository: jclouds
Updated Branches:
refs/heads/master fa8b9e233 -> 8a2c821e1
JCLOUDS-794: Use bogus URL for generic S3 endpoint
This prevents users from accidentally connecting to AWS.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/8a2c821e
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8a2c821e
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8a2c821e
Branch: refs/heads/master
Commit: 8a2c821e131717b6dc06996886d1393d74b09ff6
Parents: fa8b9e2
Author: Andrew Gaul <ga...@apache.org>
Authored: Tue Jan 20 17:28:13 2015 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Feb 4 13:42:03 2015 -0800
----------------------------------------------------------------------
apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java | 2 +-
.../org/jclouds/s3/PathBasedS3ClientExpectTest.java | 6 +++---
.../test/java/org/jclouds/s3/S3ClientExpectTest.java | 2 +-
.../binders/BindAsHostPrefixIfConfiguredNoPathTest.java | 2 +-
.../jclouds/s3/blobstore/S3BlobSignerExpectTest.java | 12 ++++++------
.../s3/filters/RequestAuthorizeSignatureTest.java | 2 +-
.../main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java | 1 +
7 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8a2c821e/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
index d124fd8..b5c2bac 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
@@ -94,7 +94,7 @@ public class S3ApiMetadata extends BaseHttpApiMetadata {
.name("Amazon Simple Storage Service (S3) API")
.identityName("Access Key ID")
.credentialName("Secret Access Key")
- .defaultEndpoint("https://s3.amazonaws.com")
+ .defaultEndpoint("http://localhost")
.documentation(URI.create("http://docs.amazonwebservices.com/AmazonS3/latest/API"))
.version("2006-03-01")
.defaultProperties(S3ApiMetadata.defaultProperties())
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8a2c821e/apis/s3/src/test/java/org/jclouds/s3/PathBasedS3ClientExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/PathBasedS3ClientExpectTest.java b/apis/s3/src/test/java/org/jclouds/s3/PathBasedS3ClientExpectTest.java
index 14be662..da5d2de 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/PathBasedS3ClientExpectTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/PathBasedS3ClientExpectTest.java
@@ -43,7 +43,7 @@ public class PathBasedS3ClientExpectTest extends BaseS3ClientExpectTest {
public void testBucketExistsReturnsTrueOn200AndFalseOn404() {
HttpRequest bucketFooExists = HttpRequest.builder().method("HEAD")
- .endpoint("https://s3.amazonaws.com/foo")
+ .endpoint("http://localhost/foo")
.addHeader("Date", CONSTANT_DATE)
.addHeader("Authorization", "AWS identity:lLD0mzo2bZPIWhxlFDZoT09MKUQ=")
.build();
@@ -60,7 +60,7 @@ public class PathBasedS3ClientExpectTest extends BaseS3ClientExpectTest {
public void testPutBucketReturnsTrueOn200() {
HttpRequest bucketFooExists = HttpRequest.builder().method("PUT")
- .endpoint("https://s3.amazonaws.com/foo")
+ .endpoint("http://localhost/foo")
.addHeader("Date", CONSTANT_DATE)
.addHeader("Authorization", "AWS identity:GeP4OqEL/eM+gQt+4Vtcm02gebc=")
.build();
@@ -75,7 +75,7 @@ public class PathBasedS3ClientExpectTest extends BaseS3ClientExpectTest {
public void testPutObjectReturnsETagOn200() {
HttpRequest bucketFooExists = HttpRequest.builder().method("PUT")
- .endpoint("https://s3.amazonaws.com/bucket/object")
+ .endpoint("http://localhost/bucket/object")
.addHeader("Expect", "100-continue")
.addHeader("Date", CONSTANT_DATE)
.addHeader("Authorization", "AWS identity:6gC0m7SYFDPwkUqY5EHV/6i9DfM=")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8a2c821e/apis/s3/src/test/java/org/jclouds/s3/S3ClientExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/S3ClientExpectTest.java b/apis/s3/src/test/java/org/jclouds/s3/S3ClientExpectTest.java
index 577c841..0a22cb1 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/S3ClientExpectTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/S3ClientExpectTest.java
@@ -32,7 +32,7 @@ public class S3ClientExpectTest extends BaseS3ClientExpectTest {
public void testBucketExistsReturnsTrueOn200AndFalseOn404() {
HttpRequest bucketFooExists = HttpRequest.builder().method("HEAD").endpoint(
- URI.create("https://s3.amazonaws.com/foo")).headers(
+ URI.create("http://localhost/foo")).headers(
ImmutableMultimap.<String, String> builder()
.put("Date", CONSTANT_DATE)
.put("Authorization", "AWS identity:lLD0mzo2bZPIWhxlFDZoT09MKUQ=")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8a2c821e/apis/s3/src/test/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfiguredNoPathTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfiguredNoPathTest.java b/apis/s3/src/test/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfiguredNoPathTest.java
index a673a0d..d24d11a 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfiguredNoPathTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/binders/BindAsHostPrefixIfConfiguredNoPathTest.java
@@ -40,7 +40,7 @@ public class BindAsHostPrefixIfConfiguredNoPathTest extends BaseS3ClientTest<S3C
Invokable<?, ?> method = method(S3Client.class, "deleteObject", String.class, String.class);
GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of("testbucket.example.com", "test.jpg"));
- assertRequestLineEquals(request, "DELETE https://s3.amazonaws.com/testbucket.example.com/test.jpg HTTP/1.1");
+ assertRequestLineEquals(request, "DELETE http://localhost/testbucket.example.com/test.jpg HTTP/1.1");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8a2c821e/apis/s3/src/test/java/org/jclouds/s3/blobstore/S3BlobSignerExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/S3BlobSignerExpectTest.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/S3BlobSignerExpectTest.java
index ecc6e3f..ac7768b 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/S3BlobSignerExpectTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/S3BlobSignerExpectTest.java
@@ -41,7 +41,7 @@ public class S3BlobSignerExpectTest extends BaseBlobSignerExpectTest {
@Override
protected HttpRequest getBlob() {
return HttpRequest.builder().method("GET")
- .endpoint("https://s3.amazonaws.com/container/name")
+ .endpoint("http://localhost/container/name")
.addHeader("Date", "Thu, 05 Jun 2008 16:38:19 GMT")
.addHeader("Authorization", "AWS identity:0uvBv1wEskuhFHYJF/L6kEV9A7o=").build();
}
@@ -56,7 +56,7 @@ public class S3BlobSignerExpectTest extends BaseBlobSignerExpectTest {
@Override
protected HttpRequest getBlobWithTime() {
return HttpRequest.builder().method("GET")
- .endpoint("https://s3.amazonaws.com/container/name")
+ .endpoint("http://locahost/container/name")
.addHeader("Date", "Thu, 05 Jun 2008 16:38:19 GMT")
.addHeader("Authorization", "AWS identity:0uvBv1wEskuhFHYJF/L6kEV9A7o=").build();
}
@@ -64,7 +64,7 @@ public class S3BlobSignerExpectTest extends BaseBlobSignerExpectTest {
@Override
protected HttpRequest getBlobWithOptions() {
return HttpRequest.builder().method("GET")
- .endpoint("https://s3.amazonaws.com/container/name")
+ .endpoint("http://localhost/container/name")
.addHeader("Range", "bytes=0-1")
.addHeader("Date", "Thu, 05 Jun 2008 16:38:19 GMT")
.addHeader("Authorization", "AWS identity:0uvBv1wEskuhFHYJF/L6kEV9A7o=").build();
@@ -73,7 +73,7 @@ public class S3BlobSignerExpectTest extends BaseBlobSignerExpectTest {
@Override
protected HttpRequest putBlob() {
return HttpRequest.builder().method("PUT")
- .endpoint("https://s3.amazonaws.com/container/name")
+ .endpoint("http://localhost/container/name")
.addHeader("Expect", "100-continue")
.addHeader("Date", "Thu, 05 Jun 2008 16:38:19 GMT")
.addHeader("Authorization", "AWS identity:zM2oT+71KcoOSxv1SU5L12UXnT8=").build();
@@ -89,7 +89,7 @@ public class S3BlobSignerExpectTest extends BaseBlobSignerExpectTest {
@Override
protected HttpRequest putBlobWithTime() {
return HttpRequest.builder().method("PUT")
- .endpoint("https://s3.amazonaws.com/container/name")
+ .endpoint("http://localhost/container/name")
.addHeader("Expect", "100-continue")
.addHeader("Date", "Thu, 05 Jun 2008 16:38:19 GMT")
.addHeader("Authorization", "AWS identity:zM2oT+71KcoOSxv1SU5L12UXnT8=").build();
@@ -98,7 +98,7 @@ public class S3BlobSignerExpectTest extends BaseBlobSignerExpectTest {
@Override
protected HttpRequest removeBlob() {
return HttpRequest.builder().method("DELETE")
- .endpoint("https://s3.amazonaws.com/container/name")
+ .endpoint("http://localhost/container/name")
.addHeader("Date", "Thu, 05 Jun 2008 16:38:19 GMT")
.addHeader("Authorization", "AWS identity:4FnyjdX/ULdDMRbVlLNjZfEo9RQ=").build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8a2c821e/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureTest.java b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureTest.java
index 48da148..794701d 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureTest.java
@@ -144,7 +144,7 @@ public class RequestAuthorizeSignatureTest extends BaseS3ClientTest<S3Client> {
method(S3Client.class, "getBucketLocation", String.class),
ImmutableList.<Object> of(bucketName));
URI uri = request.getEndpoint();
- assertEquals(uri.getHost(), "s3.amazonaws.com");
+ assertEquals(uri.getHost(), "localhost");
assertEquals(uri.getPath(), "/" + bucketName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/8a2c821e/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java
index ae91faf..319feb1 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java
@@ -58,6 +58,7 @@ public class AWSS3ApiMetadata extends S3ApiMetadata {
super(AWSS3Client.class);
id("aws-s3")
.name("Amazon-specific S3 API")
+ .defaultEndpoint("https://s3.amazonaws.com")
.defaultProperties(AWSS3ApiMetadata.defaultProperties())
.view(typeToken(AWSS3BlobStoreContext.class))
.defaultModules(ImmutableSet.<Class<? extends Module>>of(AWSS3HttpApiModule.class, AWSS3BlobStoreContextModule.class));