Merge lp:~dave-cheney/goamz/s3-lower-case-bucket-names into lp:~gophers/goamz/trunk

[Dave Cheney]

s3: fix regions that require lowercase buckets.

US regions are lax on this restriction, but other later regions
enforce bucket names that are also valid dns names.

https://codereview.appspot.com/6343080/

[Gustavo Niemeyer (niemeyer)]

LGTM if the us-west situation is sorted out.

https://codereview.appspot.com/6343080/diff/7001/aws/aws.go
File aws/aws.go (right):

https://codereview.appspot.com/6343080/diff/7001/aws/aws.go#newcode50
aws/aws.go:50: false,
I believe both of these are wrong. us-west seems to have the same
software deployment as the other regions.

https://codereview.appspot.com/6343080/

=== modified file 'aws/aws.go'
--- aws/aws.go	2012-07-06 03:23:10 +0000
+++ aws/aws.go	2012-07-12 01:59:17 +0000
@@ -22,7 +22,8 @@
 	EC2Endpoint          string
 	S3Endpoint           string
 	S3BucketEndpoint     string // Not needed by AWS S3. Use ${bucket} for bucket name.
-	S3LocationConstraint bool   // true if this region requires a LocationConstraint declaration
+	S3LocationConstraint bool   // true if this region requires a LocationConstraint declaration.
+	S3LowercaseBucket    bool   // true if the region requires bucket names to be lower case.
 	SDBEndpoint          string
 	SNSEndpoint          string
 	SQSEndpoint          string
@@ -34,6 +35,7 @@
 	"https://s3.amazonaws.com",
 	"",
 	false,
+	false,
 	"https://sdb.amazonaws.com",
 	"https://sns.us-east-1.amazonaws.com",
 	"https://sqs.us-east-1.amazonaws.com",
@@ -44,7 +46,8 @@
 	"https://ec2.us-west-1.amazonaws.com",
 	"https://s3-us-west-1.amazonaws.com",
 	"",
-	false,
+	true,
+	true,
 	"https://sdb.us-west-1.amazonaws.com",
 	"https://sns.us-west-1.amazonaws.com",
 	"https://sqs.us-west-1.amazonaws.com",
@@ -56,6 +59,7 @@
 	"https://s3-eu-west-1.amazonaws.com",
 	"",
 	true,
+	true,
 	"https://sdb.eu-west-1.amazonaws.com",
 	"https://sns.eu-west-1.amazonaws.com",
 	"https://sqs.eu-west-1.amazonaws.com",
@@ -67,6 +71,7 @@
 	"https://s3-ap-southeast-1.amazonaws.com",
 	"",
 	true,
+	true,
 	"https://sdb.ap-southeast-1.amazonaws.com",
 	"https://sns.ap-southeast-1.amazonaws.com",
 	"https://sqs.ap-southeast-1.amazonaws.com",
@@ -78,6 +83,7 @@
 	"https://s3-ap-northeast-1.amazonaws.com",
 	"",
 	true,
+	true,
 	"https://sdb.ap-northeast-1.amazonaws.com",
 	"https://sns.ap-northeast-1.amazonaws.com",
 	"https://sqs.ap-northeast-1.amazonaws.com",

=== modified file 's3/s3.go'
--- s3/s3.go	2012-07-06 03:13:43 +0000
+++ s3/s3.go	2012-07-12 01:59:17 +0000
@@ -54,8 +54,7 @@
 
 // Bucket returns a Bucket with the given name.
 func (s3 *S3) Bucket(name string) *Bucket {
-	if s3.Region.S3BucketEndpoint != "" {
-		// If passing bucket name via hostname, it is necessarily lowercased.
+	if s3.Region.S3BucketEndpoint != "" || s3.Region.S3LowercaseBucket {
 		name = strings.ToLower(name)
 	}
 	return &Bucket{s3, name}

=== modified file 's3/s3i_test.go'
--- s3/s3i_test.go	2012-07-05 23:45:54 +0000
+++ s3/s3i_test.go	2012-07-12 01:59:17 +0000
@@ -31,9 +31,11 @@
 var _ = Suite(&AmazonClientSuite{Region: aws.USEast})
 var _ = Suite(&AmazonDomainClientSuite{Region: aws.USEast})
 
-// eu-west-1 tests (disabled)
-// https://bugs.launchpad.net/goamz/+bug/1021515
-// var _ = Suite(&AmazonClientSuite{Region: aws.EUWest})
+// us-west-1 tests
+var _ = Suite(&AmazonClientSuite{Region: aws.USWest})
+
+// eu-west-1 tests
+var _ = Suite(&AmazonClientSuite{Region: aws.EUWest})
 
 // AmazonClientSuite tests the client against a live S3 server.
 type AmazonClientSuite struct {