Tag 0.20.2

Currently we are setting the error message in a no-space full sentence
which is pretty ugly:

| FATA[0000] Pluginluet-cosignat/usr/local/bin/luet-cosignErrorerror while executing plugin: exit status 1

Signed-off-by: Itxaka <igarcia@suse.com>

cmd/root.go

@@ -30,7 +30,7 @@ var cfgFile string
 var Verbose bool
 
 const (
-	LuetCLIVersion = "0.20.0"
+	LuetCLIVersion = "0.20.2"
 	LuetEnvPrefix  = "LUET"
 )
 

pkg/api/core/bus/events.go

@@ -1,6 +1,7 @@
 package bus
 
 import (
+	"fmt"
 	"github.com/mudler/go-pluggable"
 	"github.com/mudler/luet/pkg/api/core/types"
 )
@@ -88,7 +89,8 @@ func (b *Bus) Initialize(ctx *types.Context, plugin ...string) {
 	for _, e := range b.Manager.Events {
 		b.Manager.Response(e, func(p *pluggable.Plugin, r *pluggable.EventResponse) {
 			if r.Errored() {
-				ctx.Fatal("Plugin", p.Name, "at", p.Executable, "Error", r.Error)
+				err := fmt.Sprintf("Plugin %s at %s had an error: %s", p.Name, p.Executable, r.Error)
+				ctx.Fatal(err)
 			}
 			ctx.Debug(
 				"plugin_event",

pkg/api/core/image/extract.go

@@ -46,18 +46,42 @@ func ExtractDeltaFiles(
 	includeRegexp := compileRegexes(includes)
 	excludeRegexp := compileRegexes(excludes)
 
+	additions := map[string]interface{}{}
+	for _, a := range d.Additions {
+		additions[a.Name] = nil
+	}
 	return func(h *tar.Header) (bool, error) {
 		fileName := filepath.Join(string(os.PathSeparator), h.Name)
-		ctx.Debug("Includes", includes)
-		ctx.Debug("Excludes", excludes)
-		ctx.Debug("Additions", d.Additions)
+		_, exists := additions[h.Name]
+		if !exists {
+			return false, nil
+		}
+
 		switch {
 		case len(includes) == 0 && len(excludes) != 0:
-			for _, a := range d.Additions {
-				if h.Name == a.Name {
-					for _, i := range excludeRegexp {
-						if i.MatchString(filepath.Join(string(os.PathSeparator), a.Name)) &&
-							fileName == filepath.Join(string(os.PathSeparator), a.Name) {
+			for _, i := range excludeRegexp {
+				if i.MatchString(filepath.Join(string(os.PathSeparator), h.Name)) &&
+					fileName == filepath.Join(string(os.PathSeparator), h.Name) {
+					return false, nil
+				}
+			}
+			ctx.Debug("Adding name", fileName)
+
+			return true, nil
+		case len(includes) > 0 && len(excludes) == 0:
+			for _, i := range includeRegexp {
+				if i.MatchString(filepath.Join(string(os.PathSeparator), h.Name)) && fileName == filepath.Join(string(os.PathSeparator), h.Name) {
+					ctx.Debug("Adding name", fileName)
+
+					return true, nil
+				}
+			}
+			return false, nil
+		case len(includes) != 0 && len(excludes) != 0:
+			for _, i := range includeRegexp {
+				if i.MatchString(filepath.Join(string(os.PathSeparator), h.Name)) && fileName == filepath.Join(string(os.PathSeparator), h.Name) {
+					for _, e := range excludeRegexp {
+						if e.MatchString(fileName) {
 							return false, nil
 						}
 					}
@@ -66,43 +90,11 @@ func ExtractDeltaFiles(
 					return true, nil
 				}
 			}
-			return false, nil
-		case len(includes) > 0 && len(excludes) == 0:
-			for _, a := range d.Additions {
-				for _, i := range includeRegexp {
-					if i.MatchString(filepath.Join(string(os.PathSeparator), a.Name)) && fileName == filepath.Join(string(os.PathSeparator), a.Name) {
-						ctx.Debug("Adding name", fileName)
 
-						return true, nil
-					}
-				}
-			}
-			return false, nil
-		case len(includes) != 0 && len(excludes) != 0:
-			for _, a := range d.Additions {
-				for _, i := range includeRegexp {
-					if i.MatchString(filepath.Join(string(os.PathSeparator), a.Name)) && fileName == filepath.Join(string(os.PathSeparator), a.Name) {
-						for _, e := range excludeRegexp {
-							if e.MatchString(fileName) {
-								return false, nil
-							}
-						}
-						ctx.Debug("Adding name", fileName)
-
-						return true, nil
-					}
-				}
-			}
 			return false, nil
 		default:
-			for _, a := range d.Additions {
-				if fileName == filepath.Join(string(os.PathSeparator), a.Name) {
-					ctx.Debug("Adding name", fileName)
-
-					return true, nil
-				}
-			}
-			return false, nil
+			ctx.Debug("Adding name", fileName)
+			return true, nil
 		}
 
 	}

pkg/compiler/backend/simpledocker.go

@@ -144,7 +144,7 @@ func (s *SimpleDocker) ImageReference(a string) (v1.Image, error) {
 		return nil, err
 	}
 
-	img, err := daemon.Image(ref)
+	img, err := daemon.Image(ref, daemon.WithUnbufferedOpener())
 	if err != nil {
 		return nil, err
 	}

pkg/compiler/compiler.go

@@ -227,6 +227,13 @@ func (cs *LuetCompiler) stripFromRootfs(includes []string, rootfs string, includ
 }
 
 func (cs *LuetCompiler) unpackFs(concurrency int, keepPermissions bool, p *compilerspec.LuetCompilationSpec, runnerOpts backend.Options) (*artifact.PackageArtifact, error) {
+
+	if !cs.Backend.ImageExists(runnerOpts.ImageName) {
+		if err := cs.Backend.DownloadImage(runnerOpts); err != nil {
+			return nil, errors.Wrap(err, "failed pulling image "+runnerOpts.ImageName+" during extraction")
+		}
+	}
+
 	img, err := cs.Backend.ImageReference(runnerOpts.ImageName)
 	if err != nil {
 		return nil, err
@@ -287,10 +294,18 @@ func (cs *LuetCompiler) unpackDelta(concurrency int, keepPermissions bool, p *co
 	defer os.RemoveAll(rootfs) // clean up
 
 	pkgTag := ":package: " + p.GetPackage().HumanReadableString()
-	if cs.Options.PullFirst && !cs.Backend.ImageExists(builderOpts.ImageName) && cs.Backend.ImageAvailable(builderOpts.ImageName) {
-		err := cs.Backend.DownloadImage(builderOpts)
-		if err != nil {
-			return nil, errors.Wrap(err, "Could not pull image")
+	if cs.Options.PullFirst {
+		if !cs.Backend.ImageExists(builderOpts.ImageName) {
+			err := cs.Backend.DownloadImage(builderOpts)
+			if err != nil {
+				return nil, errors.Wrap(err, "Could not pull image")
+			}
+		}
+		if !cs.Backend.ImageExists(runnerOpts.ImageName) {
+			err := cs.Backend.DownloadImage(runnerOpts)
+			if err != nil {
+				return nil, errors.Wrap(err, "Could not pull image")
+			}
 		}
 	}