Fix linting errors after golangci-lint upgrade (#965)

Signed-off-by: Kimmo Lehto <[email protected]>

Author: kke

.golangci.yml

@@ -0,0 +1,9 @@
+version: "2"
+
+linters:
+  settings:
+    errcheck:
+      exclude-functions:
+        - fmt.Fprint
+        - fmt.Fprintf
+        - fmt.Fprintln

cmd/apply.go

@@ -9,6 +9,7 @@ import (
 	"github.com/k0sproject/k0sctl/action"
 	"github.com/k0sproject/k0sctl/phase"
 	"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/urfave/cli/v2"
 )
@@ -80,7 +81,12 @@ var applyCommand = &cli.Command{
 			if err != nil {
 				return fmt.Errorf("failed to open kubeconfig-out file: %w", err)
 			}
-			defer out.Close()
+			outputFile := kc
+			defer func() {
+				if err := out.Close(); err != nil {
+					log.Warnf("failed to close kubeconfig-out file %s: %v", outputFile, err)
+				}
+			}()
 			kubeconfigOut = out
 		}
 

cmd/backup.go

@@ -63,7 +63,12 @@ var backupCommand = &cli.Command{
 				resultErr = fmt.Errorf("open local file for writing: %w", err)
 				return resultErr
 			}
-			defer f.Close()
+			backupFile := f
+			defer func() {
+				if err := backupFile.Close(); err != nil {
+					log.Warnf("failed to close backup file %s: %v", localFile, err)
+				}
+			}()
 			out = f
 		}
 

cmd/flags.go

@@ -201,7 +201,13 @@ func initConfig(ctx *cli.Context) error {
 		if err != nil {
 			return err
 		}
-		defer file.Close()
+		cfgFile := file
+		cfgName := f
+		defer func() {
+			if err := cfgFile.Close(); err != nil {
+				log.Warnf("failed to close config file %s: %v", cfgName, err)
+			}
+		}()
 
 		content, err := io.ReadAll(file)
 		if err != nil {
@@ -399,10 +405,10 @@ func LogFile() (*os.File, error) {
 
 	logFile, err := os.OpenFile(fn, os.O_RDWR|os.O_CREATE|os.O_APPEND|os.O_SYNC, 0o600)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to open log %s: %s", fn, err.Error())
+		return nil, fmt.Errorf("failed to open log %s: %s", fn, err.Error())
 	}
 
-	_, _ = fmt.Fprintf(logFile, "time=\"%s\" level=info msg=\"###### New session ######\"\n", time.Now().Format(time.RFC822))
+	fmt.Fprintf(logFile, "time=\"%s\" level=info msg=\"###### New session ######\"\n", time.Now().Format(time.RFC822))
 
 	return logFile, nil
 }

cmd/kubeconfig.go

@@ -53,7 +53,7 @@ var kubeconfigCommand = &cli.Command{
 			return fmt.Errorf("getting kubeconfig failed - log file saved to %s: %w", ctx.Context.Value(ctxLogFileKey{}).(string), err)
 		}
 
-		_, err := fmt.Fprintf(ctx.App.Writer, "%s\n", kubeconfigAction.Manager.Config.Metadata.Kubeconfig)
-		return err
+		fmt.Fprintf(ctx.App.Writer, "%s\n", kubeconfigAction.Manager.Config.Metadata.Kubeconfig)
+		return nil
 	},
 }

phase/download_binaries.go

