fix linter issues

wal-g · Sep 30, 2022 · 20ef4ec · 20ef4ec
1 parent 2210d77
commit 20ef4ec
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/internal/databases/greenplum/backup.go b/internal/databases/greenplum/backup.go
@@ -47,7 +47,9 @@ func (backup *Backup) GetSegmentBackup(backupID string, contentID int) (SegBacku
 
 	backupName, err := selector.Select(segBackupsFolder)
 	if err != nil {
-		return SegBackup{}, fmt.Errorf("failed to select matching backup for id %s from subfolder %s: %w", backupID, segBackupsFolder.GetPath(), err)
+		return SegBackup{}, fmt.Errorf(
+			"failed to select matching backup for id %s from subfolder %s: %w",
+			backupID, segBackupsFolder.GetPath(), err)
 	}
 
 	pgBackup := postgres.NewBackup(segBackupsFolder.GetSubFolder(utility.BaseBackupPath), backupName)

diff --git a/internal/databases/greenplum/delete_handler.go b/internal/databases/greenplum/delete_handler.go
@@ -135,7 +135,7 @@ func (h *DeleteHandler) DeleteTarget(target internal.BackupObject) {
 	tracelog.InfoLogger.Println("Deleting the segments backups...")
 	err := h.dispatchDeleteCmd(target, runSegmentDeleteTarget)
 	if err != nil {
-		tracelog.ErrorLogger.Fatalf("Failed to delete the segments backups: %w", err)
+		tracelog.ErrorLogger.Fatalf("Failed to delete the segments backups: %v", err)
 	}
 	tracelog.InfoLogger.Printf("Finished deleting the segments backups")
 

diff --git a/internal/databases/greenplum/recovery_cfg_maker_test.go b/internal/databases/greenplum/recovery_cfg_maker_test.go
@@ -12,10 +12,10 @@ func TestGenerateRecoveryConf(t *testing.T) {
 	cfgPath := "/etc/wal-g/wal-g.yaml"
 	recoveryTargetName := "some_backup"
 	recCfgMaker := greenplum.NewRecoveryConfigMaker(walgPath, cfgPath, recoveryTargetName)
-	contentId := -1
+	contentID := -1
 
 	expectedCfg := `restore_command = '/usr/bin/wal-g seg wal-fetch "%f" "%p" --content-id=-1 --config /etc/wal-g/wal-g.yaml'
 recovery_target_name = 'some_backup'`
-	actualCfg := recCfgMaker.Make(contentId)
+	actualCfg := recCfgMaker.Make(contentID)
 	assert.Equal(t, expectedCfg, actualCfg, "Actual recovery.conf does not match the expected one")
 }
diff --git a/internal/databases/greenplum/segment_delete_handler.go b/internal/databases/greenplum/segment_delete_handler.go
@@ -1,23 +1,24 @@
 package greenplum
 
 import (
+	"path"
+	"strings"
+
 	"github.com/wal-g/tracelog"
 	"github.com/wal-g/wal-g/internal"
 	"github.com/wal-g/wal-g/internal/databases/postgres"
 	"github.com/wal-g/wal-g/pkg/storages/storage"
 	"github.com/wal-g/wal-g/utility"
-	"path"
-	"strings"
 )
 
 type SegDeleteHandler struct {
 	*postgres.DeleteHandler
-	contentId int
+	contentID int
 	args      DeleteArgs
 }
 
-func NewSegDeleteHandler(rootFolder storage.Folder, contentId int, args DeleteArgs) (SegDeleteHandler, error) {
-	segFolder := rootFolder.GetSubFolder(FormatSegmentStoragePrefix(contentId))
+func NewSegDeleteHandler(rootFolder storage.Folder, contentID int, args DeleteArgs) (SegDeleteHandler, error) {
+	segFolder := rootFolder.GetSubFolder(FormatSegmentStoragePrefix(contentID))
 	permanentBackups, permanentWals := postgres.GetPermanentBackupsAndWals(segFolder)
 
 	segDeleteHandler, err := postgres.NewDeleteHandler(segFolder, permanentBackups, permanentWals, false)
@@ -27,7 +28,7 @@ func NewSegDeleteHandler(rootFolder storage.Folder, contentId int, args DeleteAr
 
 	return SegDeleteHandler{
 		DeleteHandler: segDeleteHandler,
-		contentId:     contentId,
+		contentID:     contentID,
 		args:          args,
 	}, nil
 }
@@ -39,7 +40,7 @@ func runSegmentDeleteTarget(h SegDeleteHandler, segBackup SegBackup) error {
 	}
 
 	tracelog.InfoLogger.Printf("Running delete target %s on segment %d\n",
-		segTarget.GetBackupName(), h.contentId)
+		segTarget.GetBackupName(), h.contentID)
 
 	folderFilter := func(folderPath string) bool {
 		aoSegFolderPrefix := path.Join(utility.BaseBackupPath, AoStoragePath)
@@ -60,7 +61,7 @@ func runSegmentDeleteBefore(h SegDeleteHandler, segBackup SegBackup) error {
 	}
 
 	tracelog.InfoLogger.Printf("Running delete before target %s on segment %d\n",
-		segTarget.GetBackupName(), h.contentId)
+		segTarget.GetBackupName(), h.contentID)
 
 	filterFunc := func(object storage.Object) bool { return true }
 	folderFilter := func(folderPath string) bool {

diff --git a/internal/delete_handler.go b/internal/delete_handler.go
@@ -189,7 +189,8 @@ func (h *DeleteHandler) HandleDeleteTarget(target BackupObject, confirmed, findF
 	h.HandleDeleteTargetWithFilter(target, confirmed, findFull, folderFilter)
 }
 
-func (h *DeleteHandler) HandleDeleteTargetWithFilter(target BackupObject, confirmed, findFull bool, folderFilter func(string) bool) {
+func (h *DeleteHandler) HandleDeleteTargetWithFilter(
+	target BackupObject, confirmed, findFull bool, folderFilter func(string) bool) {
 	var backupsToDelete []BackupObject
 	if findFull {
 		// delete all backups with the same base backup as the target