Merge pull request #10 from uc-cdis/fix/api

Fix/api

handlers/hash_utils.go

@@ -14,7 +14,7 @@ import (
 	"sync"
 )
 
-const ChunkSize = 1024 * 1024 * 96
+const ChunkSize = 1024 * 1024 * 64
 
 type HashInfo struct {
 	Crc32c string
@@ -61,17 +61,21 @@ func CalculateBasicHashes(client *AwsClient, bucket string, key string) (*HashIn
 		log.Printf("Fail to get object size of %s. Detail %s\n\n", key, err)
 		return nil, -1, err
 	}
+	log.Printf("Size %d", *objectSize)
 
 	start := int64(0)
 	step := int64(ChunkSize)
 	for {
 		chunkRange := fmt.Sprintf("bytes: %d-%d", start, minOf(start+step, *objectSize-1))
+
 		buff, err := GetChunkDataFromS3(client, bucket, key, chunkRange)
 		if err != nil {
 			log.Printf("Can not stream chunk data of %s. Detail %s\n\n", key, err)
 			return nil, -1, err
 		}
+
 		hashCollection, err = UpdateBasicHashes(hashCollection, buff)
+
 		if err != nil {
 			log.Printf("Can not compute hashes. Detail %s\n\n", err)
 		}

handlers/s3client.go

@@ -2,14 +2,14 @@ package handlers
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 )
 
 // AWS sesssion wrapper
@@ -37,18 +37,35 @@ func CreateNewAwsClient() (*AwsClient, error) {
 
 // GetChunkDataFromS3 downloads chunk data from s3
 func GetChunkDataFromS3(client *AwsClient, bucket string, key string, byteRange string) ([]byte, error) {
-	buff := &aws.WriteAtBuffer{}
-	s3dl := s3manager.NewDownloader(client.session)
-	_, err := s3dl.Download(buff, &s3.GetObjectInput{
+
+	svc := s3.New(client.session)
+	input := &s3.GetObjectInput{
 		Bucket: aws.String(bucket),
 		Key:    aws.String(key),
 		Range:  aws.String(byteRange),
-	})
+	}
 
+	result, err := svc.GetObject(input)
 	if err != nil {
+		if aerr, ok := err.(awserr.Error); ok {
+			switch aerr.Code() {
+			case s3.ErrCodeNoSuchKey:
+				fmt.Println(s3.ErrCodeNoSuchKey, aerr.Error())
+			default:
+				fmt.Println(aerr.Error())
+			}
+		} else {
+			// Print the error, cast err to awserr.Error to get the Code and
+			// Message from an error.
+			fmt.Println(err.Error())
+		}
 		return nil, err
 	}
-	return buff.Bytes(), nil
+	body, err := ioutil.ReadAll(result.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	return body, nil
 
 }