Merge pull request #519 from gphotosuploader/update-golangci

Update golangci

Author: pacoorozco

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ on:
 
 env:
     # it should match the version in the Makefile file.
-    GOLANGCI_LINT_VERSION: 'v1.64.5'
+    GOLANGCI_LINT_VERSION: 'v2.1.6'
 
 jobs:
   golangci:
@@ -24,6 +24,6 @@ jobs:
         with:
             go-version: 'stable'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
             version: ${{ env.GOLANGCI_LINT_VERSION }}

CHANGELOG.md

@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## 5.0.2
+### Changed
+- Bump `github.com/spf13/afero` to v1.14.0
+- Bump `github.com/gphotosuploader/google-photos-api-client-go/v3` to v3.0.8
+- Bump `github.com/hjson/hjson-go/v4` to v4.5.0
+- Bump `github.com/int128/oauth2cli` to v1.17.0
+- Bump `golang.org/x/oauth2` to v0.30.0
+- Bump `golang.org/x/sync` to v0.14.0
+- Bump `golang.org/x/term` to v0.32.0
+- Bump `golang.org/x/text` to v0.25.0
+- [CI] Bump `golangci-lint` to v2.1.6
+
 ## 5.0.1
 ### Added
 - Support for go v1.24

Makefile

@@ -18,7 +18,7 @@ TMP_DIR ?= .tmp
 COVERAGE_FILE := $(TMP_DIR)/coverage.txt
 COVERAGE_HTML_FILE := $(TMP_DIR)/coverage.html
 GOLANGCI := $(TMP_DIR)/golangci-lint
-GOLANGCI_VERSION := 1.64.5
+GOLANGCI_VERSION := 2.1.6
 
 # set how to open files based on OS and ARCH.
 UNAME_OS := $(shell uname -s)

internal/cli/list/list_albums.go

