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 code to address complains from gocritic (assignOp, ifElseChain and appendAssign)

Browse Source
This commit is contained in:
Arthur Mello
2019-12-06 16:34:27 -03:00
parent 20d995c87e
commit 0a8d7c2be2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kyaml/yaml/filters.go
View File

@@ -103,15 +103,16 @@ func (s ValueReplacer) Filter(object *RNode) (*RNode, error) {
if s.Count == 0 { if s.Count == 0 {
s.Count = -1 s.Count = -1
} }
if s.StringMatch != "" { switch {
case s.StringMatch != "":
object.value.Value = strings.Replace(object.value.Value, s.StringMatch, s.Replace, s.Count) object.value.Value = strings.Replace(object.value.Value, s.StringMatch, s.Replace, s.Count)
} else if s.RegexMatch != "" { case s.RegexMatch != "":
r, err := regexp.Compile(s.RegexMatch) r, err := regexp.Compile(s.RegexMatch)
if err != nil { if err != nil {
return nil, fmt.Errorf("ValueReplacer RegexMatch does not compile: %v", err) return nil, fmt.Errorf("ValueReplacer RegexMatch does not compile: %v", err)
} }
object.value.Value = r.ReplaceAllString(object.value.Value, s.Replace) object.value.Value = r.ReplaceAllString(object.value.Value, s.Replace)
} else { default:
return nil, fmt.Errorf("ValueReplacer missing StringMatch and RegexMatch") return nil, fmt.Errorf("ValueReplacer missing StringMatch and RegexMatch")
} }
return object, nil return object, nil
@@ -138,7 +139,7 @@ type SuffixSetter struct {
func (s SuffixSetter) Filter(object *RNode) (*RNode, error) { func (s SuffixSetter) Filter(object *RNode) (*RNode, error) {
if !strings.HasSuffix(object.value.Value, s.Value) { if !strings.HasSuffix(object.value.Value, s.Value) {
object.value.Value = object.value.Value + s.Value object.value.Value += s.Value
} }
return object, nil return object, nil
} }

13
kyaml/yaml/fns.go
View File

@@ -141,10 +141,12 @@ func (c FieldClearer) Filter(rn *RNode) (*RNode, error) {
// save the item we are about to remove // save the item we are about to remove
removed := NewRNode(rn.Content()[i+1]) removed := NewRNode(rn.Content()[i+1])
if len(rn.YNode().Content) > i+2 { if len(rn.YNode().Content) > i+2 {
l := len(rn.YNode().Content)
// remove from the middle of the list // remove from the middle of the list
rn.YNode().Content = rn.Content()[:i]
rn.YNode().Content = append( rn.YNode().Content = append(
rn.Content()[:i], rn.YNode().Content,
rn.Content()[i+2:len(rn.YNode().Content)]...) rn.Content()[i+2:l]...)
} else { } else {
// remove from the end of the list // remove from the end of the list
rn.YNode().Content = rn.Content()[:i] rn.YNode().Content = rn.Content()[:i]
@@ -264,7 +266,8 @@ func (f FieldMatcher) Filter(rn *RNode) (*RNode, error) {
if err := ErrorIfInvalid(rn, yaml.ScalarNode); err != nil { if err := ErrorIfInvalid(rn, yaml.ScalarNode); err != nil {
return nil, err return nil, err
} }
if f.StringRegexValue != "" { switch {
case f.StringRegexValue != "":
// TODO(pwittrock): pre-compile this when unmarshalling and cache to a field // TODO(pwittrock): pre-compile this when unmarshalling and cache to a field
rg, err := regexp.Compile(f.StringRegexValue) rg, err := regexp.Compile(f.StringRegexValue)
if err != nil { if err != nil {
@@ -274,9 +277,9 @@ func (f FieldMatcher) Filter(rn *RNode) (*RNode, error) {
return rn, nil return rn, nil
} }
return nil, nil return nil, nil
} else if rn.value.Value == f.Value.YNode().Value { case rn.value.Value == f.Value.YNode().Value:
return rn, nil return rn, nil
} else { default:
return nil, nil return nil, nil
} }
} }