Merge pull request #3844 from MaXinjian/0428

Fix small golint warning

cmd/config/internal/commands/annotate.go

@@ -102,10 +102,9 @@ func (r *AnnotateRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if there is only package
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if there are multiple packages to annotate
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if there are multiple packages to annotate
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprint(w, "added annotations in the package\n")
 	}

cmd/config/internal/commands/cat.go

@@ -138,10 +138,9 @@ func (r *CatRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if there is only package
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if there are multiple packages to annotate
-			fmt.Fprintf(w, "%s in package %q\n", err.Error(), pkgPath)
 		}
+		// print error message and continue if there are multiple packages to annotate
+		fmt.Fprintf(w, "%s in package %q\n", err.Error(), pkgPath)
 	}
 	fmt.Fprint(w, out.String())
 	if out.String() != "" {

cmd/config/internal/commands/cmdcreatesetter.go

@@ -196,10 +196,9 @@ func (r *CreateSetterRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if RecurseSubPackages is false
 		if !r.CreateSetter.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "created setter %q\n", r.CreateSetter.Name)
 	}

cmd/config/internal/commands/cmdcreatesubstitution.go

@@ -88,10 +88,9 @@ func (r *CreateSubstitutionRunner) ExecuteCmd(w io.Writer, pkgPath string) error
 		// return err if RecurseSubPackages is false
 		if !r.CreateSubstitution.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "created substitution %q\n", r.CreateSubstitution.Name)
 	}

cmd/config/internal/commands/cmddeletesetter.go

@@ -92,10 +92,9 @@ func (r *DeleteSetterRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if RecurseSubPackages is false
 		if !r.DeleteSetter.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "deleted setter %q\n", r.DeleteSetter.Name)
 	}

cmd/config/internal/commands/cmddeletesubstitution.go

@@ -88,10 +88,9 @@ func (r *DeleteSubstitutionRunner) ExecuteCmd(w io.Writer, pkgPath string) error
 		// return err if RecurseSubPackages is false
 		if !r.DeleteSubstitution.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "deleted substitution %q\n", r.DeleteSubstitution.Name)
 	}

cmd/config/internal/commands/cmdset.go

@@ -128,10 +128,9 @@ func (r *SetRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if RecurseSubPackages is false
 		if !r.Set.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "set %d field(s) of setter %q to value %q\n", count, r.Set.Name, r.Set.Value)
 	}

cmd/config/internal/commands/count.go

@@ -81,10 +81,9 @@ func (r *CountRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if there is only package
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if there are multiple packages to annotate
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if there are multiple packages to annotate
+		fmt.Fprintf(w, "%s\n", err.Error())
 	}
 	return nil
 }

cmd/config/internal/commands/fmt.go

@@ -108,10 +108,9 @@ func (r *FmtRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if RecurseSubPackages is false
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprint(w, "formatted resource files in the package\n")
 	}

cmd/config/internal/commands/grep.go

@@ -155,10 +155,9 @@ func (r *GrepRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if there is only package
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if there are multiple packages to annotate
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if there are multiple packages to annotate
+		fmt.Fprintf(w, "%s\n", err.Error())
 	}
 	fmt.Fprint(w, out.String())
 	if out.String() != "" {

plugin/builtin/patchtransformer/PatchTransformer.go

@@ -80,10 +80,9 @@ func (p *plugin) Config(
 func (p *plugin) Transform(m resmap.ResMap) error {
 	if p.loadedPatch == nil {
 		return p.transformJson6902(m, p.decodedPatch)
-	} else {
-		// The patch was a strategic merge patch
-		return p.transformStrategicMerge(m, p.loadedPatch)
 	}
+	// The patch was a strategic merge patch
+	return p.transformStrategicMerge(m, p.loadedPatch)
 }
 
 // transformStrategicMerge applies the provided strategic merge patch