fix(cmd/driver,pkg/driver): avoid using filepath.Join when joining …

…hostRoot. Signed-off-by: Federico Di Pierro <[email protected]>
falcosecurity · Nov 28, 2023 · ca03adf · ca03adf
1 parent d762a9c
commit ca03adf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cmd/driver/config/config.go b/cmd/driver/config/config.go
@@ -190,7 +190,7 @@ func checkFalcoRunsWithDrivers(engineKind string) error {
 }
 
 func (o *driverConfigOptions) replaceDriverTypeInFalcoConfig(hostRoot string, driverType drivertype.DriverType) error {
-	falcoCfgFile := filepath.Join(hostRoot, "etc", "falco", "falco.yaml")
+	falcoCfgFile := hostRoot + "/etc/falco/falco.yaml"
 	type engineCfg struct {
 		Kind string `yaml:"kind"`
 	}

diff --git a/pkg/driver/distro/distro.go b/pkg/driver/distro/distro.go
@@ -265,7 +265,7 @@ func getKernelConfig(printer *output.Printer, kr *kernelrelease.KernelRelease, h
 func downloadKernelSrc(ctx context.Context,
 	printer *output.Printer,
 	kr *kernelrelease.KernelRelease,
-	url string, hostRoot string,
+	url, hostRoot string,
 	stripComponents int,
 ) (map[string]string, error) {
 	env := make(map[string]string)

diff --git a/pkg/driver/distro/distro_test.go b/pkg/driver/distro/distro_test.go
@@ -28,7 +28,7 @@ import (
 
 func TestDiscoverDistro(t *testing.T) {
 	hostRoot := "."
-	etcDir := filepath.Join(hostRoot, "etc")
+	etcDir := hostRoot + "/etc"
 	osReleaseFile := filepath.Join(etcDir, "os-release")
 
 	type osID struct {