Other linter warnings fixed

Author: cmaglie

internal/command/modify/modify.go

@@ -37,7 +37,6 @@ import (
 	"github.com/arduino/libraries-repository-engine/internal/libraries/archive"
 	"github.com/arduino/libraries-repository-engine/internal/libraries/db"
 	"github.com/arduino/libraries-repository-engine/internal/libraries/metadata"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

internal/command/remove/remove.go

@@ -37,7 +37,6 @@ import (
 	"github.com/arduino/libraries-repository-engine/internal/libraries/archive"
 	"github.com/arduino/libraries-repository-engine/internal/libraries/db"
 	"github.com/arduino/libraries-repository-engine/internal/libraries/metadata"
-
 	"github.com/spf13/cobra"
 )
 

internal/command/sync/sync.go

@@ -27,8 +27,8 @@ package sync
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -61,7 +61,7 @@ func Run(command *cobra.Command, cliArguments []string) {
 	}
 
 	if len(cliArguments) > 1 {
-		feedback.LogError(fmt.Errorf("Multiple arguments are not supported"))
+		feedback.LogError(errors.New("multiple arguments are not supported"))
 		os.Exit(1)
 	}
 
@@ -102,7 +102,7 @@ func syncLibraries(reposFile string) {
 				syncLibrary(logger, repo, libraryDb)
 
 				// Output log to file
-				if err := outputLogFile(logger, repo, buffer); err != nil {
+				if err := outputLogFile(repo, buffer); err != nil {
 					logger.Printf("Error writing log file: %s", err.Error())
 				}
 
@@ -200,13 +200,13 @@ func syncLibraryTaggedRelease(logger *log.Logger, repo *libraries.Repository, ta
 	// Checkout desired tag
 	logger.Printf("Checking out tag: %s", tag.Name().Short())
 	if err := gitutils.CheckoutTag(repo.Repository, tag); err != nil {
-		return fmt.Errorf("Error checking out repo: %s", err)
+		return fmt.Errorf("error checking out repo: %s", err)
 	}
 
 	// Create library metadata from library.properties
 	library, err := libraries.GenerateLibraryFromRepo(repo)
 	if err != nil {
-		return fmt.Errorf("Error generating library from repo: %s", err)
+		return fmt.Errorf("error generating library from repo: %s", err)
 	}
 	library.Types = repoMeta.Types
 
@@ -257,10 +257,10 @@ func syncLibraryTaggedRelease(logger *log.Logger, repo *libraries.Repository, ta
 
 	archiveData, err := archive.New(repo, library, config)
 	if err != nil {
-		return fmt.Errorf("Error while configuring library release archive: %s", err)
+		return fmt.Errorf("error while configuring library release archive: %s", err)
 	}
 	if err := archiveData.Create(); err != nil {
-		return fmt.Errorf("Error while zipping library: %s", err)
+		return fmt.Errorf("error while zipping library: %s", err)
 	}
 
 	release := db.FromLibraryToRelease(library)
@@ -271,13 +271,13 @@ func syncLibraryTaggedRelease(logger *log.Logger, repo *libraries.Repository, ta
 	release.Log = releaseLog
 
 	if err := libraries.UpdateLibrary(release, repo.URL, libraryDb); err != nil {
-		return fmt.Errorf("Error while updating library DB: %s", err)
+		return fmt.Errorf("error while updating library DB: %s", err)
 	}
 
 	return nil
 }
 
-func outputLogFile(logger *log.Logger, repoMetadata *libraries.Repo, buffer *bytes.Buffer) error {
+func outputLogFile(repoMetadata *libraries.Repo, buffer *bytes.Buffer) error {
 	if config.LogsFolder == "" {
 		return nil
 	}
@@ -294,7 +294,7 @@ func outputLogFile(logger *log.Logger, repoMetadata *libraries.Repo, buffer *byt
 	}
 	logFile := filepath.Join(logFolder, "index.html")
 	output := "<pre>\n" + buffer.String() + "\n</pre>"
-	if err := ioutil.WriteFile(logFile, []byte(output), 0644); err != nil {
+	if err := os.WriteFile(logFile, []byte(output), 0644); err != nil {
 		return fmt.Errorf("write log to file: %s", err.Error())
 	}
 	return nil

internal/libraries/git_integration_test.go

@@ -24,7 +24,6 @@
 package libraries_test
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -43,7 +42,7 @@ func TestUpdateLibraryJson(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, repos)
 
-	librariesRepo, err := ioutil.TempDir("", "libraries")
+	librariesRepo, err := os.MkdirTemp("", "libraries")
 	require.NoError(t, err)
 	defer os.RemoveAll(librariesRepo)
 

internal/libraries/zip/ziphelper.go

@@ -25,7 +25,6 @@ package zip
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -37,15 +36,12 @@ import (
 // Inside the archive "rootFolder" will be renamed to "zipRootFolderName".
 func Directory(rootFolder string, zipRootFolderName string, zipFile string) error {
 	checks := func(path string, info os.FileInfo, err error) error {
-		info, err = os.Lstat(path)
-		if err != nil {
+		if lstat, err := os.Lstat(path); err != nil { // TODO: is calling Lstat here necessary? we already have the FileInfo from the function args
 			return err
-		}
-		if (info.Mode() & os.ModeSymlink) != 0 {
+		} else if (lstat.Mode() & os.ModeSymlink) != 0 {
 			dest, _ := os.Readlink(path)
-			return fmt.Errorf("Symlink not allowed: %s -> %s", path, dest)
-		}
-		if file.IsSCCS(info.Name()) {
+			return fmt.Errorf("symlink not allowed: %s -> %s", path, dest)
+		} else if file.IsSCCS(lstat.Name()) {
 			return filepath.SkipDir
 		}
 		return nil
@@ -60,7 +56,7 @@ func Directory(rootFolder string, zipRootFolderName string, zipFile string) erro
 		return err
 	}
 
-	tmpdir, err := ioutil.TempDir("", "ziphelper")
+	tmpdir, err := os.MkdirTemp("", "ziphelper")
 	if err != nil {
 		return fmt.Errorf("creating temp dir for zip archive: %s", err)
 	}

internal/libraries/zip/ziphelper_test.go

@@ -25,15 +25,14 @@ package zip
 
 import (
 	"archive/zip"
-	"io/ioutil"
 	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
 func TestZip(t *testing.T) {
-	zipFile, err := ioutil.TempFile("", "ziphelper*.zip")
+	zipFile, err := os.CreateTemp("", "ziphelper*.zip")
 	require.NoError(t, err)
 	require.NotNil(t, zipFile)
 	zipFileName := zipFile.Name()