Merge branch 'main' into kernel_version_pin

Author: samueltaripin

.coverage-threshold

@@ -1 +1 @@
-65.9
+66.2

docs/index.md

@@ -2,7 +2,7 @@
 
 OS Image Composer is a command-line tool for building custom, bootable Linux
 images from pre-built packages. Define your requirements in a YAML template,
-run one command to get a RAW image ready to deploy (ISO installers require an extra step; see the Installation Guide).
+run one command to get a RAW image ready for deployment (ISO installers require an extra step; see the Installation Guide).
 
 **Supported distributions:** Azure Linux (azl3),
 [Edge Microvisor Toolkit](https://docs.openedgeplatform.intel.com/2026.0/edge-microvisor-toolkit/index.html)
@@ -70,14 +70,15 @@ For build options (Earthly, Debian package) and prerequisite details, see the
 :::{toctree}
 :hidden:
 
-Installation Guide <tutorial/installation.md>
-Prerequisites <tutorial/prerequisite.md>
-Architecture <architecture.md>
-Usage Guide <tutorial/usage-guide.md>
-Secure Boot Configuration <tutorial/configure-secure-boot.md>
-Configure Users <tutorial/configure-image-user.md>
-Customize Image Build <tutorial/configure-additional-actions-for-build.md>
-Configure Multiple Package Repositories <tutorial/configure-multiple-package-repositories.md>
+Installation Guide <./tutorial/installation.md>
+Prerequisites <./tutorial/prerequisite.md>
+Architecture <./architecture.md>
+Usage Guide <./tutorial/usage-guide.md>
+Secure Boot Configuration <./tutorial/configure-secure-boot.md>
+Configure Users <./tutorial/configure-image-user.md>
+Customize Image Build <./tutorial/configure-additional-actions-for-build.md>
+Configure Multiple Package Repositories <./tutorial/configure-multiple-package-repositories.md>
+AI Template Generation (RAG) <./tutorial/ai-template-generation.md>
 release-notes.md
 
 :::

image-templates/emt3-x86_64-edge-raw.yml

@@ -41,6 +41,11 @@ packageRepositories:
     pkey: "<PUBLIC_KEY_URL>" # Uncomment and replace in real config
     component: "restricted"
 
+  # - codename: "localrpm"
+  #   path: "/data/os-image-composer/localrpm" # Uncomment and replace with local path
+  #   pkey: "[trusted=yes]" # Make sure to put trusted
+  #   component: "main" # Make sure to put main or leave empty
+
 # Disk configuration can be omitted to use defaults from default template
 # If specified, it will override the default disk configuration completely
 

image-templates/ubuntu24-x86_64-edge-raw.yml

@@ -40,6 +40,11 @@ packageRepositories:
     pkey: "<PUBLIC_KEY_URL>" # Uncomment and replace in real config
     component: "restricted"
 
+  # - codename: "localdeb"
+  #   path: "/data/os-image-composer/localdeb" # Uncomment and replace with local path
+  #   pkey: "[trusted=yes]" # Make sure to put trusted
+  #   component: "main" # Make sure to put main or leave empty
+
 systemConfig:
   name: edge
   description: edge ubuntu image with immutable rootfs

internal/config/apt_sources_test.go

@@ -387,6 +387,34 @@ func TestGenerateAptSourcesFromRepositories_NonDEBSystem(t *testing.T) {
 	}
 }
 
