Merge pull request #981 from harshavardhana/signature

signature/region: Remove 'milkyway' and use 'us-east-1' as default.

AWS-SDK-GO.md

@@ -23,11 +23,11 @@ import (
 )
 
 func main() {
-	// Create an S3 service object in the "milkyway" region
+	// Create an S3 service object in the default region.
 	s3Client := s3.New(&aws.Config{
 		Credentials:      credentials.NewStaticCredentials("<YOUR-ACCESS-ID>", "<YOUR-SECRET-ID>", ""),
 		Endpoint:         aws.String("http://localhost:9000"),
-		Region:           aws.String("milkyway"),
+		Region:           aws.String("us-east-1"),
 		DisableSSL:       aws.Bool(true),
 		S3ForcePathStyle: aws.Bool(true),
 	})

api-errors.go

@@ -213,7 +213,7 @@ var errorCodeResponse = map[int]APIError{
 	},
 	AuthorizationHeaderMalformed: {
 		Code:           "AuthorizationHeaderMalformed",
-		Description:    "The authorization header is malformed; the region is wrong; expecting 'milkyway'.",
+		Description:    "The authorization header is malformed; the region is wrong; expecting 'us-east-1'.",
 		HTTPStatusCode: http.StatusBadRequest,
 	},
 	MalformedPOSTRequest: {

api-signature.go

@@ -77,7 +77,7 @@ func isValidRegion(authHeaderValue string) *probe.Error {
 		return err.Trace()
 	}
 	region := credentialElements[2]
-	if region != "milkyway" {
+	if region != "us-east-1" {
 		return probe.NewError(errInvalidRegion)
 	}
 	return nil

pkg/fs/signature.go

@@ -210,7 +210,7 @@ func (r Signature) getPresignedCanonicalRequest(presignedQuery string) string {
 func (r Signature) getScope(t time.Time) string {
 	scope := strings.Join([]string{
 		t.Format(yyyymmdd),
-		"milkyway",
+		"us-east-1",
 		"s3",
 		"aws4_request",
 	}, "/")
@@ -229,7 +229,7 @@ func (r Signature) getStringToSign(canonicalRequest string, t time.Time) string
 func (r Signature) getSigningKey(t time.Time) []byte {
 	secret := r.SecretAccessKey
 	date := sumHMAC([]byte("AWS4"+secret), []byte(t.Format(yyyymmdd)))
-	region := sumHMAC(date, []byte("milkyway"))
+	region := sumHMAC(date, []byte("us-east-1"))
 	service := sumHMAC(region, []byte("s3"))
 	signingKey := sumHMAC(service, []byte("aws4_request"))
 	return signingKey

server_fs_test.go

@@ -234,7 +234,7 @@ func (s *MyAPIFSCacheSuite) newRequest(method, urlStr string, contentLength int6
 
 	scope := strings.Join([]string{
 		t.Format(yyyymmdd),
-		"milkyway",
+		"us-east-1",
 		"s3",
 		"aws4_request",
 	}, "/")
@@ -244,7 +244,7 @@ func (s *MyAPIFSCacheSuite) newRequest(method, urlStr string, contentLength int6
 	stringToSign = stringToSign + hex.EncodeToString(sum256([]byte(canonicalRequest)))
 
 	date := sumHMAC([]byte("AWS4"+s.secretAccessKey), []byte(t.Format(yyyymmdd)))
-	region := sumHMAC(date, []byte("milkyway"))
+	region := sumHMAC(date, []byte("us-east-1"))
 	service := sumHMAC(region, []byte("s3"))
 	signingKey := sumHMAC(service, []byte("aws4_request"))