modules can not be stored in multiple files using the gen-modules type

README.md

@@ -37,6 +37,7 @@ Each module specifies a specific step needed to build the image. Each module has
 ```yaml
 name: module-name
 type: module-type
+path: modules-path
 source:
   packages: module-source-packages
   path: module-source-path
@@ -52,7 +53,8 @@ modules: {}
 ### Description of Fields
 
 *   `name`: a string representing the name of the module. This will be used as the identifier for the module so it must be unique.
-*   `type`: a string indicating the type of module. Currently, the supported types are "apt", "cmake", "dpkg", "dpkg-buildpackage", "go", "make" and "meson".
+*   `type`: a string indicating the type of module. Currently, the supported types are "apt", "cmake", "dpkg", "dpkg-buildpackage", "go", "make", "meson" and "gen-modules".
+*   `path`: a string indicating the path where the modules to generate are located. Only used if type is "gen-modules".
 *   `source`: an object containing the information necessary to retrieve the source code for the module. The fields within this object depend on the module type.
     *   `packages`: a string indicating the name of the package(s) to install, only used if type is "apt".
     *   `paths`: a list of strings indicating the path to .deb files (or just a list of prefixes to search for .deb files) when used with"dpkg" or "dpkg-buildpackage", or a list of paths to .inst files which contain a list of packages to install when used with "apt".

core/loader.go

@@ -96,5 +96,59 @@ func LoadRecipe(path string) (*Recipe, error) {
 		}
 	}
 
+	// here we expand modules of type "gen-modules"
+	newRecipeModules := []Module{}
+
+	for _, module := range recipe.Modules {
+		if module.Type == "gen-modules" {
+			genModulePaths, err := filepath.Glob(filepath.Join(recipe.ParentPath, module.Path, "*.yml"))
+			if err != nil {
+				return nil, err
+			}
+
+			genModules := []Module{}
+
+			for _, genModulePath := range genModulePaths {
+				genModule, err := GenModule(genModulePath)
+
+				if err != nil {
+					return nil, err
+				}
+
+				genModules = append(genModules, genModule)
+			}
+
+			newRecipeModules = append(newRecipeModules, genModules...)
+			continue
+		}
+
+		newRecipeModules = append(newRecipeModules, module)
+	}
+
+	recipe.Modules = newRecipeModules
+
 	return recipe, nil
 }
+
+// GenModule generate a Module struct from a module path
+func GenModule(modulePath string) (Module, error) {
+	module := &Module{}
+
+	moduleFile, err := os.Open(modulePath)
+	if err != nil {
+		return *module, err
+	}
+	defer moduleFile.Close()
+
+	moduleYAML, err := io.ReadAll(moduleFile)
+	if err != nil {
+		return *module, err
+	}
+
+	err = yaml.Unmarshal(moduleYAML, module)
+	if err != nil {
+		return *module, err
+	}
+
+	return *module, nil
+}

core/structs.go

@@ -17,6 +17,7 @@ type Recipe struct {
 type Module struct {
 	Name       string            `json:"name"`
 	Type       string            `json:"type"`
+	Path       string            `json:"path"`
 	Source     Source            `json:"source"`
 	Modules    []Module          `json:"modules"`
 	BuildFlags string            `json:"buildFlags"`

example/Containerfile

@@ -6,4 +6,6 @@ ADD includes.container /
 ADD sources /sources
 RUN apt install -y libbtrfs-dev 
 RUN cd /sources/abroot-git && go build -o abroot-git
-RUN apt install -y base-files  apx abroot ikaros vanilla-system-operator 
+RUN apt install -y curl 
+RUN apt install -y base-files apx abroot ikaros vanilla-system-operator 
+RUN apt install -y nano 

example/example.yml

@@ -6,6 +6,7 @@ args:
   DEBIAN_FRONTEND: noninteractive
 runs:
 - echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/01norecommends
+
 modules:
 - name: abroot-git
   type: go
@@ -21,8 +22,13 @@ modules:
     source:
       packages:
       - libbtrfs-dev
-- name: vanilla-packages
+
+- name: packages
   type: apt
   source:
     paths:
-    - inst/00-vanilla
+    - inst/00-test
+
+- name: packages-modules
+  type: gen-modules
+  path: modules

example/inst/00-test.inst

@@ -0,0 +1 @@
+curl

example/modules/00-vanilla.yml

@@ -0,0 +1,10 @@
+name: vanilla-packages
+type: apt
+source:
+  packages:
+  - base-files
+  - apx
+  - abroot
+  - ikaros
+  - vanilla-system-operator
+

example/modules/10-test.yml

@@ -0,0 +1,6 @@
+name: test
+type: apt
+source:
+  packages:
+  - nano
+

main.go

@@ -5,7 +5,7 @@ import (
 )
 
 var (
-	Version = "0.1.0"
+	Version = "0.2.0"
 )
 
 func main() {