Configure combustion components

Signed-off-by: Atanas Dinov <[email protected]>

cmd/eib/main.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/suse-edge/edge-image-builder/pkg/build"
+	"github.com/suse-edge/edge-image-builder/pkg/combustion"
 	"github.com/suse-edge/edge-image-builder/pkg/config"
 	"github.com/suse-edge/edge-image-builder/pkg/context"
 	"go.uber.org/zap"
@@ -50,7 +51,7 @@ func processArgs() (*config.ImageConfig, *context.Context, error) {
 		return nil, nil, fmt.Errorf("validating the config dir %s: %w", configDir, err)
 	}
 
-	ctx, err := context.NewContext(configDir, buildDir, deleteBuildDir)
+	ctx, err := context.NewContext(configDir, buildDir, deleteBuildDir, imageConfig)
 	if err != nil {
 		return nil, nil, fmt.Errorf("building dir structure: %w", err)
 	}
@@ -117,7 +118,7 @@ func main() {
 		zap.L().Fatal("CLI arguments could not be parsed", zap.Error(err))
 	}
 
-	builder := build.New(imageConfig, ctx)
+	builder := build.New(imageConfig, ctx, combustion.Configure)
 	if err = builder.Build(); err != nil {
 		zap.L().Fatal("An error occurred building the image", zap.Error(err))
 	}

pkg/build/build.go

@@ -2,69 +2,31 @@ package build
 
 import (
 	"fmt"
-	"os"
 	"path/filepath"
 
-	"github.com/suse-edge/edge-image-builder/pkg/combustion"
 	"github.com/suse-edge/edge-image-builder/pkg/config"
 	"github.com/suse-edge/edge-image-builder/pkg/context"
-	"github.com/suse-edge/edge-image-builder/pkg/fileio"
 )
 
+type configureCombustion func(ctx *context.Context) error
+
 type Builder struct {
-	imageConfig *config.ImageConfig
-	context     *context.Context
+	imageConfig         *config.ImageConfig
+	context             *context.Context
+	configureCombustion configureCombustion
 }
 
