Fix lint errors: errcheck, modernize/rangeint, modernize/any

Signed-off-by: shunki-fujita <shunki-fujita@cybozu.co.jp>

Author: shunki-fujita

clustering/manager_test.go

@@ -1150,7 +1150,7 @@ var _ = Describe("manager", func() {
 		}).Should(Succeed())
 
 		// Verify ALTER USER RETAIN was called on all 3 instances for all users.
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			users := of.getRotatedUsers(cluster.PodHostname(i))
 			Expect(users).To(HaveLen(len(constants.MocoUsers)),
 				"instance %d should have rotated all users", i)
@@ -1222,14 +1222,14 @@ var _ = Describe("manager", func() {
 		}).Should(Succeed())
 
 		// Verify DISCARD OLD PASSWORD was called on all 3 instances for all users.
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			users := of.getDiscardedUsers(cluster.PodHostname(i))
 			Expect(users).To(HaveLen(len(constants.MocoUsers)),
 				"instance %d should have discarded all users", i)
 		}
 
 		// Verify auth plugin migration was called (users had mysql_native_password, target is caching_sha2_password).
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			users := of.getMigratedUsers(cluster.PodHostname(i))
 			Expect(users).To(HaveLen(len(constants.MocoUsers)),
 				"instance %d should have migrated all users", i)

clustering/password_rotation.go

@@ -83,13 +83,13 @@ func (p *managerProcess) handleRotatingPhase(ctx context.Context, ss *StatusSet,
 	// rotateInstanceUsers provides idempotency).
 	retainStarted := string(sourceSecret.Data[password.RetainStartedKey]) == cr.Status.RotationID
 	if !retainStarted {
-		for idx := 0; idx < replicas; idx++ {
+		for idx := range replicas {
 			op, err := p.dbf.New(ctx, cluster, currentPasswd, idx)
 			if err != nil {
 				return false, err
 			}
 			dualFound, dualUser, checkErr := checkInstanceDualPasswords(ctx, op, idx)
-			op.Close()
+			_ = op.Close()
 			if checkErr != nil {
 				return false, checkErr
 			}
@@ -118,18 +118,18 @@ func (p *managerProcess) handleRotatingPhase(ctx context.Context, ss *StatusSet,
 	}
 	primaryIndex := cluster.Status.CurrentPrimaryIndex
 
-	for idx := 0; idx < replicas; idx++ {
+	for idx := range replicas {
 		isReplica := idx != primaryIndex
 		op, err := p.dbf.New(ctx, cluster, currentPasswd, idx)
 		if err != nil {
 			return false, err
 		}
 
 		if err := rotateInstanceUsers(ctx, op, pendingMap, idx, isReplica); err != nil {
-			op.Close()
+			_ = op.Close()
 			return false, err
 		}
-		op.Close()
+		_ = op.Close()
 		log.Info("completed ALTER USER RETAIN for instance", "instance", idx, "rotationID", cr.Status.RotationID)
 	}
 
@@ -206,7 +206,7 @@ func (p *managerProcess) handleDiscardingPhase(ctx context.Context, ss *StatusSe
 		if err != nil {
 			return "", err
 		}
-		defer op.Close()
+		defer func() { _ = op.Close() }()
 		return op.GetAuthPlugin(ctx)
 	}()
 	if err != nil {
@@ -215,18 +215,18 @@ func (p *managerProcess) handleDiscardingPhase(ctx context.Context, ss *StatusSe
 	log.Info("determined target auth plugin for migration", "authPlugin", authPlugin, "rotationID", cr.Status.RotationID)
 
 	// Execute DISCARD OLD PASSWORD + auth plugin migration on all instances.
-	for idx := 0; idx < replicas; idx++ {
+	for idx := range replicas {
 		isReplica := idx != primaryIndex
 		op, err := p.dbf.New(ctx, cluster, pendingPasswd, idx)
 		if err != nil {
 			return false, err
 		}
 
 		if err := discardInstanceUsers(ctx, op, pendingMap, idx, isReplica, authPlugin); err != nil {
-			op.Close()
+			_ = op.Close()
 			return false, err
 		}
-		op.Close()
+		_ = op.Close()
 		log.Info("applied DISCARD OLD PASSWORD and auth plugin migration for instance", "instance", idx, "rotationID", cr.Status.RotationID)
 	}
 

cmd/kubectl-moco/cmd/credential.go

@@ -150,8 +150,8 @@ func credentialRotate(ctx context.Context, clusterName string) error {
 	}
 
 	newGen := cr.Spec.RotationGeneration + 1
-	patch, err := json.Marshal(map[string]interface{}{
-		"spec": map[string]interface{}{
+	patch, err := json.Marshal(map[string]any{
+		"spec": map[string]any{
 			"rotationGeneration": newGen,
 			"discardOldPassword": false,
 		},
@@ -179,8 +179,8 @@ func credentialDiscard(ctx context.Context, clusterName string) error {
 		return fmt.Errorf("cannot discard: phase must be Rotated, currently %q", cr.Status.Phase)
 	}
 
-	patch, err := json.Marshal(map[string]interface{}{
-		"spec": map[string]interface{}{
+	patch, err := json.Marshal(map[string]any{
+		"spec": map[string]any{
 			"discardOldPassword": true,
 		},
 	})

pkg/dbop/password.go

@@ -44,11 +44,11 @@ func validateMocoUser(user string) error {
 func closeDirtyConn(ctx context.Context, conn *sql.Conn) {
 	if _, err := conn.ExecContext(ctx, "SET sql_log_bin=1"); err != nil {
 		// Mark the connection as bad so the pool discards it.
-		_ = conn.Raw(func(driverConn interface{}) error {
+		_ = conn.Raw(func(driverConn any) error {
 			return driver.ErrBadConn
 		})
 	}
-	conn.Close()
+	_ = conn.Close()
 }
 
 // GetAuthPlugin returns the default authentication plugin for the first factor