From 2702ca0e1877050ea085cfe6b84eac0a0e8b1508 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Mon, 20 Dec 2021 22:27:49 +0100 Subject: [PATCH] enable unparam linter --- .golangci.yml | 1 + pkg/yqlib/operator_collect_object.go | 2 +- pkg/yqlib/operator_entries.go | 10 +++++----- pkg/yqlib/operator_map.go | 4 ++-- pkg/yqlib/operator_multiply.go | 2 +- pkg/yqlib/operator_recursive_descent.go | 8 ++++---- pkg/yqlib/operator_subtract.go | 4 ++-- pkg/yqlib/operator_traverse_path.go | 10 +++++----- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 6661f7c9..85cd0181 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -11,6 +11,7 @@ linters: - misspell - revive - unconvert + - unparam issues: exclude-rules: - linters: diff --git a/pkg/yqlib/operator_collect_object.go b/pkg/yqlib/operator_collect_object.go index 6543fe11..59417a62 100644 --- a/pkg/yqlib/operator_collect_object.go +++ b/pkg/yqlib/operator_collect_object.go @@ -61,7 +61,7 @@ func collect(d *dataTreeNavigator, context Context, remainingMatches *list.List) candidate := remainingMatches.Remove(remainingMatches.Front()).(*CandidateNode) - splatted, err := splat(d, context.SingleChildContext(candidate), + splatted, err := splat(context.SingleChildContext(candidate), traversePreferences{DontFollowAlias: true, IncludeMapKeys: false}) for splatEl := splatted.MatchingNodes.Front(); splatEl != nil; splatEl = splatEl.Next() { diff --git a/pkg/yqlib/operator_entries.go b/pkg/yqlib/operator_entries.go index a0377a74..d3d8bc3d 100644 --- a/pkg/yqlib/operator_entries.go +++ b/pkg/yqlib/operator_entries.go @@ -68,7 +68,7 @@ func toEntriesOperator(d *dataTreeNavigator, context Context, expressionNode *Ex return context.ChildContext(results), nil } -func parseEntry(d *dataTreeNavigator, entry *yaml.Node, position int) (*yaml.Node, *yaml.Node, error) { +func parseEntry(entry *yaml.Node, position int) (*yaml.Node, *yaml.Node, error) { prefs := traversePreferences{DontAutoCreate: true} candidateNode := &CandidateNode{Node: entry} @@ -92,14 +92,14 @@ func parseEntry(d *dataTreeNavigator, entry *yaml.Node, position int) (*yaml.Nod } -func fromEntries(d *dataTreeNavigator, candidateNode *CandidateNode) (*CandidateNode, error) { +func fromEntries(candidateNode *CandidateNode) (*CandidateNode, error) { var node = &yaml.Node{Kind: yaml.MappingNode, Tag: "!!map"} var mapCandidateNode = candidateNode.CreateReplacement(node) var contents = unwrapDoc(candidateNode.Node).Content for index := 0; index < len(contents); index = index + 1 { - key, value, err := parseEntry(d, contents[index], index) + key, value, err := parseEntry(contents[index], index) if err != nil { return nil, err } @@ -117,7 +117,7 @@ func fromEntriesOperator(d *dataTreeNavigator, context Context, expressionNode * switch candidateNode.Kind { case yaml.SequenceNode: - mapResult, err := fromEntries(d, candidate) + mapResult, err := fromEntries(candidate) if err != nil { return Context{}, err } @@ -143,7 +143,7 @@ func withEntriesOperator(d *dataTreeNavigator, context Context, expressionNode * for el := toEntries.MatchingNodes.Front(); el != nil; el = el.Next() { //run expression against entries // splat toEntries and pipe it into Rhs - splatted, err := splat(d, context.SingleChildContext(el.Value.(*CandidateNode)), traversePreferences{}) + splatted, err := splat(context.SingleChildContext(el.Value.(*CandidateNode)), traversePreferences{}) if err != nil { return Context{}, err } diff --git a/pkg/yqlib/operator_map.go b/pkg/yqlib/operator_map.go index a28b652a..e3b8ec99 100644 --- a/pkg/yqlib/operator_map.go +++ b/pkg/yqlib/operator_map.go @@ -10,7 +10,7 @@ func mapValuesOperator(d *dataTreeNavigator, context Context, expressionNode *Ex candidate := el.Value.(*CandidateNode) //run expression against entries // splat toEntries and pipe it into Rhs - splatted, err := splat(d, context.SingleChildContext(candidate), traversePreferences{}) + splatted, err := splat(context.SingleChildContext(candidate), traversePreferences{}) if err != nil { return Context{}, err } @@ -37,7 +37,7 @@ func mapOperator(d *dataTreeNavigator, context Context, expressionNode *Expressi candidate := el.Value.(*CandidateNode) //run expression against entries // splat toEntries and pipe it into Rhs - splatted, err := splat(d, context.SingleChildContext(candidate), traversePreferences{}) + splatted, err := splat(context.SingleChildContext(candidate), traversePreferences{}) if err != nil { return Context{}, err } diff --git a/pkg/yqlib/operator_multiply.go b/pkg/yqlib/operator_multiply.go index 2602b7a6..d22e2612 100644 --- a/pkg/yqlib/operator_multiply.go +++ b/pkg/yqlib/operator_multiply.go @@ -109,7 +109,7 @@ func mergeObjects(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs TraversePreferences: traversePreferences{DontFollowAlias: true, IncludeMapKeys: true}} log.Debugf("merge - preferences.DeepMergeArrays %v", preferences.DeepMergeArrays) log.Debugf("merge - preferences.AppendArrays %v", preferences.AppendArrays) - err := recursiveDecent(d, results, context.SingleChildContext(rhs), prefs) + err := recursiveDecent(results, context.SingleChildContext(rhs), prefs) if err != nil { return nil, err } diff --git a/pkg/yqlib/operator_recursive_descent.go b/pkg/yqlib/operator_recursive_descent.go index 71095540..bb583840 100644 --- a/pkg/yqlib/operator_recursive_descent.go +++ b/pkg/yqlib/operator_recursive_descent.go @@ -15,7 +15,7 @@ func recursiveDescentOperator(d *dataTreeNavigator, context Context, expressionN var results = list.New() preferences := expressionNode.Operation.Preferences.(recursiveDescentPreferences) - err := recursiveDecent(d, results, context, preferences) + err := recursiveDecent(results, context, preferences) if err != nil { return Context{}, err } @@ -23,7 +23,7 @@ func recursiveDescentOperator(d *dataTreeNavigator, context Context, expressionN return context.ChildContext(results), nil } -func recursiveDecent(d *dataTreeNavigator, results *list.List, context Context, preferences recursiveDescentPreferences) error { +func recursiveDecent(results *list.List, context Context, preferences recursiveDescentPreferences) error { for el := context.MatchingNodes.Front(); el != nil; el = el.Next() { candidate := el.Value.(*CandidateNode) @@ -35,12 +35,12 @@ func recursiveDecent(d *dataTreeNavigator, results *list.List, context Context, if candidate.Node.Kind != yaml.AliasNode && len(candidate.Node.Content) > 0 && (preferences.RecurseArray || candidate.Node.Kind != yaml.SequenceNode) { - children, err := splat(d, context.SingleChildContext(candidate), preferences.TraversePreferences) + children, err := splat(context.SingleChildContext(candidate), preferences.TraversePreferences) if err != nil { return err } - err = recursiveDecent(d, results, children, preferences) + err = recursiveDecent(results, children, preferences) if err != nil { return err } diff --git a/pkg/yqlib/operator_subtract.go b/pkg/yqlib/operator_subtract.go index 51d68cbf..4c267e8c 100644 --- a/pkg/yqlib/operator_subtract.go +++ b/pkg/yqlib/operator_subtract.go @@ -23,7 +23,7 @@ func subtractOperator(d *dataTreeNavigator, context Context, expressionNode *Exp return crossFunction(d, context.ReadOnlyClone(), expressionNode, subtract, false) } -func subtractArray(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) { +func subtractArray(lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) { newLhsArray := make([]*yaml.Node, 0) for lindex := 0; lindex < len(lhs.Node.Content); lindex = lindex + 1 { @@ -60,7 +60,7 @@ func subtract(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *Ca if rhs.Node.Kind != yaml.SequenceNode { return nil, fmt.Errorf("%v (%v) cannot be subtracted from %v", rhs.Node.Tag, rhs.Path, lhsNode.Tag) } - return subtractArray(d, context, lhs, rhs) + return subtractArray(lhs, rhs) case yaml.ScalarNode: if rhs.Node.Kind != yaml.ScalarNode { return nil, fmt.Errorf("%v (%v) cannot be subtracted from %v", rhs.Node.Tag, rhs.Path, lhsNode.Tag) diff --git a/pkg/yqlib/operator_traverse_path.go b/pkg/yqlib/operator_traverse_path.go index 69671591..c8df17d6 100644 --- a/pkg/yqlib/operator_traverse_path.go +++ b/pkg/yqlib/operator_traverse_path.go @@ -17,7 +17,7 @@ type traversePreferences struct { OptionalTraverse bool // e.g. .adf? } -func splat(d *dataTreeNavigator, context Context, prefs traversePreferences) (Context, error) { +func splat(context Context, prefs traversePreferences) (Context, error) { return traverseNodesWithArrayIndices(context, make([]*yaml.Node, 0), prefs) } @@ -26,7 +26,7 @@ func traversePathOperator(d *dataTreeNavigator, context Context, expressionNode var matches = list.New() for el := context.MatchingNodes.Front(); el != nil; el = el.Next() { - newNodes, err := traverse(d, context, el.Value.(*CandidateNode), expressionNode.Operation) + newNodes, err := traverse(context, el.Value.(*CandidateNode), expressionNode.Operation) if err != nil { return Context{}, err } @@ -36,7 +36,7 @@ func traversePathOperator(d *dataTreeNavigator, context Context, expressionNode return context.ChildContext(matches), nil } -func traverse(d *dataTreeNavigator, context Context, matchingNode *CandidateNode, operation *Operation) (*list.List, error) { +func traverse(context Context, matchingNode *CandidateNode, operation *Operation) (*list.List, error) { log.Debug("Traversing %v", NodeToString(matchingNode)) value := matchingNode.Node @@ -66,11 +66,11 @@ func traverse(d *dataTreeNavigator, context Context, matchingNode *CandidateNode case yaml.AliasNode: log.Debug("its an alias!") matchingNode.Node = matchingNode.Node.Alias - return traverse(d, context, matchingNode, operation) + return traverse(context, matchingNode, operation) case yaml.DocumentNode: log.Debug("digging into doc node") - return traverse(d, context, matchingNode.CreateChildInMap(nil, matchingNode.Node.Content[0]), operation) + return traverse(context, matchingNode.CreateChildInMap(nil, matchingNode.Node.Content[0]), operation) default: return list.New(), nil }