packetbeat/module: fix upload of bundled ingest pipelines on Windows (#…

…41110) (#41115) Detection of data stream identity was using os.PathSeparator which will not match the path separator used by embed.FS which is always "/"[1]. [1]https://pkg.go.dev/embed#hdr-Directives (cherry picked from commit f55bd8d) Co-authored-by: Dan Kortschak <[email protected]>
elastic · Oct 4, 2024 · fa798fc · fa798fc
1 parent 219ec21
commit fa798fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -115,6 +115,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 
 *Packetbeat*
 
+- Fix upload of bundled ingest pipelines on Windows. {pull}41110[41110]
 
 *Winlogbeat*
 

diff --git a/packetbeat/module/pipeline.go b/packetbeat/module/pipeline.go
@@ -22,7 +22,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"os"
 	"path"
 	"path/filepath"
 	"strings"
@@ -113,7 +112,10 @@ func readFile(filename string, info beat.Info) (p pipeline, err error) {
 	if err != nil {
 		return pipeline{}, err
 	}
-	ds, _, _ := strings.Cut(filename, string(os.PathSeparator))
+	ds, _, ok := strings.Cut(filename, "/")
+	if !ok {
+		return pipeline{}, fmt.Errorf("unexpected filename '%s': missing '/' between data stream and 'ingest'", filename)
+	}
 	p = pipeline{
 		id:       fileset.FormatPipelineID(info.IndexPrefix, "", "", ds, info.Version),
 		contents: updatedContent,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -115,6 +115,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]

		Packetbeat

		- Fix upload of bundled ingest pipelines on Windows. {pull}41110[41110]

		Winlogbeat

Expand Down