Merge pull request #8 from dzbarsky/fix_s3e

[s3] Tweak range handling on GetObject

services/s3/itest/s3_test.go

@@ -249,7 +249,7 @@ func TestRangeQuery(t *testing.T) {
 	}
 
 	testCases := []RangeTestCase{
-		{Name: "entire range", Range: "bytes=0-28", Body: "hello world hi things are fun"},
+		{Name: "entire range", Range: "bytes=0-28", Body: "hello world hi things are fun", ContentRange: "bytes 0-28/29"},
 		{Name: "Skip entire first part and half of second part", Range: "bytes=8-13", Body: "rld hi", ContentRange: "bytes 8-13/29"},
 		{Name: "Prefix", Range: "bytes=0-8", Body: "hello wor", ContentRange: "bytes 0-8/29"},
 		{Name: "Suffix", Range: "bytes=-4", Body: " fun", ContentRange: "bytes 25-28/29"},

services/s3/s3.go

@@ -398,7 +398,7 @@ func (s *S3) getObject(input GetObjectInput, includeBody bool) (*GetObjectOutput
 		}
 		output.Body = io.MultiReader(readers...)
 		output.ContentLength = totalLength
-		if totalLength < object.ContentLength {
+		if len(ranges) > 0 {
 			output.HttpStatus = http.StatusPartialContent
 			if len(ranges) == 1 {
 				// Content-Range is inclusive on the end, where ranges[0].endByte is exclusive. We subtract one to convert.
@@ -475,23 +475,23 @@ func (s *S3) CopyObject(input CopyObjectInput) (*CopyObjectOutput, *awserrors.Er
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
-	// "/bucket/path/to/key"
+	// "bucket/path/to/key"
 	copySource, err := url.PathUnescape(input.CopySource)
 	if err != nil {
 		return nil, awserrors.XXX_TODO(err.Error())
 	}
-	parts := strings.SplitN(copySource, "/", 3)
-	sourceBucket := parts[1]
-	sourceKey := parts[2]
+	parts := strings.SplitN(copySource, "/", 2)
+	sourceBucket := parts[0]
+	sourceKey := parts[1]
 
 	b, ok := s.buckets[sourceBucket]
 	if !ok {
-		return nil, awserrors.XXX_TODO("no bucket")
+		return nil, awserrors.XXX_TODO("no bucket: " + sourceBucket)
 	}
 
 	object, ok := b.objects[sourceKey]
 	if !ok {
-		return nil, awserrors.XXX_TODO("no source item")
+		return nil, awserrors.XXX_TODO("no source item: " + sourceKey)
 	}
 
 	if input.MetadataDirective == "REPLACE" {