fix(pkg/driverbuilder): fixed local builder template.

Fix on top of #342. Signed-off-by: Federico Di Pierro <[email protected]>
falcosecurity · May 10, 2024 · 4c7df39 · 4c7df39
1 parent 5be1caf
commit 4c7df39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pkg/driverbuilder/builder/templates/local.sh b/pkg/driverbuilder/builder/templates/local.sh
@@ -20,7 +20,7 @@
 # looking for it in a bunch of ways. Convenient when running Falco inside
 # a container or in other weird environments.
 #
-set -xeuo pipefail
+set -xeo pipefail
 
 {{ if or .BuildProbe (and  .BuildModule (not .UseDKMS)) }}
 cd {{ .DriverBuildDir }}

diff --git a/pkg/driverbuilder/local.go b/pkg/driverbuilder/local.go
@@ -74,7 +74,7 @@ func (lbp *LocalBuildProcessor) Start(b *builder.Build) error {
 		// if an unsupported target is passed.
 		// Go on skipping automatic kernel headers download.
 		if err == nil {
-			lbp.Logger.Info("Trying automatic kernel headers download")
+			lbp.Logger.Info("Trying automatic kernel headers download.")
 			kernelDownloadScript, err := builder.KernelDownloadScript(realBuilder, nil, kr, lbp.Printer)
 			// Patch kernel download script to echo KERNELDIR.
 			// We need to capture KERNELDIR to later pass it as env variable to the build.
@@ -90,19 +90,19 @@ func (lbp *LocalBuildProcessor) Start(b *builder.Build) error {
 					for scanner.Scan() {
 						path = scanner.Text()
 					}
-					lbp.Logger.Info("Setting KERNELDIR env var", lbp.Logger.Args("path", path))
+					lbp.Logger.Info("Setting KERNELDIR env var.", lbp.Logger.Args("path", path))
 					// add the kerneldir path to env
 					lbp.envMap[kernelDirEnv] = path
 					defer func() {
 						_ = os.RemoveAll("/tmp/kernel-download")
 						_ = os.RemoveAll(path)
 					}()
 				} else {
-					lbp.Logger.Warn("Failed to download headers", lbp.Logger.Args("err", err))
+					lbp.Logger.Warn("Failed to download headers.", lbp.Logger.Args("err", err))
 				}
 			}
 		} else {
-			lbp.Logger.Info("Skipping kernel headers automatic download", lbp.Logger.Args("err", err))
+			lbp.Logger.Info("Skipping kernel headers automatic download.", lbp.Logger.Args("err", err))
 		}
 	}
 
@@ -202,7 +202,7 @@ func (lbp *LocalBuildProcessor) Start(b *builder.Build) error {
 				if err = copyDataToLocalPath(srcProbePath, c.ProbeFilePath); err != nil {
 					return err
 				}
-				lbp.Logger.Info("eBPF probe available", lbp.Logger.Args("path", c.ProbeFilePath))
+				lbp.Logger.Info("eBPF probe available.", lbp.Logger.Args("path", c.ProbeFilePath))
 				c.ProbeFilePath = ""
 			}
 		}
@@ -218,15 +218,15 @@ func (lbp *LocalBuildProcessor) Start(b *builder.Build) error {
 				if err = copyDataToLocalPath(koFiles[0], c.ModuleFilePath); err != nil {
 					return err
 				}
-				lbp.Logger.Info("kernel module available", lbp.Logger.Args("path", b.ModuleFilePath))
+				lbp.Logger.Info("kernel module available.", lbp.Logger.Args("path", b.ModuleFilePath))
 				c.ModuleFilePath = ""
 				break
 			} else {
 				// print dkms build log
 				dkmsLogFile := fmt.Sprintf("/var/lib/dkms/%s/%s/build/make.log", c.DriverName, c.DriverVersion)
 				logs, err := os.ReadFile(filepath.Clean(dkmsLogFile))
 				if err != nil {
-					lbp.Logger.Warn("Running dkms build failed, couldn't find dkms log", lbp.Logger.Args("file", dkmsLogFile))
+					lbp.Logger.Warn("Running dkms build failed, couldn't find dkms log.", lbp.Logger.Args("file", dkmsLogFile))
 				} else {
 					lbp.Logger.Warn("Running dkms build failed. Dumping dkms log.", lbp.Logger.Args("file", dkmsLogFile))
 					logBuf := bytes.NewBuffer(logs)
@@ -241,7 +241,7 @@ func (lbp *LocalBuildProcessor) Start(b *builder.Build) error {
 	}
 
 	if c.ModuleFilePath != "" || c.ProbeFilePath != "" {
-		return fmt.Errorf("Failed to build all requested drivers.")
+		return errors.New("failed to build all requested drivers")
 	}
 	return nil
 }