cmd/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "4.9.3"
+	Version = "4.9.2"
 
 	// VersionPrerelease is a pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release

github-action/Dockerfile

@@ -1,4 +1,4 @@
-FROM mikefarah/yq:4.9.3
+FROM mikefarah/yq:4.9.2
 
 COPY entrypoint.sh /entrypoint.sh
 

pkg/yqlib/doc/aa.md

@@ -71,7 +71,7 @@ dog
 Both sides have now been evaluated, so now the operator copies across the value from the RHS to the value on the LHS, and it returns the now updated context:
 
 ```yaml
-a: dog
+a: cat
 b: dog
 ```
 

pkg/yqlib/operator_alternative_test.go

@@ -5,12 +5,6 @@ import (
 )
 
 var alternativeOperatorScenarios = []expressionScenario{
-	{
-		skipDoc:    true,
-		expression: `.b // .c`,
-		document:   `a: bridge`,
-		expected:   []string{},
-	},
 	{
 		skipDoc:    true,
 		expression: `(.b // "hello") as $x`,

pkg/yqlib/operator_booleans_test.go

@@ -12,14 +12,6 @@ var booleanOperatorScenarios = []expressionScenario{
 			"D0, P[], (!!bool)::true\n",
 		},
 	},
-	{
-		skipDoc:    true,
-		document:   "b: hi",
-		expression: `.a or .c`,
-		expected: []string{
-			"D0, P[], (!!bool)::false\n",
-		},
-	},
 	{
 		skipDoc:    true,
 		document:   "b: hi",

pkg/yqlib/operator_collect_object.go

@@ -17,12 +17,9 @@ import (
 ...
 */
 
-func collectObjectOperator(d *dataTreeNavigator, originalContext Context, expressionNode *ExpressionNode) (Context, error) {
+func collectObjectOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
 	log.Debugf("-- collectObjectOperation")
 
-	context := originalContext.Clone()
-	context.DontAutoCreate = false
-
 	if context.MatchingNodes.Len() == 0 {
 		node := &yaml.Node{Kind: yaml.MappingNode, Tag: "!!map", Value: "{}"}
 		candidate := &CandidateNode{Node: node}

pkg/yqlib/operator_collect_object_test.go

@@ -5,30 +5,6 @@ import (
 )
 
 var collectObjectOperatorScenarios = []expressionScenario{
-	{
-		skipDoc:    true,
-		document:   "a: []",
-		expression: `.a += [{"key": "att2", "value": "val2"}]`,
-		expected: []string{
-			"D0, P[], (doc)::a: [{key: att2, value: val2}]\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "",
-		expression: `.a += {"key": "att2", "value": "val2"}`,
-		expected: []string{
-			"D0, P[], ()::a:\n    key: att2\n    value: val2\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "",
-		expression: `.a += [0]`,
-		expected: []string{
-			"D0, P[], ()::a:\n    - 0\n",
-		},
-	},
 	{
 		description: `Collect empty object`,
 		document:    ``,

pkg/yqlib/operator_collect_test.go

@@ -5,14 +5,6 @@ import (
 )
 
 var collectOperatorScenarios = []expressionScenario{
-	{
-		skipDoc:    true,
-		document:   ``,
-		expression: `.a += [0]`,
-		expected: []string{
-			"D0, P[], ()::a:\n    - 0\n",
-		},
-	},
 	{
 		description: "Collect empty",
 		document:    ``,

pkg/yqlib/operator_equals_test.go

@@ -5,13 +5,6 @@ import (
 )
 
 var equalsOperatorScenarios = []expressionScenario{
-	{
-		skipDoc:    true,
-		expression: ".a == .b",
-		expected: []string{
-			"D0, P[], (!!bool)::true\n",
-		},
-	},
 	{
 		skipDoc:    true,
 		document:   "cat",

pkg/yqlib/operator_traverse_path.go

@@ -308,6 +308,6 @@ func traverseMergeAnchor(newMatches *orderedmap.OrderedMap, originalCandidate *C
 
 func traverseArray(candidate *CandidateNode, operation *Operation, prefs traversePreferences) (*list.List, error) {
 	log.Debug("operation Value %v", operation.Value)
-	indices := []*yaml.Node{{Value: operation.StringValue}}
+	indices := []*yaml.Node{&yaml.Node{Value: operation.StringValue}}
 	return traverseArrayWithIndices(candidate, indices, prefs)
 }

pkg/yqlib/operators.go

@@ -31,9 +31,7 @@ func resultsForRhs(d *dataTreeNavigator, context Context, lhsCandidate *Candidat
 		if err != nil {
 			return err
 		}
-		if resultCandidate != nil {
-			results.PushBack(resultCandidate)
-		}
+		results.PushBack(resultCandidate)
 		return nil
 	}
 
@@ -44,9 +42,7 @@ func resultsForRhs(d *dataTreeNavigator, context Context, lhsCandidate *Candidat
 		if err != nil {
 			return err
 		}
-		if resultCandidate != nil {
-			results.PushBack(resultCandidate)
-		}
+		results.PushBack(resultCandidate)
 	}
 	return nil
 }

scripts/format.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
 find . \( -path ./vendor \) -prune -o -name "*.go" -exec goimports -w {} \;
-gofmt -w -s .
 go mod tidy
 go mod vendor

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: yq
-version: '4.9.3'
+version: '4.9.2'
 summary: A lightweight and portable command-line YAML processor
 description: |
   The aim of the project is to be the jq or sed of yaml files.