2960: Finish renaming s3aws_volume to s3_volume.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/services/keepstore/s3aws_volume.go b/services/keepstore/s3_volume.go
similarity index 99%
rename from services/keepstore/s3aws_volume.go
rename to services/keepstore/s3_volume.go
index 8e93eed12c839175ba050b18e5772161ad82bd47..bd79d49e167fd77f8e768185189efd9cf620fc2c 100644 (file)
--- a/services/keepstore/s3aws_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -65,7 +65,7 @@ type s3Volume struct {
        logger     logrus.FieldLogger
        metrics    *volumeMetricsVecs
        bufferPool *bufferPool
-       bucket     *s3AWSbucket
+       bucket     *s3Bucket
        region     string
        startOnce  sync.Once
 }
@@ -73,7 +73,7 @@ type s3Volume struct {
 // s3bucket wraps s3.bucket and counts I/O and API usage stats. The
 // wrapped bucket can be replaced atomically with SetBucket in order
 // to update credentials.
-type s3AWSbucket struct {
+type s3Bucket struct {
        bucket string
        svc    *s3.Client
        stats  s3awsbucketStats
@@ -222,7 +222,7 @@ func (v *s3Volume) check(ec2metadataHostname string) error {
 
        cfg.Credentials = creds
 
-       v.bucket = &s3AWSbucket{
+       v.bucket = &s3Bucket{
                bucket: v.Bucket,
                svc:    s3.New(cfg),
        }
@@ -538,7 +538,7 @@ func (v *s3Volume) BlockWrite(ctx context.Context, hash string, data []byte) err
 
 type s3awsLister struct {
        Logger            logrus.FieldLogger
-       Bucket            *s3AWSbucket
+       Bucket            *s3Bucket
        Prefix            string
        PageSize          int
        Stats             *s3awsbucketStats
@@ -768,7 +768,7 @@ func (v *s3Volume) checkRaceWindow(key string) error {
        return nil
 }
 
-func (b *s3AWSbucket) Del(path string) error {
+func (b *s3Bucket) Del(path string) error {
        input := &s3.DeleteObjectInput{
                Bucket: aws.String(b.bucket),
                Key:    aws.String(path),

diff --git a/services/keepstore/s3aws_volume_test.go b/services/keepstore/s3_volume_test.go
similarity index 94%
rename from services/keepstore/s3aws_volume_test.go
rename to services/keepstore/s3_volume_test.go
index d9dcbc52d686daaced43d728fa50ef5ea8fb4dbb..d814949f447ce5f55f6ab581180397c6a40b6e21 100644 (file)
--- a/services/keepstore/s3aws_volume_test.go
+++ b/services/keepstore/s3_volume_test.go
@@ -32,7 +32,7 @@ import (
 )
 
 const (
-       S3AWSTestBucketName = "testbucket"
+       s3TestBucketName = "testbucket"
 )
 
 type s3AWSFakeClock struct {
@@ -50,18 +50,18 @@ func (c *s3AWSFakeClock) Since(t time.Time) time.Duration {
        return c.Now().Sub(t)
 }
 
-var _ = check.Suite(&StubbedS3AWSSuite{})
+var _ = check.Suite(&stubbedS3Suite{})
 
 var srv httptest.Server
 
-type StubbedS3AWSSuite struct {
+type stubbedS3Suite struct {
        s3server *httptest.Server
        metadata *httptest.Server
        cluster  *arvados.Cluster
        volumes  []*testableS3Volume
 }
 
-func (s *StubbedS3AWSSuite) SetUpTest(c *check.C) {
+func (s *stubbedS3Suite) SetUpTest(c *check.C) {
        s.s3server = nil
        s.metadata = nil
        s.cluster = testCluster(c)
@@ -71,7 +71,7 @@ func (s *StubbedS3AWSSuite) SetUpTest(c *check.C) {
        }
 }
 
-func (s *StubbedS3AWSSuite) TestGeneric(c *check.C) {
+func (s *stubbedS3Suite) TestGeneric(c *check.C) {
        DoGenericVolumeTests(c, false, func(t TB, params newVolumeParams) TestableVolume {
                // Use a negative raceWindow so s3test's 1-second
                // timestamp precision doesn't confuse fixRace.
@@ -79,13 +79,13 @@ func (s *StubbedS3AWSSuite) TestGeneric(c *check.C) {
        })
 }
 
-func (s *StubbedS3AWSSuite) TestGenericReadOnly(c *check.C) {
+func (s *stubbedS3Suite) TestGenericReadOnly(c *check.C) {
        DoGenericVolumeTests(c, true, func(t TB, params newVolumeParams) TestableVolume {
                return s.newTestableVolume(c, params, -2*time.Second)
        })
 }
 
-func (s *StubbedS3AWSSuite) TestGenericWithPrefix(c *check.C) {
+func (s *stubbedS3Suite) TestGenericWithPrefix(c *check.C) {
        DoGenericVolumeTests(c, false, func(t TB, params newVolumeParams) TestableVolume {
                v := s.newTestableVolume(c, params, -2*time.Second)
                v.PrefixLength = 3
@@ -93,7 +93,7 @@ func (s *StubbedS3AWSSuite) TestGenericWithPrefix(c *check.C) {
        })
 }
 
-func (s *StubbedS3AWSSuite) TestIndex(c *check.C) {
+func (s *stubbedS3Suite) TestIndex(c *check.C) {
        v := s.newTestableVolume(c, newVolumeParams{
                Cluster:      s.cluster,
                ConfigVolume: arvados.Volume{Replication: 2},
@@ -124,7 +124,7 @@ func (s *StubbedS3AWSSuite) TestIndex(c *check.C) {
        }
 }
 
-func (s *StubbedS3AWSSuite) TestSignature(c *check.C) {
+func (s *stubbedS3Suite) TestSignature(c *check.C) {
        var header http.Header
        stub := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
                header = r.Header
@@ -155,7 +155,7 @@ func (s *StubbedS3AWSSuite) TestSignature(c *check.C) {
        c.Check(header.Get("Authorization"), check.Matches, `AWS4-HMAC-SHA256 .*`)
 }
 
-func (s *StubbedS3AWSSuite) TestIAMRoleCredentials(c *check.C) {
+func (s *stubbedS3Suite) TestIAMRoleCredentials(c *check.C) {
        s.metadata = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
                upd := time.Now().UTC().Add(-time.Hour).Format(time.RFC3339)
                exp := time.Now().UTC().Add(time.Hour).Format(time.RFC3339)
@@ -205,7 +205,7 @@ func (s *StubbedS3AWSSuite) TestIAMRoleCredentials(c *check.C) {
        c.Check(err, check.ErrorMatches, `(?s).*404.*`)
 }
 
-func (s *StubbedS3AWSSuite) TestStats(c *check.C) {
+func (s *stubbedS3Suite) TestStats(c *check.C) {
        v := s.newTestableVolume(c, newVolumeParams{
                Cluster:      s.cluster,
                ConfigVolume: arvados.Volume{Replication: 2},
@@ -259,20 +259,20 @@ func (h *s3AWSBlockingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
        http.Error(w, "nothing here", http.StatusNotFound)
 }
 
-func (s *StubbedS3AWSSuite) TestGetContextCancel(c *check.C) {
+func (s *stubbedS3Suite) TestGetContextCancel(c *check.C) {
        s.testContextCancel(c, func(ctx context.Context, v *testableS3Volume) error {
                _, err := v.BlockRead(ctx, fooHash, io.Discard)
                return err
        })
 }
 
-func (s *StubbedS3AWSSuite) TestPutContextCancel(c *check.C) {
+func (s *stubbedS3Suite) TestPutContextCancel(c *check.C) {
        s.testContextCancel(c, func(ctx context.Context, v *testableS3Volume) error {
                return v.BlockWrite(ctx, fooHash, []byte("foo"))
        })
 }
 
-func (s *StubbedS3AWSSuite) testContextCancel(c *check.C, testFunc func(context.Context, *testableS3Volume) error) {
+func (s *stubbedS3Suite) testContextCancel(c *check.C, testFunc func(context.Context, *testableS3Volume) error) {
        handler := &s3AWSBlockingHandler{}
        s.s3server = httptest.NewServer(handler)
        defer s.s3server.Close()
@@ -318,7 +318,7 @@ func (s *StubbedS3AWSSuite) testContextCancel(c *check.C, testFunc func(context.
        }
 }
 
-func (s *StubbedS3AWSSuite) TestBackendStates(c *check.C) {
+func (s *stubbedS3Suite) TestBackendStates(c *check.C) {
        s.cluster.Collections.BlobTrashLifetime.Set("1h")
        s.cluster.Collections.BlobSigningTTL.Set("1h")
 
@@ -559,7 +559,7 @@ func (l LogrusLog) Print(level gofakes3.LogLevel, v ...interface{}) {
        }
 }
 
-func (s *StubbedS3AWSSuite) newTestableVolume(c *check.C, params newVolumeParams, raceWindow time.Duration) *testableS3Volume {
+func (s *stubbedS3Suite) newTestableVolume(c *check.C, params newVolumeParams, raceWindow time.Duration) *testableS3Volume {
 
        clock := &s3AWSFakeClock{}
        // fake s3
@@ -588,7 +588,7 @@ func (s *StubbedS3AWSSuite) newTestableVolume(c *check.C, params newVolumeParams
                                IAMRole:            iamRole,
                                AccessKeyID:        accessKey,
                                SecretAccessKey:    secretKey,
-                               Bucket:             S3AWSTestBucketName,
+                               Bucket:             s3TestBucketName,
                                Endpoint:           endpoint,
                                Region:             "test-region-1",
                                LocationConstraint: true,
@@ -610,7 +610,7 @@ func (s *StubbedS3AWSSuite) newTestableVolume(c *check.C, params newVolumeParams
        v.s3Volume.bucket.svc.ForcePathStyle = true
        // Create the testbucket
        input := &s3.CreateBucketInput{
-               Bucket: aws.String(S3AWSTestBucketName),
+               Bucket: aws.String(s3TestBucketName),
        }
        req := v.s3Volume.bucket.svc.CreateBucketRequest(input)
        _, err := req.Send(context.Background())