refactor(packager): embed scripts via go:embed, fix JSON escaping, share MarshalToString, add integration harness (phase 6)

Author: sozercan

internal/testutil/llb.go

@@ -0,0 +1,20 @@
+// Package testutil provides small shared helpers for tests across the aikit
+// packages. It lives in a non-test file so it can be imported from _test.go
+// files in other packages.
+package testutil
+
+import "github.com/moby/buildkit/client/llb"
+
+// MarshalToString concatenates the marshaled protobuf operations of an LLB
+// definition into a single string. Tests use it to assert that an expected
+// command or source identifier appears somewhere in the produced LLB graph.
+func MarshalToString(def *llb.Definition) string {
+	if def == nil {
+		return ""
+	}
+	var combined []byte
+	for _, d := range def.ToPB().Def {
+		combined = append(combined, d...)
+	}
+	return string(combined)
+}

pkg/packager/build.go

@@ -6,6 +6,7 @@ package packager
 import (
 	"context"
 	"fmt"
+	"sort"
 
 	"github.com/kaito-project/aikit/pkg/utils"
 	"github.com/moby/buildkit/client/llb"
@@ -111,12 +112,14 @@ func BuildModelpack(ctx context.Context, c client.Client) (*client.Result, error
 
 	artifactType := v1.ArtifactTypeModelManifest
 	mtManifest := v1.MediaTypeModelConfig
-	script := generateModelpackScript(cfg.packMode, artifactType, mtManifest, cfg.name, cfg.refName)
+	env := modelpackScriptEnv(cfg.packMode, artifactType, mtManifest, cfg.name, cfg.refName)
 
-	run := llb.Image(bashImage).Run(
-		llb.Args([]string{"bash", "-c", script}),
+	runOpts := []llb.RunOption{
+		llb.Args([]string{"bash", "-c", modelpackScript}),
 		llb.AddMount("/src", modelState, llb.Readonly),
-	)
+	}
+	runOpts = append(runOpts, envRunOptions(env)...)
+	run := llb.Image(bashImage).Run(runOpts...)
 	final := llb.Scratch().File(llb.Copy(run.Root(), "/layout/", "/"))
 
 	return solveAndBuildResult(ctx, c, final, "packager:modelpack")
@@ -146,17 +149,34 @@ func BuildGeneric(ctx context.Context, c client.Client) (*client.Result, error)
 	}
 
 	artifactType := "application/vnd.unknown.artifact.v1"
-	script := generateGenericScript(cfg.packMode, artifactType, cfg.name, cfg.refName, cfg.debug)
+	env := genericScriptEnv(cfg.packMode, artifactType, cfg.name, cfg.refName, cfg.debug)
 
-	run := llb.Image(bashImage).Run(
-		llb.Args([]string{"bash", "-c", script}),
+	runOpts := []llb.RunOption{
+		llb.Args([]string{"bash", "-c", genericScript}),
 		llb.AddMount("/src", srcState, llb.Readonly),
-	)
+	}
+	runOpts = append(runOpts, envRunOptions(env)...)
+	run := llb.Image(bashImage).Run(runOpts...)
 	final := llb.Scratch().File(llb.Copy(run.Root(), "/layout/", "/"))
 
 	return solveAndBuildResult(ctx, c, final, "packager:generic")
 }
 
+// envRunOptions converts an environment map into a deterministically ordered
+// slice of llb.RunOption values (sorted by key so the produced LLB is stable).
+func envRunOptions(env map[string]string) []llb.RunOption {
+	keys := make([]string, 0, len(env))
+	for k := range env {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	opts := make([]llb.RunOption, 0, len(keys))
+	for _, k := range keys {
+		opts = append(opts, llb.AddEnv(k, env[k]))
+	}
+	return opts
+}
+
 func getBuildArg(opts map[string]string, k string) string {
 	return utils.GetBuildArg(opts, k)
 }