feat(proxy): fix lint errors go1.22 (#116)

.github/workflows/ci-workflow.yml

@@ -7,35 +7,35 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v3
         with:
-          go-version: 1.21
-      - uses: actions/checkout@v4
+          go-version: 1.22
+      - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.54.2
+          version: v1.56.2
           args: --verbose
 
   test:
     strategy:
       matrix:
-        go-version: [1.21]
+        go-version: [1.22]
         platform: [ubuntu-latest, macos-latest]
 
     runs-on: ${{ matrix.platform }}
 
     steps:
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Install goveralls
         run: go install github.com/mattn/goveralls@latest
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - run: go test -v -coverprofile=coverage.out ./...
 

.vscode/tasks.json

@@ -16,8 +16,8 @@
               "--",
               "shrink",
               "/Users/plastikfan/dev/test/pics",
-              "--profile",
-              "blur",
+              "--scheme",
+              "blur-sf",
               "--files",
               "wonky*",
               "--dry-run",

go.mod

@@ -1,6 +1,6 @@
 module github.com/snivilised/pixa
 
-go 1.21
+go 1.22
 
 require (
 	github.com/charmbracelet/bubbletea v0.25.0

src/app/cfg/cfg-suite_test.go

@@ -3,11 +3,11 @@ package cfg_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
 )
 
 func TestCfg(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Cfg Suite")
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "Cfg Suite")
 }

src/app/cfg/config-runner_test.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive // foo
+	. "github.com/onsi/gomega"    //nolint:revive // foo
 	"github.com/spf13/viper"
 	"go.uber.org/mock/gomock"
 

src/app/command/bootstrap.go

