Merge 9883ebc313 into f76815959a

acceptance_tests/split-printer.sh

@@ -2,7 +2,6 @@
 
 setUp() {
   rm test*.yml || true
-  rm -rf test_dir* || true
 }
 
 testBasicSplitWithName() {
@@ -205,23 +204,4 @@ EOM
   assertEquals "$expectedDoc3" "$doc3"
 }
 
-testSplitWithDirectories() {
-  cat >test.yml <<EOL
-f: test_dir1/file1
----
-f: test_dir2/dir22/file2
----
-f: file3
-EOL
-
-  ./yq e --no-doc -s ".f" test.yml
-
-  doc1=$(cat test_dir1/file1.yml)
-  assertEquals "f: test_dir1/file1" "$doc1"
-  doc2=$(cat test_dir2/dir22/file2.yml)
-  assertEquals "f: test_dir2/dir22/file2" "$doc2"
-  doc3=$(cat file3.yml)
-  assertEquals "f: file3" "$doc3"
-}
-
-source ./scripts/shunit2
+source ./scripts/shunit2

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
 		},
 	}
@@ -197,7 +197,7 @@ yq -P -oy sample.json
 	}
 	rootCmd.PersistentFlags().BoolVarP(&yqlib.ConfiguredYamlPreferences.LeadingContentPreProcessing, "header-preprocess", "", true, "Slurp any header comments and separators before processing expression.")
 
-	rootCmd.PersistentFlags().StringVarP(&splitFileExp, "split-exp", "s", "", "print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter. The necessary directories will be created.")
+	rootCmd.PersistentFlags().StringVarP(&splitFileExp, "split-exp", "s", "", "print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter.")
 	if err = rootCmd.RegisterFlagCompletionFunc("split-exp", cobra.NoFileCompletions); err != nil {
 		panic(err)
 	}

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",

pkg/yqlib/printer_writer.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"regexp"
 )
 
@@ -71,10 +70,6 @@ func (sp *multiPrintWriter) GetWriter(node *CandidateNode) (*bufio.Writer, error
 		name = fmt.Sprintf("%v.%v", name, sp.extension)
 	}
 
-	err = os.MkdirAll(filepath.Dir(name), 0750)
-	if err != nil {
-		return nil, err
-	}
 	f, err := os.Create(name)
 
 	if err != nil {

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