Merge pull request #233 from x4m/fix_gcp

Fix ListFolder returning superflous '/' char at name of every object
wal-g · Apr 5, 2019 · 4dea194 · 4dea194
2 parents d26bd39 + 14fb276
commit 4dea194
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/storages/gcs/folder.go b/internal/storages/gcs/folder.go
@@ -50,7 +50,8 @@ func (folder *Folder) GetPath() string {
 }
 
 func (folder *Folder) ListFolder() (objects []storage.Object, subFolders []storage.Folder, err error) {
-	it := folder.bucket.Objects(context.Background(), &gcs.Query{Delimiter: "/", Prefix: storage.AddDelimiterToPath(folder.path)})
+	prefix := storage.AddDelimiterToPath(folder.path)
+	it := folder.bucket.Objects(context.Background(), &gcs.Query{Delimiter: "/", Prefix: prefix})
 	for {
 		objAttrs, err := it.Next()
 		if err == iterator.Done {
@@ -62,7 +63,7 @@ func (folder *Folder) ListFolder() (objects []storage.Object, subFolders []stora
 		if objAttrs.Prefix != "" {
 			subFolders = append(subFolders, NewFolder(folder.bucket, objAttrs.Prefix))
 		} else {
-			objName := strings.TrimPrefix(objAttrs.Name, folder.path)
+			objName := strings.TrimPrefix(objAttrs.Name, prefix)
 			objects = append(objects, storage.NewLocalObject(objName, objAttrs.Updated))
 		}
 	}

diff --git a/internal/storages/storage/testing.go b/internal/storages/storage/testing.go
@@ -33,6 +33,7 @@ func RunFolderTest(storageFolder Folder, t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, len(subFolders), 0)
 	assert.Equal(t, len(sublist), 1)
+	assert.Equal(t, sublist[0].GetName(),"file1")
 
 	data, err := sub1.ReadObject("file1")
 	assert.NoError(t, err)