Fix review notices

internal/delete_handler.go

@@ -294,7 +294,7 @@ func getWals(before string, folder StorageFolder) ([]string, error) {
 	for _, walObject := range walObjects {
 		tracelog.InfoLogger.Println(walObject.GetName())
 		if walObject.GetName() < before {
-			tracelog.InfoLogger.Println("delete",walObject.GetName())
+			tracelog.InfoLogger.Println("delete", walObject.GetName())
 			walsBefore = append(walsBefore, walObject.GetName())
 		}
 	}

internal/file_storage_object.go

@@ -15,4 +15,4 @@ func (object FileStorageObject) GetName() string {
 
 func (object FileStorageObject) GetLastModified() time.Time {
 	return object.ModTime()
-}
+}

internal/fs_folder.go

@@ -76,12 +76,12 @@ func (folder *FSFolder) DeleteObjects(objectRelativePaths []string) error {
 }
 
 func (folder *FSFolder) Exists(objectRelativePath string) (bool, error) {
-	_, err := os.Stat(folder.GetFilePath(objectRelativePath));
+	_, err := os.Stat(folder.GetFilePath(objectRelativePath))
 	if os.IsNotExist(err) {
 		return false, nil
 	}
 	if err != nil {
-		return false, NewFSFolderError(err, "Unable to stat obejct %v", objectRelativePath)
+		return false, NewFSFolderError(err, "Unable to stat object %v", objectRelativePath)
 	}
 	return true, nil
 

internal/gcs_folder.go

@@ -39,12 +39,12 @@ func ConfigureGSFolder(prefix string) (StorageFolder, error) {
 
 	client, err := storage.NewClient(ctx, option.WithCredentialsFile(credentials))
 	if err != nil {
-		return nil, NewFSFolderError(err, "Unable to create GS Client")
+		return nil, NewGSFolderError(err, "Unable to create GS Client")
 	}
 
 	bucketName, path, err := getPathFromPrefix(prefix)
 	if err != nil {
-		return nil, NewFSFolderError(err, "Unable to parse prefix %v", prefix)
+		return nil, NewGSFolderError(err, "Unable to parse prefix %v", prefix)
 	}
 
 	bucket := client.Bucket(bucketName)
@@ -78,7 +78,7 @@ func (folder *GSFolder) ListFolder() (objects []StorageObject, subFolders []Stor
 			break
 		}
 		if err != nil {
-			return nil, nil, NewFSFolderError(err, "Unable to iterate %v", folder.path)
+			return nil, nil, NewGSFolderError(err, "Unable to iterate %v", folder.path)
 		}
 		if objAttrs.Prefix != "" {
 			subFolders = append(subFolders, NewGSFolder(folder.bucket, objAttrs.Prefix))
@@ -91,13 +91,13 @@ func (folder *GSFolder) ListFolder() (objects []StorageObject, subFolders []Stor
 }
 
 func (folder *GSFolder) DeleteObjects(objectRelativePaths []string) error {
-	for _, o := range objectRelativePaths {
-		path := JoinS3Path(folder.path, o)
+	for _, objectRelativePath := range objectRelativePaths {
+		path := JoinS3Path(folder.path, objectRelativePath)
 		object := folder.bucket.Object(path)
 		tracelog.DebugLogger.Printf("Delete %v\n", path)
 		err := object.Delete(context.Background())
 		if err != nil && err != storage.ErrObjectNotExist {
-			return NewFSFolderError(err, "Unable to delete object %v", path)
+			return NewGSFolderError(err, "Unable to delete object %v", path)
 		}
 	}
 	return nil
@@ -111,7 +111,7 @@ func (folder *GSFolder) Exists(objectRelativePath string) (bool, error) {
 		return false, nil
 	}
 	if err != nil {
-		return false, NewFSFolderError(err, "Unable to stat object %v", path)
+		return false, NewGSFolderError(err, "Unable to stat object %v", path)
 	}
 	return true, nil
 }
@@ -133,15 +133,15 @@ func (folder *GSFolder) ReadObject(objectRelativePath string) (io.ReadCloser, er
 func (folder *GSFolder) PutObject(name string, content io.Reader) error {
 	tracelog.DebugLogger.Printf("Put %v into %v\n", name, folder.path)
 	object := folder.bucket.Object(JoinS3Path(folder.path, name))
-	w := object.NewWriter(context.Background())
-	_, err := io.Copy(w, content)
+	writer := object.NewWriter(context.Background())
+	_, err := io.Copy(writer, content)
 	if err != nil {
-		return NewFSFolderError(err, "Unable to copy to object")
+		return NewGSFolderError(err, "Unable to copy to object")
 	}
 	tracelog.DebugLogger.Printf("Put %v done\n", name)
-	err = w.Close()
+	err = writer.Close()
 	if err != nil {
-		return NewFSFolderError(err, "Unable to Close object")
+		return NewGSFolderError(err, "Unable to Close object")
 	}
 	return nil
 }

test/fs_folder_test.go

@@ -64,8 +64,8 @@ func testStorageFolder(storageFolder internal.StorageFolder, t *testing.T) {
 
 	sublist, subFolders, err := sub1.ListFolder()
 	assert.NoError(t, err)
-	assert.Equal(t,len(subFolders),0)
-	assert.Equal(t,len(sublist),1)
+	assert.Equal(t, len(subFolders), 0)
+	assert.Equal(t, len(sublist), 1)
 
 	data, err := sub1.ReadObject("file1")
 	assert.NoError(t, err)
@@ -82,7 +82,6 @@ func testStorageFolder(storageFolder internal.StorageFolder, t *testing.T) {
 	err = storageFolder.DeleteObjects([]string{"file0"})
 	assert.NoError(t, err)
 
-
 	b, err = storageFolder.Exists("file0")
 	assert.NoError(t, err)
 	assert.False(t, b)
@@ -91,5 +90,5 @@ func testStorageFolder(storageFolder internal.StorageFolder, t *testing.T) {
 	assert.False(t, b)
 
 	_, err = sub1.ReadObject("Tumba Yumba")
-	assert.Error(t,err.(internal.ObjectNotFoundError))
+	assert.Error(t, err.(internal.ObjectNotFoundError))
 }

test/gcs_folder_test.go

@@ -10,7 +10,7 @@ import (
 func TestGSFolder(t *testing.T) {
 	t.Skip("Credentials needed to run GCP tests")
 
-	os.Setenv("GOOGLE_APPLICATION_CREDENTIALS","/Users/x4mmm/Downloads/mdb-tests-d0uble-0b98813b622b.json")
+	os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", "/Users/x4mmm/Downloads/mdb-tests-d0uble-0b98813b622b.json")
 	storageFolder, err := internal.ConfigureGSFolder("gs://x4m-test/walg-bucket")
 
 	assert.NoError(t, err)

test/s3_folder_test.go

@@ -10,14 +10,14 @@ import (
 func TestS3Folder(t *testing.T) {
 	t.Skip("Credentials needed to run S3 tests")
 
-	os.Setenv("AWS_ENDPOINT","http://s3.mdst.yandex.net/")
-	os.Setenv("AWS_ACCESS_KEY_ID","")
-	os.Setenv("AWS_SECRET_ACCESS_KEY","")
-	os.Setenv("WALE_S3_PREFIX","s3://test-bucket/wal-g-test-folder/Sub0")
+	os.Setenv("AWS_ENDPOINT", "http://s3.mdst.yandex.net/")
+	os.Setenv("AWS_ACCESS_KEY_ID", "")
+	os.Setenv("AWS_SECRET_ACCESS_KEY", "")
+	os.Setenv("WALE_S3_PREFIX", "s3://test-bucket/wal-g-test-folder/Sub0")
 
 	storageFolder, err := internal.ConfigureS3Folder()
 
 	assert.NoError(t, err)
 
 	testStorageFolder(storageFolder, t)
-}
+}

test/upload_test.go

@@ -113,7 +113,7 @@ func doConfigureWithBucketPath(t *testing.T, bucketPath string, expectedServer s
 	}
 	uploader, folder, err = internal.Configure()
 	assert.NoError(t, err)
-	assert.Equal(t, expectedServer, strings.TrimSuffix(folder.GetPath(),"/"))
+	assert.Equal(t, expectedServer, strings.TrimSuffix(folder.GetPath(), "/"))
 	assert.NotNil(t, uploader)
 	assert.NoError(t, err)
 	// Test STANDARD_IA storage class