style: fix golangci-lint warnings across codebase

Author: m7medVision

.golangci.yml

@@ -1,8 +1,8 @@
+version: 2
+
 linters:
   enable:
-    - gofumpt
     - thelper
-    - goimports
     - tparallel
     - wastedassign
     - unparam

lazypodman.exe

@@ -11,10 +11,10 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/go-errors/errors"
 	"github.com/integrii/flaggy"
+	"github.com/jesseduffield/yaml"
 	"github.com/m7medVision/lazypodman/pkg/app"
 	"github.com/m7medVision/lazypodman/pkg/config"
 	"github.com/m7medVision/lazypodman/pkg/utils"
-	"github.com/jesseduffield/yaml"
 	"github.com/samber/lo"
 )
 
@@ -82,7 +82,9 @@ func main() {
 	if err == nil {
 		err = app.Run()
 	}
-	app.Close()
+	if closeErr := app.Close(); closeErr != nil && err == nil {
+		err = closeErr
+	}
 
 	if err != nil {
 		if errMessage, known := app.KnownError(err); known {

main.go

@@ -39,7 +39,7 @@ func generateAtDir(dir string) {
 	}
 
 	for lang := range i18n.GetTranslationSets() {
-		os.Setenv("LC_ALL", lang)
+		_ = os.Setenv("LC_ALL", lang)
 		mApp, _ := app.NewApp(mConfig)
 		mApp.Gui.SetupFakeGui()
 

pkg/cheatsheet/generate.go

@@ -20,7 +20,7 @@ func Check() {
 	if err != nil {
 		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
 	}
-	defer os.RemoveAll(tmpDir)
+	defer func() { _ = os.RemoveAll(tmpDir) }()
 
 	if err = os.Mkdir(tmpDir, 0o700); err != nil {
 		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)

pkg/cheatsheet/validate.go

@@ -179,7 +179,7 @@ func NewDockerCommand(log *logrus.Entry, osCommand *OSCommand, tr *i18n.Translat
 	//       `SSHHandler.HandleSSHDockerHost()` to create a local unix socket tunneled
 	//       over SSH to the specified ssh host.
 	if strings.HasPrefix(dockerHost, "ssh://") {
-		os.Setenv(dockerHostEnvKey, dockerHost)
+		_ = os.Setenv(dockerHostEnvKey, dockerHost)
 	}
 
 	tunnelCloser, err := ssh.NewSSHHandler(osCommand).HandleSSHDockerHost()
@@ -253,7 +253,7 @@ func (c *DockerCommand) CreateClientStatMonitor(container *Container) {
 		return
 	}
 
-	defer stream.Body.Close()
+	defer func() { _ = stream.Body.Close() }()
 
 	scanner := bufio.NewScanner(stream.Body)
 	for scanner.Scan() {

pkg/commands/docker.go

@@ -12,11 +12,11 @@ func TestResolveDefaultDockerHostPrefersExistingPodmanSocket(t *testing.T) {
 	originalRuntimeDir := os.Getenv("XDG_RUNTIME_DIR")
 	originalStat := osStat
 	defer func() {
-		os.Setenv("XDG_RUNTIME_DIR", originalRuntimeDir)
+		_ = os.Setenv("XDG_RUNTIME_DIR", originalRuntimeDir)
 		osStat = originalStat
 	}()
 
-	os.Setenv("XDG_RUNTIME_DIR", "/tmp/test-runtime")
+	_ = os.Setenv("XDG_RUNTIME_DIR", "/tmp/test-runtime")
 	expectedPath := filepath.Join("/tmp/test-runtime", "podman", "podman.sock")
 	osStat = func(name string) (os.FileInfo, error) {
 		if name == expectedPath {
@@ -34,11 +34,11 @@ func TestResolveDefaultDockerHostFallsBackToRootfulPodmanSocket(t *testing.T) {
 	originalRuntimeDir := os.Getenv("XDG_RUNTIME_DIR")
 	originalStat := osStat
 	defer func() {
-		os.Setenv("XDG_RUNTIME_DIR", originalRuntimeDir)
+		_ = os.Setenv("XDG_RUNTIME_DIR", originalRuntimeDir)
 		osStat = originalStat
 	}()
 
-	os.Unsetenv("XDG_RUNTIME_DIR")
+	_ = os.Unsetenv("XDG_RUNTIME_DIR")
 	osStat = func(name string) (os.FileInfo, error) {
 		return nil, os.ErrNotExist
 	}

pkg/commands/docker_host_unix_test.go

@@ -22,15 +22,13 @@ func TestNewDockerClientVersionNegotiation(t *testing.T) {
 	originalAPIVersion := os.Getenv("DOCKER_API_VERSION")
 	defer func() {
 		if originalAPIVersion == "" {
-			os.Unsetenv("DOCKER_API_VERSION")
+			_ = os.Unsetenv("DOCKER_API_VERSION")
 		} else {
-			os.Setenv("DOCKER_API_VERSION", originalAPIVersion)
+			_ = os.Setenv("DOCKER_API_VERSION", originalAPIVersion)
 		}
 	}()
 
-	// Set DOCKER_API_VERSION to an old version that would cause
-	// "client version 1.25 is too old" errors if negotiation is disabled
-	os.Setenv("DOCKER_API_VERSION", "1.25")
+	_ = os.Setenv("DOCKER_API_VERSION", "1.25")
 
 	t.Run("FromEnv locks version preventing negotiation", func(t *testing.T) {
 		// This demonstrates the problematic behavior we're avoiding.
@@ -41,7 +39,7 @@ func TestNewDockerClientVersionNegotiation(t *testing.T) {
 			client.WithAPIVersionNegotiation(),
 		)
 		assert.NoError(t, err)
-		defer cli.Close()
+		defer func() { _ = cli.Close() }()
 
 		// Version is locked to the env var value
 		assert.Equal(t, "1.25", cli.ClientVersion())
@@ -53,7 +51,7 @@ func TestNewDockerClientVersionNegotiation(t *testing.T) {
 		// (unix socket on Linux/macOS, named pipe on Windows).
 		cli, err := newDockerClient(client.DefaultDockerHost)
 		assert.NoError(t, err)
-		defer cli.Close()
+		defer func() { _ = cli.Close() }()
 
 		// Version is NOT locked to the env var value (1.25).
 		// Instead, it uses the library's default version and will negotiate

pkg/commands/docker_test.go

@@ -57,7 +57,7 @@ func getHistoryResponseItemDisplayStrings(layer image.HistoryResponseItem) []str
 		createdBy = utils.ColoredString(split[0], color.FgYellow) + " " + strings.Join(split[1:], " ")
 	}
 
-	createdBy = strings.Replace(createdBy, "\t", " ", -1)
+	createdBy = strings.ReplaceAll(createdBy, "\t", " ")
 
 	size := utils.FormatBinaryBytes(int(layer.Size))
 	sizeColor := color.FgWhite
@@ -84,7 +84,8 @@ func (i *Image) RenderHistory() (string, error) {
 		return getHistoryResponseItemDisplayStrings(layer)
 	})
 
-	headers := [][]string{{"ID", "TAG", "SIZE", "COMMAND"}}
+	headers := make([][]string, 1, 1+len(tableBody))
+	headers[0] = []string{"ID", "TAG", "SIZE", "COMMAND"}
 	table := append(headers, tableBody...)
 
 	return utils.RenderTable(table)

pkg/commands/image.go

@@ -220,7 +220,7 @@ func (c *OSCommand) Quote(message string) string {
 // Unquote removes wrapping quotations marks if they are present
 // this is needed for removing quotes from staged filenames with spaces
 func (c *OSCommand) Unquote(message string) string {
-	return strings.Replace(message, `"`, "", -1)
+	return strings.ReplaceAll(message, `"`, "")
 }
 
 // AppendLineToFile adds a new line in file
@@ -229,7 +229,7 @@ func (c *OSCommand) AppendLineToFile(filename, line string) error {
 	if err != nil {
 		return WrapError(err)
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 
 	_, err = f.WriteString("\n" + line)
 	if err != nil {