Fix various nits

etcd-manager/cmd/etcd-dump/main.go

@@ -122,7 +122,7 @@ func runDump(backupFile string, out string) error {
 			break
 		}
 
-		exitError, exitState := process.ExitState()
+		exitState, exitError := process.ExitState()
 		if exitError != nil || exitState != nil {
 			return fmt.Errorf("etcd process exited (state=%v): %w", exitState, exitError)
 		}

etcd-manager/pkg/controller/controller.go

@@ -580,7 +580,7 @@ func (m *EtcdController) maybeBackup(ctx context.Context, clusterSpec *protoetcd
 }
 
 func randomToken() string {
-	b := make([]byte, 16, 16)
+	b := make([]byte, 16)
 	_, err := io.ReadFull(crypto_rand.Reader, b)
 	if err != nil {
 		klog.Fatalf("error generating random token: %v", err)
@@ -956,7 +956,6 @@ func (m *EtcdController) removeNodeFromCluster(ctx context.Context, clusterSpec
 						klog.Infof("peer %v is unhealthy, but waiting for %s (currently %s)", member, removeUnhealthyDeadline, age)
 						continue
 					}
-
 				}
 
 				victim = member

etcd-manager/pkg/controller/reconcile_configuration.go

@@ -77,9 +77,7 @@ func (m *EtcdController) updatePeerURLs(ctx context.Context, peerID privateapi.P
 
 func normalize(in []string) []string {
 	var c []string
-	for _, s := range in {
-		c = append(c, s)
-	}
+	c = append(c, in...)
 	sort.Strings(c)
 	return c
 }
@@ -145,7 +143,7 @@ func (m *EtcdController) reconcileTLS(ctx context.Context, clusterState *etcdClu
 			}
 		}
 
-		if node.TlsEnabled == false {
+		if !node.TlsEnabled {
 			request := &protoetcd.ReconfigureRequest{
 				Header:      m.buildHeader(),
 				Quarantined: p.info.EtcdState.Quarantined,

etcd-manager/pkg/etcd/etcdprocess.go

@@ -110,11 +110,11 @@ type etcdProcess struct {
 	IgnoreListenMetricsURLs bool
 }
 
-func (p *etcdProcess) ExitState() (error, *os.ProcessState) {
+func (p *etcdProcess) ExitState() (*os.ProcessState, error) {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
-	return p.exitError, p.exitState
+	return p.exitState, p.exitError
 }
 
 func (p *etcdProcess) Stop() error {

etcd-manager/pkg/etcd/etcdserver.go

@@ -178,7 +178,7 @@ func (s *EtcdServer) runOnce() error {
 
 	// Check that etcd process is still running
 	if s.process != nil {
-		exitError, exitState := s.process.ExitState()
+		exitState, exitError := s.process.ExitState()
 		if exitError != nil || exitState != nil {
 			klog.Warningf("etcd process exited (error=%v, state=%v)", exitError, exitState)
 
@@ -514,10 +514,10 @@ func (s *EtcdServer) DoBackup(ctx context.Context, request *protoetcd.DoBackupRe
 	}
 
 	if request.Storage == "" {
-		return nil, fmt.Errorf("Storage is required")
+		return nil, fmt.Errorf("request Storage is required")
 	}
 	if request.Info == nil {
-		return nil, fmt.Errorf("Info is required")
+		return nil, fmt.Errorf("request Info is required")
 	}
 	backupStore, err := backup.NewStore(request.Storage)
 	if err != nil {

etcd-manager/pkg/etcd/pki.go

@@ -52,9 +52,7 @@ func (p *etcdProcess) createKeypairs(peersCA *pki.CA, clientsCA *pki.CA, pkiDir
 
 		// etcd 3.2 does some deeper client-certiifcate validation, so we want to include our client IP address
 		// (as the DNS name might not be immediately ready, see https://github.com/kopeio/etcd-manager/issues/371)
-		for _, ip := range peerClientIPs {
-			certConfig.AltNames.IPs = append(certConfig.AltNames.IPs, ip)
-		}
+		certConfig.AltNames.IPs = append(certConfig.AltNames.IPs, peerClientIPs...)
 		klog.Infof("adding peerClientIPs %v", peerClientIPs)
 
 		if err := addAltNames(&certConfig, me.PeerUrls); err != nil {

etcd-manager/pkg/etcd/restore.go

@@ -51,10 +51,10 @@ func (s *EtcdServer) DoRestore(ctx context.Context, request *protoetcd.DoRestore
 	}
 
 	if request.Storage == "" {
-		return nil, fmt.Errorf("Storage is required")
+		return nil, fmt.Errorf("request Storage is required")
 	}
 	if request.BackupName == "" {
-		return nil, fmt.Errorf("BackupName is required")
+		return nil, fmt.Errorf("request BackupName is required")
 	}
 
 	backupStore, err := backup.NewStore(request.Storage)
@@ -219,7 +219,7 @@ func copyEtcd(ctx context.Context, source *etcdProcess, dest etcdclient.NodeSink
 			break
 		}
 
-		exitError, exitState := source.ExitState()
+		exitState, exitError := source.ExitState()
 		if exitError != nil || exitState != nil {
 			return fmt.Errorf("source etcd process exited (state=%v): %w", exitState, exitError)
 		}

etcd-manager/pkg/pki/certs.go

@@ -164,13 +164,9 @@ func ensureKeypair(store MutableKeypair, config certutil.Config, signer *CA) (*K
 				var expectedNames []string
 				var actualNames []string
 
-				for _, s := range config.AltNames.DNSNames {
-					expectedNames = append(expectedNames, s)
-				}
+				expectedNames = append(expectedNames, config.AltNames.DNSNames...)
 
-				for _, s := range cert.DNSNames {
-					actualNames = append(actualNames, s)
-				}
+				actualNames = append(actualNames, cert.DNSNames...)
 
 				sort.Strings(expectedNames)
 				sort.Strings(actualNames)

etcd-manager/pkg/privateapi/leadership.go

@@ -235,7 +235,7 @@ func (s *Server) AssertLeadership(ctx context.Context, leadershipToken string) e
 }
 
 func randomToken() string {
-	b := make([]byte, 16, 16)
+	b := make([]byte, 16)
 	_, err := io.ReadFull(crypto_rand.Reader, b)
 	if err != nil {
 		klog.Fatalf("error generating random token: %v", err)

etcd-manager/pkg/privateapi/peers.go

@@ -373,7 +373,7 @@ func (s *Server) Peers() []*PeerInfo {
 
 	for _, peer := range s.peers {
 		lastInfo, status := peer.status(s.HealthyTimeout)
-		if status == false {
+		if !status {
 			continue
 		}
 		infos = append(infos, lastInfo)
@@ -392,7 +392,7 @@ func (s *Server) GetPeerClient(peerId PeerId) (*grpc.ClientConn, error) {
 	s.mutex.Unlock()
 
 	_, status := peer.status(s.HealthyTimeout)
-	if status == false {
+	if !status {
 		return nil, fmt.Errorf("peer %q is not healthy", peerId)
 	}
 

etcd-manager/test/integration/harness/cluster.go

@@ -256,8 +256,7 @@ func (h *TestHarness) WaitForBackup(t *testing.T, timeout time.Duration) {
 	}
 	wantBackups := len(backups) + 1
 
-	description := fmt.Sprintf("wait for new backup")
-	h.WaitFor(timeout, description, func() error {
+	h.WaitFor(timeout, "wait for new backup", func() error {
 		backups, err := backupStore.ListBackups()
 		if err != nil {
 			return fmt.Errorf("error listing backups: %w", err)