Allow altenate endpoint such as 'http://s3/bucket/key'.

Author: mdwhatcott

util.go

@@ -27,7 +27,7 @@ func EndpointRegionBucketKey(address *url.URL) (endpoint, region, bucket, key st
 	bucket, key = BucketKey(address)
 	if address != nil {
 		region = extractRegion(address.Host)
-		if !strings.Contains(address.Host, "s3") {
+		if isAlternateEndpoint(address.Host) {
 			endpoint = address.Scheme + "://" + address.Host
 		}
 	}
@@ -55,8 +55,11 @@ func BucketKey(address *url.URL) (bucket, key string) {
 	return bucket, key
 }
 
+func isAlternateEndpoint(host string) bool {
+	return !strings.HasSuffix(host, ".amazonaws.com")
+}
 func isPathStyleAddress(host string) bool {
-	return !strings.Contains(host, "s3") || strings.HasPrefix(host, "s3.") || strings.HasPrefix(host, "s3-")
+	return isAlternateEndpoint(host) || strings.HasPrefix(host, "s3.") || strings.HasPrefix(host, "s3-")
 }
 
 func extractVirtualBucket(host string) string {

util_test.go

@@ -41,6 +41,7 @@ func (this *ParsingFixture) Test() {
 	this.assertFields(URL("//s3-region.amazonaws.com/bucket/key"), "", "region", "bucket", "key")
 	this.assertFields(URL("//bucket.s3.amazonaws.com/key"), "", "", "bucket", "key")
 	this.assertFields(URL("//bucket.s3-region.amazonaws.com/key"), "", "region", "bucket", "key")
+	this.assertFields(URL("//s3/bucket/key"), "https://s3", "", "bucket", "key")
 	this.assertFields(URL("//localhost/bucket/key"), "https://localhost", "", "bucket", "key")
 	this.assertFields(URL("//1.2.3.4:5678/bucket/key"), "https://1.2.3.4:5678", "", "bucket", "key")
 }