Merge 2ef497e16f into f76815959a

cmd/root.go

@@ -71,10 +71,6 @@ yq -P -oy sample.json
 			level := logging.WARNING
 			stringFormat := `[%{level}] %{color}%{time:15:04:05}%{color:reset} %{message}`
 
-			// when NO_COLOR environment variable presents and not an empty string the coloured output should be disabled;
-			// refer to no-color.org
-			forceNoColor = forceNoColor || os.Getenv("NO_COLOR") != ""
-
 			if verbose && forceNoColor {
 				level = logging.DEBUG
 				stringFormat = `[%{level:5.5s}] %{time:15:04:05} %{shortfile:-33s} %{shortfunc:-25s} %{message}`
@@ -94,6 +90,10 @@ yq -P -oy sample.json
 			logging.SetBackend(backend)
 			yqlib.InitExpressionParser()
 
+			// when NO_COLOR environment variable presents and not an empty string the coloured output should be disabled;
+			// refer to no-color.org
+			forceNoColor = os.Getenv("NO_COLOR") != ""
+
 			return nil
 		},
 	}

cmd/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "v4.44.6"
+	Version = "v4.44.5"
 
 	// 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

pkg/yqlib/operator_multiply.go

@@ -153,10 +153,6 @@ func repeatString(lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error
 	count, err := parseInt(intNode.Value)
 	if err != nil {
 		return nil, err
-	} else if count < 0 {
-		return nil, fmt.Errorf("Cannot repeat string by a negative number (%v)", count)
-	} else if count > 10000000 {
-		return nil, fmt.Errorf("Cannot repeat string by more than 100 million (%v)", count)
 	}
 	target.Value = strings.Repeat(stringNode.Value, count)
 

pkg/yqlib/operator_multiply_test.go

@@ -201,21 +201,6 @@ var multiplyOperatorScenarios = []expressionScenario{
 			fmt.Sprintf("D0, P[], (!!str)::%s\n", strings.Repeat("banana", 4)),
 		},
 	},
-	{
-		description:   "Multiply string X by negative int",
-		skipDoc:       true,
-		document:      `n: -4`,
-		expression:    `"banana" * .n`,
-		expectedError: "Cannot repeat string by a negative number (-4)",
-	},
-	{
-		description: "Multiply string X by more than 100 million",
-		// very large string.repeats causes a panic
-		skipDoc:       true,
-		document:      `n: 100000001`,
-		expression:    `"banana" * .n`,
-		expectedError: "Cannot repeat string by more than 100 million (100000001)",
-	},
 	{
 		description: "Multiply int node X string",
 		document: `n: 4

pkg/yqlib/operator_traverse_path.go

@@ -264,7 +264,7 @@ func doTraverseMap(newMatches *orderedmap.OrderedMap, node *CandidateNode, wante
 	// if we don't find a match directly on this node first.
 
 	var contents = node.Content
-	for index := 0; index+1 < len(contents); index = index + 2 {
+	for index := 0; index < len(contents); index = index + 2 {
 		key := contents[index]
 		value := contents[index+1]
 

pkg/yqlib/operator_traverse_path_test.go

@@ -35,15 +35,6 @@ steps:
 `
 
 var traversePathOperatorScenarios = []expressionScenario{
-	{
-		skipDoc:     true,
-		description: "strange map with key but no value",
-		document:    "!!null\n-",
-		expression:  ".x",
-		expected: []string{
-			"D0, P[x], (!!null)::null\n",
-		},
-	},
 	{
 		skipDoc:     true,
 		description: "access merge anchors",

release_notes.txt

@@ -1,10 +1,3 @@
-4.44.6:
-  - Fixed deleting items in array bug #2027, #2172; Thanks @jandubois 
-  - Docker image for armv7 / raspberry pi3, Thanks @brianegge
-  - Fixed no-colors regression #2218
-  - Fixed various panic scenarios #2211
-  - Bumped dependencies 
-
 4.44.5:
   - Fixing release pipeline
 

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: yq
-version: 'v4.44.6'
+version: 'v4.44.5'
 summary: A lightweight and portable command-line data file processor
 description: |
   `yq` uses [jq](https://github.com/stedolan/jq) like syntax but works with yaml, json, xml, csv, properties and TOML files.
@@ -24,6 +24,6 @@ parts:
     build-environment:
       - CGO_ENABLED: 0
     source: https://github.com/mikefarah/yq.git
-    source-tag: v4.44.6
+    source-tag: v4.44.5
     build-snaps:
       - go/latest/stable