fixed linter warnings

.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:

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 }

commands/live/migrate/migratecmd.go

@@ -86,7 +86,7 @@ func NewRunner(
 		Short:   livedocs.MigrateShort,
 		Long:    livedocs.MigrateShort + "\n" + livedocs.MigrateLong,
 		Example: livedocs.MigrateExamples,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, args []string) error {
 			if len(args) == 0 {
 				// default to current working directory
 				args = append(args, ".")

commands/live/migrate/migratecmd_test.go

@@ -168,7 +168,7 @@ func TestKptMigrate_migrateKptfileToRG(t *testing.T) {
 			migrateRunner := NewRunner(ctx, tf, cmLoader, ioStreams)
 			migrateRunner.dryRun = tc.dryRun
 			migrateRunner.rgFile = tc.rgFilename
-			migrateRunner.cmInvClientFunc = func(factory util.Factory) (inventory.Client, error) {
+			migrateRunner.cmInvClientFunc = func(_ util.Factory) (inventory.Client, error) {
 				return inventory.NewFakeClient([]object.ObjMetadata{}), nil
 			}
 			err = migrateRunner.migrateKptfileToRG([]string{dir})
@@ -242,7 +242,7 @@ func TestKptMigrate_retrieveConfigMapInv(t *testing.T) {
 			// Create MigrateRunner and call "retrieveConfigMapInv"
 			cmLoader := manifestreader.NewManifestLoader(tf)
 			migrateRunner := NewRunner(ctx, tf, cmLoader, ioStreams)
-			migrateRunner.cmInvClientFunc = func(factory util.Factory) (inventory.Client, error) {
+			migrateRunner.cmInvClientFunc = func(_ util.Factory) (inventory.Client, error) {
 				return inventory.NewFakeClient([]object.ObjMetadata{}), nil
 			}
 			actual, err := migrateRunner.retrieveConfigMapInv(strings.NewReader(tc.configMap), []string{"-"})

commands/live/status/cmdstatus_test.go

@@ -265,7 +265,7 @@ foo/deployment.apps/default/foo is InProgress: inProgress
 			invFactory := inventory.FakeClientFactory(tc.inventory)
 			loader := NewFakeLoader(ctx, tf, tc.inventory)
 			runner := NewRunner(ctx, tf, invFactory, loader)
-			runner.PollerFactoryFunc = func(c cmdutil.Factory) (poller.Poller, error) {
+			runner.PollerFactoryFunc = func(_ cmdutil.Factory) (poller.Poller, error) {
 				return &fakePoller{tc.events}, nil
 			}
 

commands/pkg/diff/cmddiff_test.go

@@ -91,4 +91,4 @@ func TestCmd_flagAndArgParsing_Symlink(t *testing.T) {
 	assert.Equal(t, filepath.Join(cwd, "path", "to", "pkg", "dir"), r.Path)
 }
 
-var NoOpRunE = func(cmd *cobra.Command, args []string) error { return nil }
+var NoOpRunE = func(_ *cobra.Command, _ []string) error { return nil }

commands/pkg/get/cmdget.go

@@ -55,7 +55,7 @@ func NewRunner(ctx context.Context, parent string) *Runner {
 			strings.Join(kptfilev1.UpdateStrategiesAsStrings(), ","))
 	c.Flags().BoolVar(&r.isDeploymentInstance, "for-deployment", false,
 		"(Experimental) indicates if this package will be deployed to a cluster.")
-	_ = c.RegisterFlagCompletionFunc("strategy", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	_ = c.RegisterFlagCompletionFunc("strategy", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 		return kptfilev1.UpdateStrategiesAsStrings(), cobra.ShellCompDirectiveDefault
 	})
 	return r

commands/pkg/get/cmdget_test.go

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// revive:disable:unused-parameter
+
 package get_test
 
 import (
@@ -169,7 +171,7 @@ func TestCmd_fail(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 }
 
 // NoOpFailRunE causes the test to fail if run is called.  Useful for validating run isn't called for
 // errors.
@@ -205,26 +207,26 @@ func TestCmd_Execute_flagAndArgParsing(t *testing.T) {
 		validations func(repo, dir string, r *get.Runner, err error)
 	}{
 		"must have at least 1 arg": {
-			argsFunc: func(repo, _ string) []string {
+			argsFunc: func(_, _ string) []string {
 				return []string{}
 			},
 			runE: failRun,
-			validations: func(_, _ string, r *get.Runner, err error) {
+			validations: func(_, _ string, _ *get.Runner, err error) {
 				assert.EqualError(t, err, "requires at least 1 arg(s), only received 0")
 			},
 		},
 		"must provide unambiguous repo, dir and version": {
-			argsFunc: func(repo, _ string) []string {
+			argsFunc: func(_, _ string) []string {
 				return []string{"foo", "bar", "baz"}
 			},
 			runE: failRun,
-			validations: func(_, _ string, r *get.Runner, err error) {
+			validations: func(_, _ string, _ *get.Runner, err error) {
 				assert.Error(t, err)
 				assert.Contains(t, err.Error(), "ambiguous repo/dir@version specify '.git' in argument")
 			},
 		},
 		"repo arg is split up correctly into ref and repo": {
-			argsFunc: func(repo, _ string) []string {
+			argsFunc: func(_, _ string) []string {
 				return []string{"something://foo.git/@master", "./"}
 			},
 			runE: NoOpRunE,

commands/pkg/pkgcmd.go

@@ -32,7 +32,7 @@ func GetCommand(ctx context.Context, name string) *cobra.Command {
 		Short:   pkgdocs.PkgShort,
 		Long:    pkgdocs.PkgLong,
 		Aliases: []string{"package"},
-		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/pkg/update/cmdupdate.go

@@ -54,7 +54,7 @@ func NewRunner(ctx context.Context, parent string) *Runner {
 		"the update strategy that will be used when updating the package. This will change "+
 			"the default strategy for the package -- must be one of: "+
 			strings.Join(kptfilev1.UpdateStrategiesAsStrings(), ","))
-	_ = c.RegisterFlagCompletionFunc("strategy", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	_ = c.RegisterFlagCompletionFunc("strategy", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 		return kptfilev1.UpdateStrategiesAsStrings(), cobra.ShellCompDirectiveDefault
 	})
 	cmdutil.FixDocs("kpt", parent, c)

commands/pkg/update/cmdupdate_test.go

@@ -278,7 +278,7 @@ func TestCmd_onlyVersionAsInput(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 }
 
 // NoOpFailRunE causes the test to fail if run is called.  Useful for validating run isn't called for
 // errors.
@@ -429,7 +429,7 @@ func TestCmd_path(t *testing.T) {
 			defer testutil.Chdir(t, test.currentWD)()
 
 			r := update.NewRunner(fake.CtxWithDefaultPrinter(), "kpt")
-			r.Command.RunE = func(cmd *cobra.Command, args []string) error {
+			r.Command.RunE = func(_ *cobra.Command, _ []string) error {
 				if !assert.Equal(t, test.expectedFullPackagePath, r.Update.Pkg.UniquePath.String()) {
 					t.FailNow()
 				}

internal/alpha/printers/table/printer.go

@@ -212,7 +212,7 @@ func getProgress(resInfo *resourceInfo) (string, string, error) {
 
 		color, setColor := printcommon.ColorForStatus(rs.Status)
 		if setColor {
-			s = printcommon.SprintfWithColor(color, s)
+			s = printcommon.SprintfWithColor(color, "%s", s)
 		}
 
 		text = s
@@ -295,7 +295,7 @@ func getConditions(rs *pollingevent.ResourceStatus) []string {
 			}
 		}
 
-		s := printcommon.SprintfWithColor(color, text)
+		s := printcommon.SprintfWithColor(color, "%s", text)
 		conditionStrings = append(conditionStrings, s)
 	}
 	return conditionStrings

internal/errors/errors.go

@@ -192,7 +192,7 @@ func E(args ...interface{}) error {
 		case error:
 			e.Err = a
 		case string:
-			e.Err = fmt.Errorf(a)
+			e.Err = fmt.Errorf("%s", a)
 		default:
 			panic(fmt.Errorf("unknown type %T for value %v in call to error.E", a, a))
 		}

internal/fnruntime/imagepullpolicy.go

@@ -53,7 +53,7 @@ func (e *ImagePullPolicy) Set(v string) error {
 			return nil
 		}
 	}
-	return fmt.Errorf("must must be one of " + strings.Join(e.AllStrings(), ", "))
+	return fmt.Errorf("must be one of: %s", strings.Join(e.AllStrings(), ", "))
 }
 
 func (e *ImagePullPolicy) AllStrings() []string {

internal/fnruntime/utils.go

@@ -110,8 +110,8 @@ func presentIn(targetNode *yaml.RNode, input []*yaml.RNode) bool {
 	return false
 }
 
-// SetResourceIds adds kpt-resource-id annotation to each input resource
-func SetResourceIds(input []*yaml.RNode) error {
+// SetResourceIDs adds kpt-resource-id annotation to each input resource
+func SetResourceIDs(input []*yaml.RNode) error {
 	id := 0
 	for i := range input {
 		idStr := fmt.Sprintf("%v", id)
@@ -124,8 +124,8 @@ func SetResourceIds(input []*yaml.RNode) error {
 	return nil
 }
 
-// DeleteResourceIds removes the kpt-resource-id annotation from all resources
-func DeleteResourceIds(input []*yaml.RNode) error {
+// DeleteResourceIDs removes the kpt-resource-id annotation from all resources
+func DeleteResourceIDs(input []*yaml.RNode) error {
 	for i := range input {
 		err := input[i].PipeE(yaml.ClearAnnotation(ResourceIDAnnotation))
 		if err != nil {