Various lint fixes

Author: davissp14

cmd/event_handler/main.go

@@ -73,7 +73,7 @@ func main() {
 		success := false
 
 		for retry < maxRetries {
-			if err := reconfigurePGBouncer(*&newMemberID); err != nil {
+			if err := reconfigurePGBouncer(newMemberID); err != nil {
 				log.Printf("%s - failed to reconfigure pgbouncer: %s. (attempt: %d)\n", *event, err, retry)
 				retry++
 				time.Sleep(1 * time.Second)

cmd/standby_cleaner/main.go

@@ -91,7 +91,7 @@ func handleTick(ctx context.Context, node *flypg.Node, seenAt map[int]time.Time,
 		sConn, err := node.RepMgr.NewRemoteConnection(ctx, standby.Hostname)
 		if err != nil {
 			// TODO - Verify the exception that's getting thrown.
-			if time.Now().Sub(seenAt[standby.ID]) >= deadMemberRemovalThreshold {
+			if time.Since(seenAt[standby.ID]) >= deadMemberRemovalThreshold {
 				if err := node.RepMgr.UnregisterMember(ctx, standby); err != nil {
 					fmt.Printf("failed to unregister member %s: %v", standby.Hostname, err)
 					continue

internal/api/handle_admin.go

@@ -93,7 +93,7 @@ func (s *Server) handleUpdatePostgresSettings(w http.ResponseWriter, r *http.Req
 
 	var requiresRestart []string
 
-	for k, _ := range user {
+	for k := range user {
 		restart, err := admin.SettingRequiresRestart(r.Context(), conn, k)
 		if err != nil {
 			renderErr(w, err)
@@ -185,7 +185,7 @@ func (s *Server) handleViewPostgresSettings(w http.ResponseWriter, r *http.Reque
 
 	var out []admin.PGSetting
 
-	for key, _ := range all {
+	for key := range all {
 		if slices.Contains(in, key) {
 			setting, err := admin.GetSetting(r.Context(), conn, key)
 			if err != nil {
@@ -222,8 +222,8 @@ func (s *Server) handleViewBouncerSettings(w http.ResponseWriter, r *http.Reques
 
 	out := map[string]interface{}{}
 
-	for key, _ := range all {
-		val, _ := all[key]
+	for key := range all {
+		val := all[key]
 		if slices.Contains(in, key) {
 			out[key] = val
 		}
@@ -255,8 +255,8 @@ func (s *Server) handleViewRepmgrSettings(w http.ResponseWriter, r *http.Request
 
 	out := map[string]interface{}{}
 
-	for key, _ := range all {
-		val, _ := all[key]
+	for key := range all {
+		val := all[key]
 		if slices.Contains(in, key) {
 			out[key] = val
 		}

internal/flycheck/vm.go

@@ -43,7 +43,7 @@ func checkPressure(name string) (string, error) {
 		return "", err
 	}
 
-	_, err = fmt.Sscanf(
+	fmt.Sscanf(
 		string(raw),
 		"some avg10=%f avg60=%f avg300=%f total=%f",
 		&avg10, &avg60, &avg300, &counter,
@@ -171,7 +171,7 @@ func dataSize(size uint64) string {
 	base := math.Log(float64(size)) / math.Log(1024)
 	getSize := round(math.Pow(1024, base-math.Floor(base)), .5, 2)
 	getSuffix := suffixes[int(math.Floor(base))]
-	return fmt.Sprint(strconv.FormatFloat(getSize, 'f', -1, 64) + " " + string(getSuffix))
+	return fmt.Sprint(strconv.FormatFloat(getSize, 'f', -1, 64) + " " + getSuffix)
 }
 
 func pressureToDuration(pressure float64, base float64) (time.Duration, error) {

internal/flypg/admin/admin.go

@@ -86,12 +86,12 @@ type ReplicationSlot struct {
 }
 
 func ListReplicationSlots(ctx context.Context, pg *pgx.Conn) ([]ReplicationSlot, error) {
-	sql := fmt.Sprintf("SELECT slot_name, slot_type, active, wal_status from pg_replication_slots;")
+	sql := "SELECT slot_name, slot_type, active, wal_status from pg_replication_slots;"
 	rows, err := pg.Query(ctx, sql)
-	defer rows.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 
 	var slots []ReplicationSlot
 

internal/flypg/config.go

@@ -111,9 +111,7 @@ func WriteConfigFiles(c Config) error {
 
 	for key, value := range c.UserConfig() {
 		entry := fmt.Sprintf("%s = %v\n", key, value)
-		if _, ok := internal[key]; ok {
-			delete(internal, key)
-		}
+		delete(internal, key)
 		userFile.Write([]byte(entry))
 	}
 

internal/flypg/repmgr.go

@@ -147,24 +147,6 @@ func (r *RepMgr) registerPrimary() error {
 	return nil
 }
 
-func (r *RepMgr) unregisterPrimary() error {
-	cmdStr := fmt.Sprintf("repmgr -f %s primary unregister", r.ConfigPath)
-	if err := utils.RunCommand(cmdStr); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (r *RepMgr) followPrimary() error {
-	cmdStr := fmt.Sprintf("repmgr -f %s standby follow", r.ConfigPath)
-	if err := utils.RunCommand(cmdStr); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (r *RepMgr) rejoinCluster(hostname string) error {
 	cmdStr := fmt.Sprintf("repmgr -f %s node rejoin -h %s -p %d -U %s -d %s --force-rewind --no-wait",
 		r.ConfigPath,

internal/supervisor/process.go

@@ -19,11 +19,10 @@ type process struct {
 	restartDelay time.Duration
 	maxRestarts  int
 
-	f       cmdFactory
-	running bool
-	dir     string
-	env     []string
-	cmd     *exec.Cmd
+	f   cmdFactory
+	dir string
+	env []string
+	cmd *exec.Cmd
 }
 
 type Opt func(*process)