kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix golint warning

Browse Source 
golint warning: if block ends with a return statement, so drop this else and outdent its block

Signed-off-by: Ma Xinjian <maxj.fnst@fujitsu.com>
This commit is contained in:
Ma Xinjian
2021-04-28 14:45:31 +08:00
parent 7716b1bd3d
commit 677ec868e0
11 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/config/internal/commands/annotate.go
View File

@@ -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())
}
} else {
fmt.Fprint(w, "added annotations in the package\n")
}

3
cmd/config/internal/commands/cat.go
View File

@@ -138,11 +138,10 @@ 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)
}
}
fmt.Fprint(w, out.String())
if out.String() != "" {
fmt.Fprint(w, "---")

3
cmd/config/internal/commands/cmdcreatesetter.go
View File

@@ -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())
}
} else {
fmt.Fprintf(w, "created setter %q\n", r.CreateSetter.Name)
}

3
cmd/config/internal/commands/cmdcreatesubstitution.go
View File

@@ -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())
}
} else {
fmt.Fprintf(w, "created substitution %q\n", r.CreateSubstitution.Name)
}

3
cmd/config/internal/commands/cmddeletesetter.go
View File

@@ -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())
}
} else {
fmt.Fprintf(w, "deleted setter %q\n", r.DeleteSetter.Name)
}

3
cmd/config/internal/commands/cmddeletesubstitution.go
View File

@@ -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())
}
} else {
fmt.Fprintf(w, "deleted substitution %q\n", r.DeleteSubstitution.Name)
}

3
cmd/config/internal/commands/cmdset.go
View File

@@ -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())
}
} else {
fmt.Fprintf(w, "set %d field(s) of setter %q to value %q\n", count, r.Set.Name, r.Set.Value)
}

3
cmd/config/internal/commands/count.go
View File

@@ -81,11 +81,10 @@ 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())
}
}
return nil
}

3
cmd/config/internal/commands/fmt.go
View File

@@ -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())
}
} else {
fmt.Fprint(w, "formatted resource files in the package\n")
}

3
cmd/config/internal/commands/grep.go
View File

@@ -155,11 +155,10 @@ 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())
}
}
fmt.Fprint(w, out.String())
if out.String() != "" {
fmt.Fprint(w, "---")

3
plugin/builtin/patchtransformer/PatchTransformer.go
View File

@@ -80,11 +80,10 @@ 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)
}
}
// transformStrategicMerge applies the provided strategic merge patch
// to all the resources in the ResMap that match either the Target or