-func New(imageConfig *config.ImageConfig, context *context.Context) *Builder {
+func New(imageConfig *config.ImageConfig, ctx *context.Context, configureCombustionFunc configureCombustion) *Builder {
 	return &Builder{
-		imageConfig: imageConfig,
-		context:     context,
+		imageConfig:         imageConfig,
+		context:             ctx,
+		configureCombustion: configureCombustionFunc,
 	}
 }
 
 func (b *Builder) Build() error {
-	var combustionScripts []string
-
-	messageScript, err := b.configureMessage()
-	if err != nil {
-		return fmt.Errorf("configuring the welcome message: %w", err)
-	}
-
-	combustionScripts = append(combustionScripts, messageScript)
-
-	customScripts, err := b.configureCustomScripts()
-	if err != nil {
-		return fmt.Errorf("configuring custom scripts: %w", err)
-	}
-
-	combustionScripts = append(combustionScripts, customScripts...)
-
-	userScript, err := b.configureUsers()
-	if err != nil {
-		return fmt.Errorf("configuring users: %w", err)
-	}
-
-	if userScript != "" {
-		combustionScripts = append(combustionScripts, userScript)
-	}
-
-	rpmScript, err := b.processRPMs()
-	if err != nil {
-		return fmt.Errorf("processing RPMs: %w", err)
-	}
-
-	if rpmScript != "" {
-		combustionScripts = append(combustionScripts, rpmScript)
-	}
-
-	script, err := combustion.GenerateScript(combustionScripts)
-	if err != nil {
-		return fmt.Errorf("generating combustion script: %w", err)
-	}
-
-	if err = os.WriteFile("script", []byte(script), fileio.ExecutablePerms); err != nil {
-		return fmt.Errorf("writing combustion script: %w", err)
+	if err := b.configureCombustion(b.context); err != nil {
+		return fmt.Errorf("configuring combustion: %w", err)
 	}
 
 	switch b.imageConfig.Image.ImageType {
@@ -82,10 +44,6 @@ func (b *Builder) generateBuildDirFilename(filename string) string {
 	return filepath.Join(b.context.BuildDir, filename)
 }
 
-func (b *Builder) generateCombustionDirFilename(filename string) string {
-	return filepath.Join(b.context.CombustionDir, filename)
-}
-
 func (b *Builder) generateOutputImageFilename() string {
 	filename := filepath.Join(b.context.ImageConfigDir, b.imageConfig.Image.OutputImageName)
 	return filename

pkg/build/build_test.go

@@ -1,6 +1,7 @@
 package build
 
 import (
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -9,38 +10,18 @@ import (
 	"github.com/suse-edge/edge-image-builder/pkg/context"
 )
 
-func TestGenerateCombustionDirFilename(t *testing.T) {
-	// Setup
-	ctx, err := context.NewContext("", "", true)
-	require.NoError(t, err)
-	defer func() {
-		assert.NoError(t, context.CleanUpBuildDir(ctx))
-	}()
-
-	builder := Builder{
-		context: ctx,
-	}
-
-	testFilename := "combustion-file.sh"
-
-	// Test
-	filename := builder.generateCombustionDirFilename(testFilename)
-
-	// Verify
-	expectedFilename := filepath.Join(ctx.CombustionDir, testFilename)
-	assert.Equal(t, expectedFilename, filename)
-}
-
 func TestGenerateBuildDirFilename(t *testing.T) {
 	// Setup
-	ctx, err := context.NewContext("", "", true)
+	tmpDir, err := os.MkdirTemp("", "eib-")
 	require.NoError(t, err)
 	defer func() {
-		assert.NoError(t, context.CleanUpBuildDir(ctx))
+		assert.NoError(t, os.RemoveAll(tmpDir))
 	}()
 
 	builder := Builder{
-		context: ctx,
+		context: &context.Context{
+			BuildDir: tmpDir,
+		},
 	}
 
 	testFilename := "build-dir-file.sh"
@@ -49,6 +30,6 @@ func TestGenerateBuildDirFilename(t *testing.T) {
 	filename := builder.generateBuildDirFilename(testFilename)
 
 	// Verify
-	expectedFilename := filepath.Join(ctx.BuildDir, testFilename)
+	expectedFilename := filepath.Join(builder.context.BuildDir, testFilename)
 	require.Equal(t, expectedFilename, filename)
 }

pkg/build/grub_test.go

@@ -10,12 +10,13 @@ import (
 
 func TestGenerateGRUBGuestfishCommands(t *testing.T) {
 	// Setup
-	imageConfig := config.ImageConfig{
-		OperatingSystem: config.OperatingSystem{
-			KernelArgs: []string{"alpha", "beta"},
+	builder := Builder{
+		imageConfig: &config.ImageConfig{
+			OperatingSystem: config.OperatingSystem{
+				KernelArgs: []string{"alpha", "beta"},
+			},
 		},
 	}
-	builder := New(&imageConfig, nil)
 
 	// Test
 	commandString, err := builder.generateGRUBGuestfishCommands()
@@ -33,10 +34,11 @@ func TestGenerateGRUBGuestfishCommands(t *testing.T) {
 
 func TestGenerateGRUBGuestfishCommandsNoArgs(t *testing.T) {
 	// Setup
-	imageConfig := config.ImageConfig{
-		OperatingSystem: config.OperatingSystem{},
+	builder := Builder{
+		imageConfig: &config.ImageConfig{
+			OperatingSystem: config.OperatingSystem{},
+		},
 	}
-	builder := New(&imageConfig, nil)
 
 	// Test
 	commandString, err := builder.generateGRUBGuestfishCommands()

pkg/build/iso_test.go

@@ -17,15 +17,16 @@ func TestDeleteNoExistingImage(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpDir)
 
-	imageConfig := config.ImageConfig{
-		Image: config.Image{
-			OutputImageName: "not-there",
+	builder := Builder{
+		imageConfig: &config.ImageConfig{
+			Image: config.Image{
+				OutputImageName: "not-there",
+			},
+		},
+		context: &context.Context{
+			ImageConfigDir: tmpDir,
 		},
 	}
-	ctx := context.Context{
-		ImageConfigDir: tmpDir,
-	}
-	builder := New(&imageConfig, &ctx)
 
 	// Test
 	err = builder.deleteExistingOutputIso()
@@ -40,15 +41,16 @@ func TestDeleteExistingImage(t *testing.T) {
 	require.NoError(t, err)
 	defer os.RemoveAll(tmpDir)
 
-	imageConfig := config.ImageConfig{
-		Image: config.Image{
-			OutputImageName: "not-there",
+	builder := Builder{
+		imageConfig: &config.ImageConfig{
+			Image: config.Image{
+				OutputImageName: "not-there",
+			},
+		},
+		context: &context.Context{
+			ImageConfigDir: tmpDir,
 		},
 	}
-	ctx := context.Context{
-		ImageConfigDir: tmpDir,
-	}
-	builder := New(&imageConfig, &ctx)
 
 	_, err = os.Create(builder.generateOutputImageFilename())
 	require.NoError(t, err)
@@ -66,17 +68,18 @@ func TestDeleteExistingImage(t *testing.T) {
 
 func TestCreateXorrisoCommand(t *testing.T) {
 	// Setup
-	imageConfig := config.ImageConfig{
-		Image: config.Image{
-			BaseImage:       "base-image",
-			OutputImageName: "build-image",
+	builder := Builder{
+		imageConfig: &config.ImageConfig{
+			Image: config.Image{
+				BaseImage:       "base-image",
+				OutputImageName: "build-image",
+			},
+		},
+		context: &context.Context{
+			ImageConfigDir: "config-dir",
+			CombustionDir:  "combustion",
 		},
 	}
-	ctx := context.Context{
-		ImageConfigDir: "config-dir",
-		CombustionDir:  "combustion",
-	}
-	builder := New(&imageConfig, &ctx)
 
 	// Test
 	cmd, logfile, err := builder.createXorrisoCommand()