golangli-lint fixes

Author: dangra

cmd/event_handler/main.go

@@ -19,10 +19,7 @@ func main() {
 	details := flag.String("details", "", "details")
 	flag.Parse()
 
-	succ := true
-	if *success == "0" {
-		succ = false
-	}
+	succ := *success != "0"
 
 	req := api.EventRequest{
 		Name:    *event,

cmd/flexctl/backups.go

@@ -57,6 +57,7 @@ var backupShowCmd = &cobra.Command{
 		if !backupsEnabled() {
 			return fmt.Errorf("backups are not enabled")
 		}
+
 		return showBackup(cmd, args)
 	},
 	Args: cobra.ExactArgs(1),
@@ -172,6 +173,7 @@ func listBackups(cmd *cobra.Command) error {
 		}
 
 		fmt.Println(string(jsonBytes))
+
 		return nil
 	}
 
@@ -229,7 +231,7 @@ func backupsEnabled() bool {
 }
 
 func newBackupConfig() *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:   "config",
 		Short: "Manage backup configuration",
 	}
@@ -248,6 +250,7 @@ func getAppName() (string, error) {
 	if name == "" {
 		return "", fmt.Errorf("FLY_APP_NAME is not set")
 	}
+
 	return name, nil
 }
 
@@ -257,11 +260,12 @@ func getApiUrl() (string, error) {
 		return "", err
 	}
 	url := fmt.Sprintf("http://%s.internal:5500", hostname)
+
 	return url, nil
 }
 
 func newConfigShow() *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:   "show",
 		Short: "Show current configuration",
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -308,7 +312,7 @@ type configUpdateResult struct {
 }
 
 func newConfigUpdate() *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:   "update",
 		Short: "Update configuration",
 	}

cmd/flexctl/main.go

@@ -8,14 +8,14 @@ import (
 )
 
 func main() {
-	var rootCmd = &cobra.Command{
+	rootCmd := &cobra.Command{
 		Use:           "flexctl",
 		SilenceErrors: true,
 		SilenceUsage:  true,
 	}
 
 	// Backup commands
-	var backupCmd = &cobra.Command{Use: "backup"}
+	backupCmd := &cobra.Command{Use: "backup"}
 	backupCmd.Aliases = []string{"backups"}
 
 	rootCmd.AddCommand(backupCmd)

cmd/monitor/monitor_backup_retention.go

@@ -9,7 +9,6 @@ import (
 )
 
 func monitorBackupRetention(ctx context.Context, node *flypg.Node, barman *flypg.Barman) {
-
 	ticker := time.NewTicker(defaultBackupRetentionEvalFrequency)
 	defer ticker.Stop()
 

cmd/monitor/monitor_backup_schedule.go

@@ -111,6 +111,7 @@ func calculateNextBackupTime(barman *flypg.Barman, lastBackupTime time.Time) tim
 	if lastBackupTime.IsZero() {
 		return -1
 	}
+
 	return time.Until(lastBackupTime.Add(backupFrequency(barman)))
 }
 

cmd/monitor/monitor_backup_schedule_test.go

@@ -115,7 +115,6 @@ func TestCalculateNextBackupTime(t *testing.T) {
 			t.Fatalf("expected next backup time duration to be %f, but got %f", expected, val)
 		}
 	})
-
 }
 
 func setDefaultEnv(t *testing.T) {
@@ -129,13 +128,14 @@ func setup(t *testing.T) error {
 
 	if _, err := os.Stat(pgTestDirectory); err != nil {
 		if os.IsNotExist(err) {
-			if err := os.Mkdir(pgTestDirectory, 0750); err != nil {
+			if err := os.Mkdir(pgTestDirectory, 0o750); err != nil {
 				return err
 			}
 		} else {
 			return err
 		}
 	}
+
 	return nil
 }
 

cmd/monitor/monitor_cluster_state.go

@@ -42,6 +42,7 @@ func clusterStateMonitorTick(ctx context.Context, node *flypg.Node) error {
 		if err := flypg.Quarantine(ctx, node, primary); err != nil {
 			return fmt.Errorf("failed to quarantine failed primary: %s", err)
 		}
+
 		return fmt.Errorf("primary has been quarantined: %s", err)
 	} else if err != nil {
 		return fmt.Errorf("failed to run zombie diagnosis: %s", err)

cmd/monitor/monitor_replication_slots.go

@@ -74,6 +74,7 @@ func replicationSlotMonitorTick(ctx context.Context, node *flypg.Node, inactiveS
 				}
 
 				delete(inactiveSlotStatus, int(slot.MemberID))
+
 				continue
 			}
 

cmd/pg_unregister/main.go

@@ -107,6 +107,7 @@ func removeReplicationSlot(ctx context.Context, conn *pgx.Conn, slotName string)
 				if err == pgx.ErrNoRows {
 					return nil
 				}
+
 				return fmt.Errorf("failed to get replication slot %s: %v", slotName, err)
 			}
 

cmd/start/main.go

@@ -76,6 +76,7 @@ func main() {
 				fmt.Printf("failed post-init: %s. Retrying...\n", err)
 				continue
 			}
+
 			return
 		}
 	}()
@@ -159,6 +160,7 @@ func scaleToZeroWorker(ctx context.Context, node *flypg.Node) error {
 			if current > 1 {
 				continue
 			}
+
 			return fmt.Errorf("scale to zero condition hit")
 		}
 	}
@@ -176,6 +178,7 @@ func getCurrentConnCount(ctx context.Context, node *flypg.Node) (int, error) {
 	if err := conn.QueryRow(ctx, sql).Scan(&current); err != nil {
 		return 0, err
 	}
+
 	return current, nil
 }