@@ -147,7 +147,12 @@ func (b binary) downloadTo(path string) error {
 	if err != nil {
 		return err
 	}
-	defer resp.Body.Close()
+	respBody := resp.Body
+	defer func() {
+		if err := respBody.Close(); err != nil {
+			log.Warnf("failed to close download response body for %s: %v", b.url(), err)
+		}
+	}()
 
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("failed to get k0s binary (http %d)", resp.StatusCode)
@@ -158,7 +163,7 @@ func (b binary) downloadTo(path string) error {
 		return err
 	}
 
-	if err = f.Close(); err == nil {
+	if err = f.Close(); err != nil {
 		return err
 	}
 

phase/gather_k0s_facts.go

@@ -71,7 +71,7 @@ func (p *GatherK0sFacts) ShouldRun() bool {
 
 // Run the phase
 func (p *GatherK0sFacts) Run(ctx context.Context) error {
-	var controllers cluster.Hosts = p.hosts.Controllers()
+	controllers := p.hosts.Controllers()
 	if err := p.parallelDo(ctx, controllers, p.investigateK0s); err != nil {
 		return err
 	}
@@ -86,7 +86,7 @@ func (p *GatherK0sFacts) Run(ctx context.Context) error {
 		return err
 	}
 
-	var workers cluster.Hosts = p.hosts.Workers()
+	workers := p.hosts.Workers()
 	if err := p.parallelDo(ctx, workers, p.investigateK0s); err != nil {
 		return err
 	}

phase/get_kubeconfig_test.go

@@ -56,7 +56,7 @@ func TestGetKubeconfig(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, "https://10.0.0.1:6443", conf.Clusters["k0s"].Server)
 
-	cfg.Spec.Hosts[0].Connection.SSH.Address = "abcd:efgh:ijkl:mnop"
+	cfg.Spec.Hosts[0].SSH.Address = "abcd:efgh:ijkl:mnop"
 	p.APIAddress = ""
 	require.NoError(t, p.Run(context.Background()))
 	conf, err = clientcmd.Load([]byte(cfg.Metadata.Kubeconfig))

phase/lock.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	gos "os"
 	"sync"
 	"time"
 
@@ -31,7 +30,7 @@ func (p *Lock) Prepare(c *v1beta1.Cluster) error {
 	if err != nil {
 		hn = "unknown"
 	}
-	p.instanceID = fmt.Sprintf("%s-%d", hn, gos.Getpid())
+	p.instanceID = fmt.Sprintf("%s-%d", hn, os.Getpid())
 	return nil
 }
 

phase/manager.go

@@ -95,21 +95,19 @@ type withmanager interface {
 }
 
 type withDryRun interface {
-    DryRun() error
+	DryRun() error
 }
 
 // In-phase hooks for phases to run logic immediately before/after Run().
 // These are strictly internal hooks for phases themselves and are separate
 // from user-configured lifecycle hooks handled by the RunHooks phase.
 type withBefore interface {
-    Before() error
+	Before() error
 }
 type withAfter interface {
-    After() error
+	After() error
 }
 
-
-
 // Manager executes phases to construct the cluster
 type Manager struct {
 	phases            Phases
@@ -247,14 +245,14 @@ func (m *Manager) Run(ctx context.Context) error {
 			}
 		}
 
-        // Run in-phase before hook if implemented.
-        if bp, ok := p.(withBefore); ok {
-            log.Debugf("running before for phase '%s'", p.Title())
-            if err := bp.Before(); err != nil {
-                log.Debugf("before failed '%s'", err.Error())
-                return err
-            }
-        }
+		// Run in-phase before hook if implemented.
+		if bp, ok := p.(withBefore); ok {
+			log.Debugf("running before for phase '%s'", p.Title())
+			if err := bp.Before(); err != nil {
+				log.Debugf("before failed '%s'", err.Error())
+				return err
+			}
+		}
 
 		text := Colorize.Green("==> Running phase: %s").String()
 		log.Infof(text, title)
@@ -266,24 +264,24 @@ func (m *Manager) Run(ctx context.Context) error {
 			continue
 		}
 
-        result = p.Run(ctx)
-        ran = append(ran, p)
-
-        // Only run in-phase After hook if Run() succeeded.
-        // If After() fails after a successful Run(), return the After() error.
-        if result == nil {
-            if ap, ok := p.(withAfter); ok {
-                log.Debugf("running after for phase '%s'", p.Title())
-                if herr := ap.After(); herr != nil {
-                    return herr
-                }
-            }
-        }
-
-        if result != nil {
-            return result
-        }
-    }
+		result = p.Run(ctx)
+		ran = append(ran, p)
+
+		// Only run in-phase After hook if Run() succeeded.
+		// If After() fails after a successful Run(), return the After() error.
+		if result == nil {
+			if ap, ok := p.(withAfter); ok {
+				log.Debugf("running after for phase '%s'", p.Title())
+				if herr := ap.After(); herr != nil {
+					return herr
+				}
+			}
+		}
+
+		if result != nil {
+			return result
+		}
+	}
 
 	return nil
 }