Fix linter errors.

GoogleContainerTools · Nov 15, 2024 · 16a7495 · 16a7495
1 parent 883b481
commit 16a7495
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 20 deletions.
diff --git a/cmd/skaffold/app/cmd/inspect_config_dependencies.go b/cmd/skaffold/app/cmd/inspect_config_dependencies.go
@@ -43,7 +43,7 @@ func cmdConfigDependenciesAdd() *cobra.Command {
 		WithArgs(func(cmd *cobra.Command, args []string) error {
 			if len(args) != 1 {
 				errMsg := "`config-dependencies add` requires exactly one file path argument"
-				olog.Entry(context.TODO()).Errorf(errMsg)
+				olog.Entry(context.TODO()).Error(errMsg)
 				return errors.New(errMsg)
 			}
 			return nil

diff --git a/hack/versions/pkg/diff/godiff_test.go b/hack/versions/pkg/diff/godiff_test.go
@@ -248,7 +248,7 @@ type TestStructure struct {
 
 			t.CheckErrorAndDeepEqual(test.shouldErr, err, test.same, diff == "")
 			if test.same != (diff == "") {
-				t.Errorf(diff)
+				t.Error(diff)
 			}
 		})
 	}

diff --git a/integration/build_test.go b/integration/build_test.go
@@ -308,7 +308,7 @@ func setupGitRepo(t *testing.T, dir string) {
 		cmd := exec.Command("git", args...)
 		cmd.Dir = dir
 		if buf, err := util.RunCmdOut(context.Background(), cmd); err != nil {
-			t.Logf(string(buf))
+			t.Log(string(buf))
 			t.Fatal(err)
 		}
 	}

diff --git a/integration/skaffold/helper.go b/integration/skaffold/helper.go
@@ -317,7 +317,7 @@ func (b *RunBuilder) RunOrFailOutput(t *testing.T) []byte {
 	out, err := cmd.Output()
 	if err != nil {
 		if ee, ok := err.(*exec.ExitError); ok {
-			defer t.Errorf(string(ee.Stderr))
+			defer t.Error(string(ee.Stderr))
 		}
 		t.Fatalf("skaffold %s: %v, %s", b.command, err, out)
 	}
@@ -339,7 +339,7 @@ func (b *RunBuilder) RunWithStdoutAndStderrOrFail(t *testing.T, stdout, stderr i
 	err := cmd.Run()
 	if err != nil {
 		if ee, ok := err.(*exec.ExitError); ok {
-			defer t.Errorf(string(ee.Stderr))
+			defer t.Error(string(ee.Stderr))
 		}
 		t.Fatalf("skaffold %s: %v, %s", b.command, err, stderr)
 	}

diff --git a/pkg/skaffold/deploy/cloudrun/deploy_test.go b/pkg/skaffold/deploy/cloudrun/deploy_test.go
@@ -712,7 +712,7 @@ func TestCleanupMultipleResources(tOuter *testing.T) {
 			}
 			for key, val := range test.expectedPath {
 				if val > 0 {
-					t.Fatalf("Missing expected call for path " + key)
+					t.Fatalf("Missing expected call for path %s", key)
 				}
 			}
 		})

diff --git a/pkg/skaffold/filemon/changes.go b/pkg/skaffold/filemon/changes.go
@@ -117,13 +117,13 @@ func sortEvents(e Events) {
 }
 
 func logEvents(e Events) {
-	if e.Added != nil && len(e.Added) > 0 {
+	if len(e.Added) > 0 {
 		log.Entry(context.TODO()).Infof("files added: %v", e.Added)
 	}
-	if e.Modified != nil && len(e.Modified) > 0 {
+	if len(e.Modified) > 0 {
 		log.Entry(context.TODO()).Infof("files modified: %v", e.Modified)
 	}
-	if e.Deleted != nil && len(e.Deleted) > 0 {
+	if len(e.Deleted) > 0 {
 		log.Entry(context.TODO()).Infof("files deleted: %v", e.Deleted)
 	}
 }
diff --git a/pkg/skaffold/inspect/errors.go b/pkg/skaffold/inspect/errors.go
@@ -17,6 +17,7 @@ limitations under the License.
 package inspect
 
 import (
+	"errors"
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/errors"
@@ -31,7 +32,7 @@ func BuildEnvAlreadyExists(b BuildEnv, filename string, profile string) error {
 	} else {
 		msg = fmt.Sprintf("trying to create a %q build environment definition that already exists, in profile %q in file %s", b, profile, filename)
 	}
-	return sErrors.NewError(fmt.Errorf(msg),
+	return sErrors.NewError(errors.New(msg),
 		&proto.ActionableErr{
 			Message: msg,
 			ErrCode: proto.StatusCode_INSPECT_BUILD_ENV_ALREADY_EXISTS_ERR,

diff --git a/pkg/skaffold/lsp/handler.go b/pkg/skaffold/lsp/handler.go
@@ -100,7 +100,7 @@ func GetHandler(conn jsonrpc2.Conn, out io.Writer, opts config.SkaffoldOptions,
 			err := recover()
 			if err != nil {
 				log.Entry(ctx).Errorf("recovered from panic at %s: %v\n", req.Method(), err)
-				log.Entry(ctx).Errorf("stacktrace from panic: \n" + string(debug.Stack()))
+				log.Entry(ctx).Errorf("stacktrace from panic: \n%s", string(debug.Stack()))
 			}
 		}()
 		log.Entry(ctx).Debugf("req.Method():  %q\n", req.Method())
@@ -192,6 +192,7 @@ func GetHandler(conn jsonrpc2.Conn, out io.Writer, opts config.SkaffoldOptions,
 	}
 }
 
+//nolint:unparam
 func (h *Handler) updateDocument(ctx context.Context, documentURI, content string) error {
 	h.documentManager.UpdateDocument(documentURI, content)
 	log.Entry(ctx).Debugf("updated document for %q with %d chars\n", documentURI, len(content))

diff --git a/pkg/skaffold/parser/config_test.go b/pkg/skaffold/parser/config_test.go
@@ -1445,11 +1445,11 @@ func TestConfigLocationsParse(t *testing.T) {
 			fp := t.TempFile("skaffoldyaml-", []byte(test.skaffoldYamlText))
 			cfgs, err := GetConfigSet(context.TODO(), config.SkaffoldOptions{ConfigurationFile: fp, Profiles: test.profiles})
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			root, err := kyaml.Parse(test.skaffoldYamlText)
 			if err != nil {
-				t.Fatalf(err.Error())
+				t.Fatal(err.Error())
 			}
 			var seen bool
 			for _, filters := range test.expected {

diff --git a/pkg/skaffold/render/renderer/helm/helm.go b/pkg/skaffold/render/renderer/helm/helm.go
@@ -208,7 +208,7 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact,
 	if !release.SkipBuildDependencies && release.ChartPath != "" {
 		log.Entry(ctx).Info("Building helm dependencies...")
 		if err := helm.ExecWithStdoutAndStderr(ctx, h, io.Discard, errBuffer, false, env, "dep", "build", release.ChartPath); err != nil {
-			log.Entry(ctx).Infof(errBuffer.String())
+			log.Entry(ctx).Info(errBuffer.String())
 			return nil, helm.UserErr("building helm dependencies", err)
 		}
 	}
@@ -217,7 +217,7 @@ func (h Helm) generateHelmManifest(ctx context.Context, builds []graph.Artifact,
 	errorMsg := errBuffer.String()
 
 	if len(errorMsg) > 0 {
-		log.Entry(ctx).Infof(errorMsg)
+		log.Entry(ctx).Info(errorMsg)
 	}
 
 	if err != nil {

diff --git a/pkg/skaffold/render/transform/transform.go b/pkg/skaffold/render/transform/transform.go
@@ -117,7 +117,7 @@ func (v *Transformer) Append(ts ...latest.Transformer) error {
 }
 
 func (v *Transformer) IsEmpty() bool {
-	return v.config == nil || len(v.config) == 0
+	return len(v.config) == 0
 }
 
 func (v *Transformer) Transform(ctx context.Context, ml manifest.ManifestList) (manifest.ManifestList, error) {

diff --git a/pkg/skaffold/render/validate/validate.go b/pkg/skaffold/render/validate/validate.go
@@ -77,7 +77,7 @@ func (v Validator) GetDeclarativeValidators() []kptfile.Function {
 }
 
 func (v Validator) Validate(ctx context.Context, ml manifest.ManifestList) error {
-	if v.kptFn == nil || len(v.kptFn) == 0 {
+	if len(v.kptFn) == 0 {
 		return nil
 	}
 

diff --git a/pkg/skaffold/survey/survey.go b/pkg/skaffold/survey/survey.go
@@ -109,7 +109,7 @@ func recentlyPrompted(gc *sConfig.SurveyConfig) bool {
 
 func (s *Runner) DisplaySurveyPrompt(out io.Writer, id string) error {
 	if sc, ok := getSurvey(id); ok {
-		output.Green.Fprintf(out, sc.prompt())
+		output.Green.Fprintf(out, "%s", sc.prompt())
 		return updateSurveyPrompted(s.configFile)
 	}
 	return nil

diff --git a/pkg/skaffold/sync/syncer_mux.go b/pkg/skaffold/sync/syncer_mux.go
@@ -49,7 +49,7 @@ func (s SyncerMux) Sync(ctx context.Context, out io.Writer, item *Item) error {
 		}
 
 		// Otherwise log the error as a warning
-		log.Entry(ctx).Warnf(err.Error())
+		log.Entry(ctx).Warn(err.Error())
 	}
 
 	return nil

diff --git a/pkg/skaffold/update/update.go b/pkg/skaffold/update/update.go
@@ -103,5 +103,5 @@ func DownloadLatestVersion() (string, error) {
 }
 
 func releaseURL(v semver.Version) string {
-	return fmt.Sprintf("https://github.com/GoogleContainerTools/skaffold/releases/tag/v" + v.String())
+	return fmt.Sprintf("https://github.com/GoogleContainerTools/skaffold/releases/tag/v%s", v.String())
 }