@@ -128,7 +128,7 @@ func (b *Bootstrap) Root(options ...ConfigureOptionFn) *cobra.Command {
 			Short:   xi18n.Text(i18n.RootCmdShortDescTemplData{}),
 			Long:    xi18n.Text(i18n.RootCmdLongDescTemplData{}),
 			Version: fmt.Sprintf("'%v'", Version),
-			RunE: func(cmd *cobra.Command, args []string) error {
+			RunE: func(_ *cobra.Command, args []string) error {
 				inputs := b.getRootInputs()
 
 				if len(args) == 0 {

src/app/command/bootstrap_test.go

@@ -1,8 +1,8 @@
 package command_test
 
 import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive // foo
+	. "github.com/onsi/gomega"    //nolint:revive // foo
 	"github.com/snivilised/cobrass/src/assistant/configuration"
 	"github.com/snivilised/extendio/xfs/storage"
 	"github.com/snivilised/pixa/src/app/command"

src/app/command/command_suite_test.go

@@ -3,11 +3,11 @@ package command_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
 )
 
 func TestCommand(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Command Suite")
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "Command Suite")
 }

src/app/command/magick-cmd.go

@@ -36,7 +36,7 @@ func (b *Bootstrap) buildMagickCommand(container *assistant.CobraContainer) *cob
 
 				// optionally invoke cross field validation
 				//
-				if xv := ps.CrossValidate(func(ps *MagickParameterSet) error {
+				if xv := ps.CrossValidate(func(_ *MagickParameterSet) error {
 					return nil
 				}); xv == nil {
 					options := []string{}

src/app/command/magick-cmd_test.go

@@ -1,8 +1,8 @@
 package command_test
 
 import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive // foo
+	. "github.com/onsi/gomega"    //nolint:revive // foo
 
 	"github.com/snivilised/cobrass/src/assistant/configuration"
 	xi18n "github.com/snivilised/extendio/i18n"

src/app/command/root-cmd_test.go

@@ -3,8 +3,8 @@ package command_test
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive // foo
+	. "github.com/onsi/gomega"    //nolint:revive // foo
 
 	"github.com/snivilised/extendio/xfs/storage"
 	"github.com/snivilised/pixa/src/app/command"

src/app/command/shrink-cmd.go

@@ -97,7 +97,7 @@ func (b *Bootstrap) buildShrinkCommand(container *assistant.CobraContainer) *cob
 			if validationErr := shrinkPS.Validate(); validationErr == nil {
 				// optionally invoke cross field validation
 				//
-				if xvErr := shrinkPS.CrossValidate(func(ps *common.ShrinkParameterSet) error {
+				if xvErr := shrinkPS.CrossValidate(func(_ *common.ShrinkParameterSet) error {
 					// cross validation not currently required
 					//
 					return nil
@@ -171,14 +171,13 @@ func (b *Bootstrap) buildShrinkCommand(container *assistant.CobraContainer) *cob
 			xi18n.Text(i18n.ShrinkCmdOutputPathParamUsageTemplData{}),
 			defaultOutputPath,
 		),
-		&paramSet.Native.OutputPath, func(s string, f *pflag.Flag) error {
-			// Instead of doing the commented out check, check that the location
+		&paramSet.Native.OutputPath, func(_ string, _ *pflag.Flag) error {
+			// todo: Instead of doing the commented out check, check that the location
 			// specified has the correct permission to write
 			//
 			// if f.Changed && !b.Vfs.DirectoryExists(s) {
 			// 	return i18n.NewOutputPathDoesNotExistError(s)
 			// }
-
 			return nil
 		},
 	)
@@ -194,14 +193,13 @@ func (b *Bootstrap) buildShrinkCommand(container *assistant.CobraContainer) *cob
 			xi18n.Text(i18n.ShrinkCmdTrashPathParamUsageTemplData{}),
 			defaultTrashPath,
 		),
-		&paramSet.Native.TrashPath, func(s string, f *pflag.Flag) error {
-			// Instead of doing the commented out check, check that the location
+		&paramSet.Native.TrashPath, func(_ string, _ *pflag.Flag) error {
+			// todo: Instead of doing the commented out check, check that the location
 			// specified has the correct permission to write
 			//
 			// if f.Changed && !b.Vfs.DirectoryExists(s) {
 			// 	return i18n.NewOutputPathDoesNotExistError(s)
 			// }
-
 			return nil
 		},
 	)
@@ -258,6 +256,7 @@ func (b *Bootstrap) buildShrinkCommand(container *assistant.CobraContainer) *cob
 
 				return i18n.NewInvalidSamplingFactorError(value, acceptableSet)
 			}
+
 			return nil
 		},
 	)

src/app/command/shrink-cmd_test.go

@@ -3,8 +3,8 @@ package command_test
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive // foo
+	. "github.com/onsi/gomega"    //nolint:revive // foo
 	"github.com/snivilised/cobrass/src/assistant/configuration"
 	"github.com/snivilised/pixa/src/app/cfg"
 	"github.com/snivilised/pixa/src/app/command"

src/app/proxy/enter-root.go

@@ -76,7 +76,7 @@ func (e *RootEntry) run() (*nav.TraverseResult, error) {
 	//
 	var nilResumption *nav.Resumption
 
-	after := func(result *nav.TraverseResult, _ error) {
+	after := func(_ *nav.TraverseResult, _ error) {
 		for _, file := range e.files {
 			e.Log.Info("📒 candidate file: '%v'",
 				slog.String("file", file),

src/app/proxy/enter-shrink.go

@@ -143,7 +143,7 @@ func (e *ShrinkEntry) run() (result *nav.TraverseResult, err error) {
 		// the user can select.
 		//
 		RestorePath: "/json-path-to-come-from-a-flag-option/restore.json",
-		Restorer: func(o *nav.TraverseOptions, active *nav.ActiveState) {
+		Restorer: func(o *nav.TraverseOptions, _ *nav.ActiveState) {
 			o.Callback = &nav.LabelledTraverseCallback{
 				Label: "Resume Shrink Entry Callback",
 				Fn:    e.resumeFn,

src/app/proxy/entry-base.go

@@ -54,7 +54,7 @@ func (e *EntryBase) ConfigureOptions(o *nav.TraverseOptions) {
 		trash := statics.TrashTag()
 		sample := fmt.Sprintf("$%v$", statics.Sample) // PathFinder.FileSupplement
 
-		return lo.Filter(contents, func(item fs.DirEntry, index int) bool {
+		return lo.Filter(contents, func(item fs.DirEntry, _ int) bool {
 			name := item.Name()
 
 			return !strings.HasPrefix(name, ".") &&

src/app/proxy/filing/file-manager.go

@@ -65,8 +65,9 @@ func (fm *FileManager) Create(path string, overwrite bool) error {
 func (fm *FileManager) Setup(pi *common.PathInfo) (destination string, err error) {
 	if !fm.finder.TransparentInput() {
 		// Any result file must not clash with the input file, so the input
-		// file must stay in place.
-		// todo: if --trash is specified, then the input must be moved there
+		// file can stay in place.
+		// todo: if --trash is specified, then the input must be moved there, escape
+		// out of this condition so that Transfer can be invoked (pi.Trash != "")
 		//
 		return pi.Item.Path, nil
 	}

src/app/proxy/filing/filing_suite_test.go

@@ -3,8 +3,8 @@ package filing_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:revive // foo
+	. "github.com/onsi/gomega"    //nolint:revive // foo
 )
 
 func TestFiling(t *testing.T) {