remove nearestSecond field from amazon backend

Signed-off-by: Josh Dolitsky <393494+jdolitsky@users.noreply.github.com>

Author: jdolitsky

amazon.go

@@ -21,49 +21,45 @@ import (
 	"io/ioutil"
 	pathutil "path"
 	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/credentials"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"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"
 )
 
 // AmazonS3Backend is a storage backend for Amazon S3
 type AmazonS3Backend struct {
-	Bucket        string
-	Client        *s3.S3
-	Downloader    *s3manager.Downloader
-	Prefix        string
-	Uploader      *s3manager.Uploader
-	SSE           string
-	NearestSecond bool
+	Bucket     string
+	Client     *s3.S3
+	Downloader *s3manager.Downloader
+	Prefix     string
+	Uploader   *s3manager.Uploader
+	SSE        string
 }
 
 // NewAmazonS3Backend creates a new instance of AmazonS3Backend
-func NewAmazonS3Backend(bucket string, prefix string, region string, endpoint string, sse string, nearestSecond bool) *AmazonS3Backend {
+func NewAmazonS3Backend(bucket string, prefix string, region string, endpoint string, sse string) *AmazonS3Backend {
 	service := s3.New(session.New(), &aws.Config{
 		Region:           aws.String(region),
 		Endpoint:         aws.String(endpoint),
 		DisableSSL:       aws.Bool(strings.HasPrefix(endpoint, "http://")),
 		S3ForcePathStyle: aws.Bool(endpoint != ""),
 	})
 	b := &AmazonS3Backend{
-		Bucket:        bucket,
-		Client:        service,
-		Downloader:    s3manager.NewDownloaderWithClient(service),
-		Prefix:        cleanPrefix(prefix),
-		Uploader:      s3manager.NewUploaderWithClient(service),
-		SSE:           sse,
-		NearestSecond: nearestSecond,
+		Bucket:     bucket,
+		Client:     service,
+		Downloader: s3manager.NewDownloaderWithClient(service),
+		Prefix:     cleanPrefix(prefix),
+		Uploader:   s3manager.NewUploaderWithClient(service),
+		SSE:        sse,
 	}
 	return b
 }
 
 // NewAmazonS3BackendWithCredentials creates a new instance of AmazonS3Backend with credentials
-func NewAmazonS3BackendWithCredentials(bucket string, prefix string, region string, endpoint string, sse string, nearestSecond bool, credentials *credentials.Credentials) *AmazonS3Backend {
+func NewAmazonS3BackendWithCredentials(bucket string, prefix string, region string, endpoint string, sse string, credentials *credentials.Credentials) *AmazonS3Backend {
 	service := s3.New(session.New(), &aws.Config{
 		Credentials:      credentials,
 		Region:           aws.String(region),
@@ -72,13 +68,12 @@ func NewAmazonS3BackendWithCredentials(bucket string, prefix string, region stri
 		S3ForcePathStyle: aws.Bool(endpoint != ""),
 	})
 	b := &AmazonS3Backend{
-		Bucket:        bucket,
-		Client:        service,
-		Downloader:    s3manager.NewDownloaderWithClient(service),
-		Prefix:        cleanPrefix(prefix),
-		Uploader:      s3manager.NewUploaderWithClient(service),
-		SSE:           sse,
-		NearestSecond: nearestSecond,
+		Bucket:     bucket,
+		Client:     service,
+		Downloader: s3manager.NewDownloaderWithClient(service),
+		Prefix:     cleanPrefix(prefix),
+		Uploader:   s3manager.NewUploaderWithClient(service),
+		SSE:        sse,
 	}
 	return b
 }
@@ -106,14 +101,6 @@ func (b AmazonS3Backend) ListObjects(prefix string) ([]Object, error) {
 				Content:      []byte{},
 				LastModified: *obj.LastModified,
 			}
-			if b.NearestSecond {
-				// This is a patch so that LastModified match between the List
-				// and GetObject function. Some S3 implementations like Dell ECS,
-				// Ceph or DigitalOcean Spaces seems to truncate the microseconds
-				// when getting the LastModified date from an object get
-				// versus an object list
-				object.LastModified = obj.LastModified.Truncate(time.Second)
-			}
 			objects = append(objects, object)
 		}
 		if !*s3Result.IsTruncated {

amazon_test.go

@@ -31,15 +31,15 @@ type AmazonTestSuite struct {
 }
 
 func (suite *AmazonTestSuite) SetupSuite() {
-	backend := NewAmazonS3Backend("fake-bucket-cant-exist-fbce123", "", "us-east-1", "", "", false)
+	backend := NewAmazonS3Backend("fake-bucket-cant-exist-fbce123", "", "us-east-1", "", "")
 	suite.BrokenAmazonS3Backend = backend
 
 	s3Bucket := os.Getenv("TEST_STORAGE_AMAZON_BUCKET")
 	s3Region := os.Getenv("TEST_STORAGE_AMAZON_REGION")
-	backend = NewAmazonS3Backend(s3Bucket, "", s3Region, "", "", false)
+	backend = NewAmazonS3Backend(s3Bucket, "", s3Region, "", "")
 	suite.NoPrefixAmazonS3Backend = backend
 
-	backend = NewAmazonS3Backend(s3Bucket, "ssetest", s3Region, "", "AES256", false)
+	backend = NewAmazonS3Backend(s3Bucket, "ssetest", s3Region, "", "AES256")
 	suite.SSEAmazonS3Backend = backend
 
 	data := []byte("some object")

storage_test.go

@@ -61,7 +61,7 @@ func (suite *StorageTestSuite) setupStorageBackends() {
 		nosBucket := os.Getenv("TEST_STORAGE_NETEASE_BUCKET")
 		nosEndpoint := os.Getenv("TEST_STORAGE_NETEASE_ENDPOINT")
 		if s3Bucket != "" && s3Region != "" {
-			suite.StorageBackends["AmazonS3"] = Backend(NewAmazonS3Backend(s3Bucket, prefix, s3Region, "", "", false))
+			suite.StorageBackends["AmazonS3"] = Backend(NewAmazonS3Backend(s3Bucket, prefix, s3Region, "", ""))
 		}
 		if gcsBucket != "" {
 			suite.StorageBackends["GoogleCS"] = Backend(NewGoogleCSBackend(gcsBucket, prefix))