Support includes also on packages coming from unpacked images

pkg/compiler/compiler.go

@@ -20,6 +20,8 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
+	"strings"
 	"sync"
 
 	. "github.com/mudler/luet/pkg/logger"
@@ -158,6 +160,60 @@ func (cs *LuetCompiler) CompileParallel(concurrency int, keepPermissions bool, p
 	return artifacts, allErrors
 }
 
+func (cs *LuetCompiler) stripIncludesFromRootfs(includes []string, rootfs string) error {
+	var includeRegexp []*regexp.Regexp
+	for _, i := range includes {
+		r, e := regexp.Compile(i)
+		if e != nil {
+			return errors.Wrap(e, "Could not compile regex in the include of the package")
+		}
+		includeRegexp = append(includeRegexp, r)
+	}
+
+	toRemove := []string{}
+
+	// the function that handles each file or dir
+	var ff = func(currentpath string, info os.FileInfo, err error) error {
+
+		// if info.Name() != DefinitionFile {
+		// 	return nil // Skip with no errors
+		// }
+		if currentpath == rootfs {
+			return nil
+		}
+
+		abspath := strings.ReplaceAll(currentpath, rootfs, "")
+
+		match := false
+
+		for _, i := range includeRegexp {
+			if i.MatchString(abspath) {
+				match = true
+			}
+		}
+
+		if !match {
+			toRemove = append(toRemove, currentpath)
+		}
+
+		return nil
+	}
+
+	err := filepath.Walk(rootfs, ff)
+	if err != nil {
+		return err
+	}
+
+	for _, s := range toRemove {
+		e := os.RemoveAll(s)
+		if e != nil {
+			Warning("Failed removing", s, e.Error())
+			return e
+		}
+	}
+	return nil
+}
+
 func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage string, concurrency int, keepPermissions, keepImg bool, p CompilationSpec) (Artifact, error) {
 	pkgTag := ":package:  " + p.GetPackage().GetName()
 
@@ -280,6 +336,12 @@ func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage
 	}
 
 	if p.ImageUnpack() {
+
+		if len(p.GetIncludes()) > 0 {
+			// strip from includes
+			cs.stripIncludesFromRootfs(p.GetIncludes(), rootfs)
+		}
+
 		err = helpers.Tar(rootfs, p.Rel(p.GetPackage().GetFingerPrint()+".package.tar"))
 		if err != nil {
 			return nil, errors.Wrap(err, "Error met while creating package archive")

pkg/compiler/compiler_test.go

@@ -238,6 +238,44 @@ var _ = Describe("Compiler", func() {
 			Expect(helpers.Exists(spec.Rel("test6"))).ToNot(BeTrue())
 		})
 
+		It("Compiles and includes ony wanted files also from unpacked packages", func() {
+			generalRecipe := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
+			tmpdir, err := ioutil.TempDir("", "package")
+			Expect(err).ToNot(HaveOccurred())
+			defer os.RemoveAll(tmpdir) // clean up
+
+			err = generalRecipe.Load("../../tests/fixtures/includeimage")
+			Expect(err).ToNot(HaveOccurred())
+
+			Expect(len(generalRecipe.GetDatabase().GetPackages())).To(Equal(2))
+
+			compiler := NewLuetCompiler(sd.NewSimpleDockerBackend(), generalRecipe.GetDatabase())
+
+			spec, err := compiler.FromPackage(&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"})
+			Expect(err).ToNot(HaveOccurred())
+
+			//		err = generalRecipe.Tree().ResolveDeps(3)
+			//		Expect(err).ToNot(HaveOccurred())
+
+			spec.SetOutputPath(tmpdir)
+
+			artifacts, errs := compiler.CompileParallel(1, false, NewLuetCompilationspecs(spec))
+			Expect(errs).To(BeNil())
+			Expect(len(artifacts)).To(Equal(1))
+
+			for _, artifact := range artifacts {
+				Expect(helpers.Exists(artifact.GetPath())).To(BeTrue())
+				Expect(helpers.Untar(artifact.GetPath(), tmpdir, false)).ToNot(HaveOccurred())
+			}
+			Expect(helpers.Exists(spec.Rel("var/lib/udhcpd"))).To(BeTrue())
+			Expect(helpers.Exists(spec.Rel("marvin"))).To(BeTrue())
+			Expect(helpers.Exists(spec.Rel("test5"))).ToNot(BeTrue())
+			Expect(helpers.Exists(spec.Rel("test6"))).ToNot(BeTrue())
+			Expect(helpers.Exists(spec.Rel("test"))).ToNot(BeTrue())
+			Expect(helpers.Exists(spec.Rel("test2"))).ToNot(BeTrue())
+			Expect(helpers.Exists(spec.Rel("lib/firmware"))).ToNot(BeTrue())
+		})
+
 		It("Compiles a more complex tree", func() {
 			generalRecipe := tree.NewCompilerRecipe(pkg.NewInMemoryDatabase(false))
 			tmpdir, err := ioutil.TempDir("", "package")