From 14d576787a9502aa59a52705ad1808b63f90498e Mon Sep 17 00:00:00 2001
From: Rudolf Thomas <rudolf.thomas@firma.seznam.cz>
Date: Fri, 13 Dec 2024 11:48:19 +0100
Subject: [PATCH] feat: Create parent directories if --split-exp is used.

Problem: When --split-exp is used and produces filenames with slashes in
them, the target directories must already exist otherwise yq fails.

Fix/feature: Create the necessary directories with os.MkdirAll().
The permissions 0750 were chosen to satisfy the vulnerability checker.
---
 acceptance_tests/split-printer.sh | 22 +++++++++++++++++++++-
 cmd/root.go                       |  2 +-
 pkg/yqlib/printer_writer.go       |  5 +++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/acceptance_tests/split-printer.sh b/acceptance_tests/split-printer.sh
index 4629c4967a3..50554207bb5 100755
--- a/acceptance_tests/split-printer.sh
+++ b/acceptance_tests/split-printer.sh
@@ -2,6 +2,7 @@
 
 setUp() {
   rm test*.yml || true
+  rm -rf test_dir* || true
 }
 
 testBasicSplitWithName() {
@@ -204,4 +205,23 @@ EOM
   assertEquals "$expectedDoc3" "$doc3"
 }
 
-source ./scripts/shunit2
\ No newline at end of file
+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
diff --git a/cmd/root.go b/cmd/root.go
index 8af5622b8c5..b7360d3cfd4 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -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.")
+	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.")
 	if err = rootCmd.RegisterFlagCompletionFunc("split-exp", cobra.NoFileCompletions); err != nil {
 		panic(err)
 	}
diff --git a/pkg/yqlib/printer_writer.go b/pkg/yqlib/printer_writer.go
index b3e894663d3..88d60a0ff3b 100644
--- a/pkg/yqlib/printer_writer.go
+++ b/pkg/yqlib/printer_writer.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"regexp"
 )
 
@@ -70,6 +71,10 @@ 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 {