+func TestGenerateAptSourcesFromRepositories_PathOnlyRepo(t *testing.T) {
+	template := &ImageTemplate{
+		Target: TargetInfo{
+			OS: "ubuntu",
+		},
+		PackageRepositories: []PackageRepository{
+			{
+				Codename:  "localdeb",
+				Path:      "/data/os-image-composer/localdeb",
+				PKey:      "[trusted=yes]",
+				Component: "main",
+			},
+		},
+		SystemConfig: SystemConfig{
+			AdditionalFiles: []AdditionalFileInfo{},
+		},
+	}
+
+	err := template.GenerateAptSourcesFromRepositories()
+	if err != nil {
+		t.Fatalf("GenerateAptSourcesFromRepositories() failed for path-only repo: %v", err)
+	}
+
+	if len(template.SystemConfig.AdditionalFiles) != 0 {
+		t.Errorf("expected no apt additional files for path-only repo, got %d", len(template.SystemConfig.AdditionalFiles))
+	}
+}
+
 func TestAddUniqueAdditionalFile(t *testing.T) {
 	template := &ImageTemplate{
 		SystemConfig: SystemConfig{
@@ -618,6 +646,13 @@ func TestNormalizeRepositoryPriorities(t *testing.T) {
 	}
 }
 
+func TestNormalizeRepositoryPriorities_NilInput(t *testing.T) {
+	result := normalizeRepositoryPriorities(nil)
+	if len(result) != 0 {
+		t.Errorf("expected empty result for nil input, got len=%d", len(result))
+	}
+}
+
 func TestGetRepositoryName(t *testing.T) {
 	tests := []struct {
 		name     string

internal/config/config.go

@@ -45,7 +45,8 @@ type DiskConfig struct {
 type PackageRepository struct {
 	ID            string   `yaml:"id,omitempty"`            // Auto-assigned
 	Codename      string   `yaml:"codename"`                // Repository identifier/codename
-	URL           string   `yaml:"url"`                     // Repository base URL
+	URL           string   `yaml:"url,omitempty"`           // Repository base URL
+	Path          string   `yaml:"path,omitempty"`          // Local directory path for file-based repositories
 	PKey          string   `yaml:"pkey"`                    // Public GPG key URL for verification
 	PKeys         []string `yaml:"pkeys,omitempty"`         // Multiple public GPG key URLs for verification
 	Component     string   `yaml:"component,omitempty"`     // Repository component (e.g., "main", "restricted")
@@ -268,6 +269,10 @@ func parseYAMLTemplate(data []byte, validateFull bool) (*ImageTemplate, error) {
 		return nil, fmt.Errorf("template parsing failed: invalid structure: %w", err)
 	}
 
+	if err := template.validatePackageRepositories(); err != nil {
+		return nil, err
+	}
+
 	return &template, nil
 }
 
@@ -946,3 +951,24 @@ func (i *ImmutabilityConfig) UnmarshalYAML(unmarshal func(interface{}) error) er
 func (i *ImmutabilityConfig) WasProvided() bool {
 	return i.wasProvided
 }
+
+func (t *ImageTemplate) validatePackageRepositories() error {
+	for _, repo := range t.PackageRepositories {
+		if err := repo.ValidatePackageRepository(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// ValidatePackageRepository validates that either URL or Path is provided
+func (pr *PackageRepository) ValidatePackageRepository() error {
+	if pr.URL == "" && pr.Path == "" {
+		return fmt.Errorf("repository '%s': either 'url' or 'path' must be provided", pr.Codename)
+	}
+	if pr.URL != "" && pr.Path != "" {
+		return fmt.Errorf("repository '%s': cannot specify both 'url' and 'path', choose one", pr.Codename)
+	}
+	return nil
+}

internal/config/config_test.go

@@ -2427,6 +2427,55 @@ systemConfig:
 	}
 }
 
+func TestLoadTemplateRejectsInvalidPackageRepository(t *testing.T) {
+	yamlContent := `image:
+  name: test-invalid-repo
+  version: "1.0.0"
+
+target:
+  os: azure-linux
+  dist: azl3
+  arch: x86_64
+  imageType: raw
+
+packageRepositories:
+  - codename: "invalid-repo"
+    url: "https://example.com/repo"
+    path: "/tmp/repo"
+    pkey: "https://example.com/key.pub"
+
+systemConfig:
+  name: test
+  packages:
+    - test-package
+  kernel:
+    version: "6.12"
+    cmdline: "quiet"
+`
+
+	tmpFile, err := os.CreateTemp("", "test-invalid-repo-*.yml")
+	if err != nil {
+		t.Fatalf("failed to create temp file: %v", err)
+	}
+	if err := tmpFile.Chmod(0600); err != nil {
+		tmpFile.Close()
+		os.Remove(tmpFile.Name())
+		t.Fatalf("failed to set temp file permissions: %v", err)
+	}
+	defer os.Remove(tmpFile.Name())
+
+	if _, err := tmpFile.WriteString(yamlContent); err != nil {
+		tmpFile.Close()
+		t.Fatalf("failed to write temp file: %v", err)
+	}
+	tmpFile.Close()
+
+	_, err = LoadTemplate(tmpFile.Name(), false)
+	if err == nil {
+		t.Fatal("expected LoadTemplate to reject invalid package repository configuration")
+	}
+}
+
 func TestGlobalConfigSaveWithCreateDirectory(t *testing.T) {
 	config := &GlobalConfig{
 		Workers:   4,
@@ -3206,6 +3255,77 @@ systemConfig:
 	}
 }
 
+func TestPackageRepositoryYAMLParsingLocalPath(t *testing.T) {
+	yamlContent := `image:
+  name: test-local-repo-parsing
+  version: "1.0.0"
+
+target:
+  os: ubuntu
+  dist: ubuntu24
+  arch: x86_64
+  imageType: raw
+
+packageRepositories:
+  - codename: "localdeb"
+    path: "/data/os-image-composer/localdeb"
+    pkey: "[trusted=yes]"
+    component: "main"
+
+systemConfig:
+  name: test
+  packages:
+    - test-package
+  kernel:
+    version: "6.12"
+    cmdline: "quiet"
+`
+
+	tmpFile, err := os.CreateTemp("", "test-local-repo-*.yml")
+	if err != nil {
+		t.Fatalf("failed to create temp file: %v", err)
+	}
+	if err := tmpFile.Chmod(0600); err != nil {
+		tmpFile.Close()
+		os.Remove(tmpFile.Name())
+		return
+	}
+	defer os.Remove(tmpFile.Name())
+
+	if _, err := tmpFile.WriteString(yamlContent); err != nil {
+		t.Fatalf("failed to write temp file: %v", err)
+	}
+	tmpFile.Close()
+
+	template, err := LoadTemplate(tmpFile.Name(), false)
+	if err != nil {
+		t.Fatalf("failed to load YAML template with local package repository: %v", err)
+	}
+
+	repos := template.GetPackageRepositories()
+	if len(repos) != 1 {
+		t.Fatalf("expected 1 parsed repository, got %d", len(repos))
+	}
+
+	repo := template.GetRepositoryByCodename("localdeb")
+	if repo == nil {
+		t.Fatalf("expected to find localdeb repository")
+	}
+
+	if repo.Path != "/data/os-image-composer/localdeb" {
+		t.Errorf("expected repo path '/data/os-image-composer/localdeb', got '%s'", repo.Path)
+	}
+	if repo.PKey != "[trusted=yes]" {
+		t.Errorf("expected repo pkey '[trusted=yes]', got '%s'", repo.PKey)
+	}
+	if repo.Component != "main" {
+		t.Errorf("expected repo component 'main', got '%s'", repo.Component)
+	}
+	if repo.URL != "" {
+		t.Errorf("expected repo URL to be empty for local path repository, got '%s'", repo.URL)
+	}
+}
+
 func TestPackageRepositoriesWithDuplicateCodenames(t *testing.T) {
 	repos := []PackageRepository{
 		{Codename: "duplicate", URL: "https://first.com", PKey: "https://first.com/key.pub"},

internal/config/schema/embed_test.go

@@ -0,0 +1,100 @@
+package schema
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestEmbeddedSchemasNonEmpty(t *testing.T) {
+	tests := []struct {
+		name   string
+		schema []byte
+	}{
+		{"ImageTemplateSchema", ImageTemplateSchema},
+		{"ConfigSchema", ConfigSchema},
+		{"ChrootenvSchema", ChrootenvSchema},
+		{"OsConfigSchema", OsConfigSchema},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if len(tt.schema) == 0 {
+				t.Fatalf("%s: expected non-empty bytes, got empty", tt.name)
+			}
+		})
+	}
+}
+
+func TestEmbeddedSchemasValidJSON(t *testing.T) {
+	tests := []struct {
+		name   string
+		schema []byte
+	}{
+		{"ImageTemplateSchema", ImageTemplateSchema},
+		{"ConfigSchema", ConfigSchema},
+		{"ChrootenvSchema", ChrootenvSchema},
+		{"OsConfigSchema", OsConfigSchema},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var doc map[string]any
+			if err := json.Unmarshal(tt.schema, &doc); err != nil {
+				t.Fatalf("%s: invalid JSON: %v", tt.name, err)
+			}
+		})
+	}
+}
+
+func TestEmbeddedSchemasHaveMetadataFields(t *testing.T) {
+	tests := []struct {
+		name       string
+		schema     []byte
+		wantSchema string
+		wantID     string
+	}{
+		{
+			name:       "ImageTemplateSchema",
+			schema:     ImageTemplateSchema,
+			wantSchema: "https://json-schema.org/draft/2020-12/schema",
+			wantID:     "os-image-template.schema.json",
+		},
+		{
+			name:       "ConfigSchema",
+			schema:     ConfigSchema,
+			wantSchema: "https://json-schema.org/draft/2020-12/schema",
+			wantID:     "https://github.com/open-edge-platform/os-image-composer/schemas/os-image-composer-config.schema.json",
+		},
+		{
+			name:       "ChrootenvSchema",
+			schema:     ChrootenvSchema,
+			wantSchema: "https://json-schema.org/draft/2020-12/schema",
+			wantID:     "chrootenv-config.schema.json",
+		},
+		{
+			name:       "OsConfigSchema",
+			schema:     OsConfigSchema,
+			wantSchema: "https://json-schema.org/draft/2020-12/schema",
+			wantID:     "os-config.schema.json",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var doc map[string]any
+			if err := json.Unmarshal(tt.schema, &doc); err != nil {
+				t.Fatalf("unexpected JSON parse error: %v", err)
+			}
+
+			gotSchema, _ := doc["$schema"].(string)
+			if gotSchema != tt.wantSchema {
+				t.Errorf("$schema: got %q, want %q", gotSchema, tt.wantSchema)
+			}
+
+			gotID, _ := doc["$id"].(string)
+			if gotID != tt.wantID {
+				t.Errorf("$id: got %q, want %q", gotID, tt.wantID)
+			}
+		})
+	}
+}