fix s3store.getBucketName parsing and add additional test case

Author: discentem

metadata/metadata.go

@@ -78,7 +78,7 @@ type FsysWriteRequest struct {
 	Extension string
 }
 
-// WriteMetadata generates Cavorite metadata for obj and writes it to s.Fsys
+// WriteToFsys generates Cavorite metadata for req.Object and writes it to req.Fsys
 func WriteToFsys(req FsysWriteRequest) (err error) {
 	logger.V(2).Infof("object: %s", req.Object)
 	// generate metadata

stores/s3.go

@@ -239,7 +239,14 @@ func (s *s3Store) getBucketName() (string, error) {
 	case strings.HasPrefix(s.Options.BackendAddress, "http://"):
 		fallthrough
 	case strings.HasPrefix(s.Options.BackendAddress, "https://"):
-		_, bucketName = path.Split(s.Options.BackendAddress)
+		up, err := url.Parse(s.Options.BackendAddress)
+		if err != nil {
+			return "", err
+		}
+		p := strings.SplitN(up.Path, "/", 2)[1]
+		fragments := strings.Split(p, "/")
+		bucket := fragments[0]
+		return bucket, nil
 	default:
 		return "", fmt.Errorf("unsupported s3 backend address")
 	}

stores/s3_test.go

@@ -213,38 +213,58 @@ func TestS3GetBucketNameWithS3Prefix(t *testing.T) {
 }
 
 func TestS3GetBucketNameWithHTTPPrefix(t *testing.T) {
-	expectedBackendAddress := "http://127.0.0.1:9000/aFakeBucket"
-
-	mTime, _ := time.Parse("2006-01-02T15:04:05.000Z", "2014-11-12T11:45:26.371Z")
-	memfs, err := testutils.MemMapFsWith(map[string]testutils.MapFile{
-		"test": {
-			Content: []byte("bla"),
-			ModTime: &mTime,
+	type test struct {
+		name        string
+		addressName string
+		want        string
+	}
+	tests := []test{
+		{
+			name:        "simple address",
+			addressName: "http://127.0.0.1:9000/aFakeBucket",
+			want:        "aFakeBucket",
 		},
-	})
-	assert.NoError(t, err)
-
-	fakeS3Server := aferoS3Server{
-		buckets: map[string]afero.Fs{
-			// create a bucket in our fake s3 server
-			"test": afero.NewMemMapFs(),
+		{
+			name:        "complex address",
+			addressName: "http://127.0.0.1:9000/aFakeBucket/a/b/c",
+			want:        "aFakeBucket",
 		},
 	}
 
-	store := s3Store{
-		Options: Options{
-			BackendAddress:        expectedBackendAddress,
-			MetadataFileExtension: "cfile",
-		},
-		fsys:         *memfs,
-		awsRegion:    "us-east-1",
-		s3Uploader:   fakeS3Server,
-		s3Downloader: fakeS3Server,
+	for _, test := range tests {
+		expectedBackendAddress := test.addressName
+
+		mTime, _ := time.Parse("2006-01-02T15:04:05.000Z", "2014-11-12T11:45:26.371Z")
+		memfs, err := testutils.MemMapFsWith(map[string]testutils.MapFile{
+			"test": {
+				Content: []byte("bla"),
+				ModTime: &mTime,
+			},
+		})
+		assert.NoError(t, err)
+
+		fakeS3Server := aferoS3Server{
+			buckets: map[string]afero.Fs{
+				// create a bucket in our fake s3 server
+				"test": afero.NewMemMapFs(),
+			},
+		}
+
+		store := s3Store{
+			Options: Options{
+				BackendAddress:        expectedBackendAddress,
+				MetadataFileExtension: "cfile",
+			},
+			fsys:         *memfs,
+			awsRegion:    "us-east-1",
+			s3Uploader:   fakeS3Server,
+			s3Downloader: fakeS3Server,
+		}
+
+		bucketName, err := store.getBucketName()
+
+		assert.NoError(t, err)
+		assert.Equal(t, test.want, bucketName)
 	}
 
-	bucketName, err := store.getBucketName()
-
-	assert.NoError(t, err)
-	assert.Equal(t, "aFakeBucket", bucketName)
-
 }