@@ -107,7 +107,7 @@ func (o *ListAlbumsCommandOptions) Run(cobraCmd *cobra.Command, args []string) e
 
 func (o *ListAlbumsCommandOptions) printAlbumsList(a []albums.Album, writer io.Writer) {
 	if len(a) == 0 {
-		fmt.Fprintln(writer, "No albums were found!")
+		fmt.Fprintln(writer, "No albums were found!") //nolint:errcheck
 		return
 	}
 
@@ -118,16 +118,16 @@ func (o *ListAlbumsCommandOptions) printAsTable(a []albums.Album, writer io.Writ
 	w := tabwriter.NewWriter(writer, 0, 0, 1, ' ', 0)
 
 	if !o.NoHeaders {
-		fmt.Fprintln(w, "TITLE\t ITEMS\t ID\t")
+		fmt.Fprintln(w, "TITLE\t ITEMS\t ID\t") //nolint:errcheck
 	}
 
 	for _, album := range a {
-		fmt.Fprintf(w, "%s\t %d\t %s\t\n", album.Title, album.TotalMediaItems, album.ID)
+		fmt.Fprintf(w, "%s\t %d\t %s\t\n", album.Title, album.TotalMediaItems, album.ID) //nolint:errcheck
 	}
 
 	if !o.NoHeaders {
-		fmt.Fprintf(w, "Total: %d albums.\n", len(a))
+		fmt.Fprintf(w, "Total: %d albums.\n", len(a)) //nolint:errcheck
 	}
 
-	w.Flush()
+	w.Flush() //nolint:errcheck
 }

internal/cli/list/list_media.go

@@ -118,11 +118,11 @@ func (o *ListMediaItemsCommandOptions) Run(cobraCmd *cobra.Command, args []strin
 
 func (o *ListMediaItemsCommandOptions) printMediaItemsList(mi []media_items.MediaItem, writer io.Writer) {
 	if o.AlbumID != "" {
-		fmt.Fprintf(writer, "Listing media items for album ID: %s\n", o.AlbumID)
+		fmt.Fprintf(writer, "Listing media items for album ID: %s\n", o.AlbumID) //nolint:errcheck
 	}
 
 	if len(mi) == 0 {
-		fmt.Fprintln(writer, "No media items were found!")
+		fmt.Fprintln(writer, "No media items were found!") //nolint:errcheck
 		return
 	}
 
@@ -133,16 +133,16 @@ func (o *ListMediaItemsCommandOptions) printAsTable(mi []media_items.MediaItem,
 	w := tabwriter.NewWriter(writer, 0, 0, 1, ' ', 0)
 
 	if !o.NoHeaders {
-		fmt.Fprintln(w, "FILENAME\t MIME-TYPE\t ID\t")
+		fmt.Fprintln(w, "FILENAME\t MIME-TYPE\t ID\t") //nolint:errcheck
 	}
 
 	for _, mediaItem := range mi {
-		fmt.Fprintf(w, "%s\t %s\t %s\t\n", mediaItem.Filename, mediaItem.MimeType, mediaItem.ID)
+		fmt.Fprintf(w, "%s\t %s\t %s\t\n", mediaItem.Filename, mediaItem.MimeType, mediaItem.ID) //nolint:errcheck
 	}
 
 	if !o.NoHeaders {
-		fmt.Fprintf(w, "Total: %d media items.\n", len(mi))
+		fmt.Fprintf(w, "Total: %d media items.\n", len(mi)) //nolint:errcheck
 	}
 
-	w.Flush()
+	w.Flush() //nolint:errcheck
 }

internal/datastore/tokenmanager/tokenmanager_test.go

@@ -130,7 +130,7 @@ func equalTokens(want, in oauth2.Token) bool {
 	if want.AccessToken == in.AccessToken &&
 		want.RefreshToken == in.RefreshToken &&
 		want.TokenType == in.TokenType &&
-		want.Expiry == in.Expiry {
+		want.Expiry.Equal(in.Expiry) {
 		return true
 	}
 	return false

internal/datastore/upload_tracker/leveldb_test.go

@@ -54,7 +54,7 @@ func TestLevelDBStore_GetSet(t *testing.T) {
 
 		got, found := store.Get("fooKey")
 
-		if !found || "fooValue" != got {
+		if !found || got != "fooValue" {
 			t.Errorf("want: %s, got: %s", "fooValue", got)
 		}
 	})

internal/feedback/feedback.go

@@ -64,12 +64,12 @@ func Printf(format string, v ...interface{}) {
 
 // Print behaves like fmt.Print but writes on the out writer and adds a newline.
 func Print(v string) {
-	fmt.Fprintln(feedbackOut, v)
+	fmt.Fprintln(feedbackOut, v) //nolint:errcheck
 }
 
 // Warning outputs a warning message.
 func Warning(msg string) {
-	fmt.Fprintln(feedbackErr, msg)
+	fmt.Fprintln(feedbackErr, msg) //nolint:errcheck
 	logrus.Warning(msg)
 }
 
@@ -86,7 +86,7 @@ func FatalResult(res ErrorResult, exitCode ExitCode) {
 
 // Fatal outputs the errorMsg and exits with status exitCode.
 func Fatal(errorMsg string, exitCode ExitCode) {
-	fmt.Fprintln(stdErr, errorMsg)
+	fmt.Fprintln(stdErr, errorMsg) //nolint:errcheck
 	os.Exit(int(exitCode))
 }
 
@@ -99,9 +99,9 @@ func PrintResult(res Result) {
 		dataErr = resErr.ErrorString()
 	}
 	if data != "" {
-		fmt.Fprintln(stdOut, data)
+		fmt.Fprintln(stdOut, data) //nolint:errcheck
 	}
 	if dataErr != "" {
-		fmt.Fprintln(stdErr, dataErr)
+		fmt.Fprintln(stdErr, dataErr) //nolint:errcheck
 	}
 }

internal/feedback/terminal.go

@@ -30,13 +30,13 @@ func InputUserField(prompt string, secret bool) (string, error) {
 
 // printPrompt prints the prompt to the user.
 func printPrompt(prompt string) {
-	fmt.Fprintf(stdOut, "%s: ", prompt)
+	fmt.Fprintf(stdOut, "%s: ", prompt) //nolint:errcheck
 }
 
 // readPassword reads and returns a password from the user.
 func readPassword() (string, error) {
 	value, err := term.ReadPassword(int(os.Stdin.Fd()))
-	fmt.Fprintln(stdOut)
+	fmt.Fprintln(stdOut) //nolint:errcheck
 	return string(value), err
 }
 

internal/upload/album.go

@@ -219,7 +219,7 @@ func handleQuotesParsing(preFix, template, functionName string) (string, int, er
 	}
 
 	if strings.TrimSpace(postFix) != "" || strings.TrimSpace(preFix) != "" {
-		return "", 0, fmt.Errorf("Can't mix quoted & unquoted content in function arg: %s", functionName)
+		return "", 0, fmt.Errorf("can't mix quoted & unquoted content in function arg: %s", functionName)
 	}
 
 	return output, length + 1, nil