Fix golint warning

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

View File

@@ -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