Merge pull request #4181 from droot/update-deps

Update deps

Author: justinsb

.github/workflows/checkLicenses.yml

@@ -28,7 +28,7 @@ jobs:
       - run: |
           ./scripts/create-licenses.sh
       # Upload the licenses list so it's available if needed
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: Licenses
           path: LICENSES.txt

.golangci.yml

@@ -2,17 +2,13 @@
 
 run:
   deadline: 5m
-  skip-dirs:
-    thirdparty/
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
-    - depguard
     - dogsled
     - dupl
     - errcheck
@@ -33,19 +29,19 @@ linters:
     - misspell
     - nakedret
     - staticcheck
-    - structcheck
     - stylecheck
     - revive
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
 
 issues:
   exclude:
      - Using the variable on range scope `tc` in function literal
+  exclude-dirs:
+    - thirdparty/
 
 linters-settings:
   dupl:

Makefile

@@ -59,7 +59,7 @@ install-kind:
 
 .PHONY: install-golangci-lint
 install-golangci-lint:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.1
 
 .PHONY: install-go-licenses
 install-go-licenses:

commands/alpha/alphacmd.go

@@ -32,7 +32,7 @@ func GetCommand(ctx context.Context, _, version string) *cobra.Command {
 		Use:   "alpha",
 		Short: alphadocs.AlphaShort,
 		Long:  alphadocs.AlphaLong,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			h, err := cmd.Flags().GetBool("help")
 			if err != nil {
 				return err

commands/alpha/license/command.go

@@ -27,7 +27,7 @@ func NewCommand(ctx context.Context, _ string) *cobra.Command {
 		Use:   "license",
 		Short: "[Alpha] " + licensedocs.LicenseShort,
 		Long:  "[Alpha] " + licensedocs.LicenseShort + "\n" + licensedocs.LicenseLong,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			h, err := cmd.Flags().GetBool("help")
 			if err != nil {
 				return err

commands/alpha/rollouts/rolloutscmd.go

@@ -29,7 +29,7 @@ func NewCommand(ctx context.Context, version string) *cobra.Command {
 		Use:   "rollouts",
 		Short: "rollouts",
 		Long:  "rollouts",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			h, err := cmd.Flags().GetBool("help")
 			if err != nil {
 				return err

commands/fn/doc/cmdfndoc.go

@@ -43,7 +43,7 @@ func NewRunner(ctx context.Context, parent string) *Runner {
 	}
 	r.Command = c
 	c.Flags().StringVarP(&r.Image, "image", "i", "", "kpt function image name")
-	_ = r.Command.RegisterFlagCompletionFunc("image", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	_ = r.Command.RegisterFlagCompletionFunc("image", func(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 		return cmdutil.SuggestFunctions(cmd), cobra.ShellCompDirectiveDefault
 	})
 	cmdutil.FixDocs("kpt", parent, c)

commands/fn/fncmd.go

@@ -32,7 +32,7 @@ func GetCommand(ctx context.Context, name string) *cobra.Command {
 		Short:   fndocs.FnShort,
 		Long:    fndocs.FnLong,
 		Aliases: []string{"functions"},
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			h, err := cmd.Flags().GetBool("help")
 			if err != nil {
 				return err

commands/fn/render/cmdrender.go

@@ -53,7 +53,7 @@ func NewRunner(ctx context.Context, parent string) *Runner {
 
 	c.Flags().Var(&r.RunnerOptions.ImagePullPolicy, "image-pull-policy",
 		"pull image before running the container "+r.RunnerOptions.ImagePullPolicy.HelpAllowedValues())
-	_ = c.RegisterFlagCompletionFunc("image-pull-policy", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	_ = c.RegisterFlagCompletionFunc("image-pull-policy", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 		return r.RunnerOptions.ImagePullPolicy.AllStrings(), cobra.ShellCompDirectiveDefault
 	})
 

commands/fn/render/cmdrender_test.go

@@ -44,4 +44,4 @@ func TestCmd_flagAndArgParsing_Symlink(t *testing.T) {
 }
 
 // NoOpRunE is a noop function to replace the run function of a command.  Useful for testing argument parsing.
-var NoOpRunE = func(cmd *cobra.Command, args []string) error { return nil }
+var NoOpRunE = func(_ *cobra.Command, _ []string) error { return nil }