Add namespacing

Author: dmcilvaney

docs/user/reference/config/components.md

@@ -9,7 +9,7 @@ A component definition tells azldev where to find the spec file, how to customiz
 | Field | TOML Key | Type | Required | Description |
 |-------|----------|------|----------|-------------|
 | Spec source | `spec` | [SpecSource](#spec-source) | No | Where to find the spec file for this component. Inherited from distro defaults if not specified. |
-| Release calculation | `release-calculation` | string | No | Controls how the Release tag is managed during rendering. `"auto"` (default) = auto-bump; `"manual"` = skip all automatic Release manipulation |
+| Release config | `release` | [ReleaseConfig](#release-configuration) | No | Controls how the Release tag is managed during rendering |
 | Overlays | `overlays` | array of [Overlay](overlays.md) | No | Modifications to apply to the spec and/or source files |
 | Build config | `build` | [BuildConfig](#build-configuration) | No | Build-time options (macros, conditionals, check config) |
 | Source files | `source-files` | array of [SourceFileReference](#source-file-references) | No | Additional source files to download for this component |
@@ -98,6 +98,21 @@ spec = { type = "local", path = "azurelinux-release.spec" }
 
 The `path` is relative to the config file that defines the component. Local spec files and any associated source files should be placed alongside the component's `.comp.toml` file.
 
+## Release Configuration
+
+The `[components.<name>.release]` section controls how azldev manages the Release tag during rendering.
+
+| Field | TOML Key | Type | Required | Description |
+|-------|----------|------|----------|-------------|
+| Calculation | `calculation` | string | No | `"auto"` (default) = auto-bump; `"manual"` = skip all automatic Release manipulation |
+
+Most components use auto mode (the default) and need no release configuration. Set `calculation = "manual"` for components that manage their own release numbering, such as kernel:
+
+```toml
+[components.kernel.release]
+calculation = "manual"
+```
+
 ## Build Configuration
 
 The `[components.<name>.build]` section controls build-time options for a component.

internal/app/azldev/core/components/resolver.go

@@ -463,8 +463,8 @@ func (r *Resolver) createComponentFromConfig(componentConfig *projectconfig.Comp
 			componentConfig.Name, err)
 	}
 
-	if componentConfig.ReleaseCalculation == "" {
-		componentConfig.ReleaseCalculation = projectconfig.ReleaseCalculationAuto
+	if componentConfig.Release.Calculation == "" {
+		componentConfig.Release.Calculation = projectconfig.ReleaseCalculationAuto
 	}
 
 	return &resolvedComponent{

internal/app/azldev/core/components/resolver_test.go

@@ -36,7 +36,9 @@ func setupTestSpec(t *testing.T, testEnv *testutils.TestEnv, path string) projec
 			SourceType: projectconfig.SpecSourceTypeLocal,
 			Path:       path,
 		},
-		ReleaseCalculation: projectconfig.ReleaseCalculationAuto,
+		Release: projectconfig.ReleaseConfig{
+			Calculation: projectconfig.ReleaseCalculationAuto,
+		},
 	}
 }
 
@@ -45,8 +47,10 @@ func addTestComponentToConfig(t *testing.T, env *testutils.TestEnv) projectconfi
 	t.Helper()
 
 	component := projectconfig.ComponentConfig{
-		Name:               "test-component",
-		ReleaseCalculation: projectconfig.ReleaseCalculationAuto,
+		Name: "test-component",
+		Release: projectconfig.ReleaseConfig{
+			Calculation: projectconfig.ReleaseCalculationAuto,
+		},
 	}
 
 	env.Config.Components[component.Name] = component
@@ -246,7 +250,9 @@ func TestFindAllComponents_MergesComponentPresentBySpecAndConfig(t *testing.T) {
 			SourceType: projectconfig.SpecSourceTypeLocal,
 			Path:       testSpecPath,
 		},
-		ReleaseCalculation: projectconfig.ReleaseCalculationAuto,
+		Release: projectconfig.ReleaseConfig{
+			Calculation: projectconfig.ReleaseCalculationAuto,
+		},
 	}
 
 	// Find!

internal/app/azldev/core/sources/release.go

@@ -96,16 +96,16 @@ func BumpStaticRelease(releaseValue string, commitCount int) (string, error) {
 // already resolves the release number from git history.
 //
 // When the Release tag uses a non-standard value (not %autorelease and not a leading
-// integer, e.g. %{pkg_release}), the component must set release-calculation to
+// integer, e.g. %{pkg_release}), the component must set release.calculation to
 // "manual", and likely define an explicit overlay that sets the Release tag.
-// If a non-standard Release is found and release-calculation is not "manual",
+// If a non-standard Release is found and release.calculation is not "manual",
 // an error is returned.
 func (p *sourcePreparerImpl) tryBumpStaticRelease(
 	component components.Component,
 	sourcesDirPath string,
 	commitCount int,
 ) error {
-	if component.GetConfig().ReleaseCalculation == projectconfig.ReleaseCalculationManual {
+	if component.GetConfig().Release.Calculation == projectconfig.ReleaseCalculationManual {
 		slog.Debug("Component uses manual release calculation; skipping static release bump",
 			"component", component.GetName())
 
@@ -133,10 +133,10 @@ func (p *sourcePreparerImpl) tryBumpStaticRelease(
 	newRelease, err := BumpStaticRelease(releaseValue, commitCount)
 	if err != nil {
 		// The Release tag does not start with an integer (e.g. %{pkg_release})
-		// and the user did not set release-calculation to "manual".
+		// and the user did not set release.calculation to "manual".
 		return fmt.Errorf(
 			"component %#q has a non-standard Release tag value %#q that cannot be auto-bumped; "+
-				"set 'release-calculation = \"manual\"' in the component configuration "+
+				"set 'release.calculation = \"manual\"' in the component configuration "+
 				"and add a \"spec-set-tag\" overlay for the Release tag if needed:\n%w",
 			component.GetName(), releaseValue, err)
 	}

internal/app/azldev/core/sources/release_internal_test.go

@@ -53,7 +53,9 @@ func TestTryBumpStaticRelease_ManualSkips(t *testing.T) {
 	preparer := newTestPreparer(memFS)
 
 	comp := mockComponent(ctrl, "kernel", &projectconfig.ComponentConfig{
-		ReleaseCalculation: projectconfig.ReleaseCalculationManual,
+		Release: projectconfig.ReleaseConfig{
+			Calculation: projectconfig.ReleaseCalculationManual,
+		},
 	})
 
 	// No spec file needed — should skip before reading anything.
@@ -69,7 +71,9 @@ func TestTryBumpStaticRelease_AutoreleaseSkips(t *testing.T) {
 	writeTestSpec(t, memFS, "test-pkg", "%autorelease")
 
 	comp := mockComponent(ctrl, "test-pkg", &projectconfig.ComponentConfig{
-		ReleaseCalculation: projectconfig.ReleaseCalculationAuto,
+		Release: projectconfig.ReleaseConfig{
+			Calculation: projectconfig.ReleaseCalculationAuto,
+		},
 	})
 
 	err := preparer.tryBumpStaticRelease(comp, filepath.Join(testSourcesDir, "test-pkg"), 3)
@@ -84,7 +88,9 @@ func TestTryBumpStaticRelease_StaticBumps(t *testing.T) {
 	writeTestSpec(t, memFS, "test-pkg", "1%{?dist}")
 
 	comp := mockComponent(ctrl, "test-pkg", &projectconfig.ComponentConfig{
-		ReleaseCalculation: projectconfig.ReleaseCalculationAuto,
+		Release: projectconfig.ReleaseConfig{
+			Calculation: projectconfig.ReleaseCalculationAuto,
+		},
 	})
 
 	err := preparer.tryBumpStaticRelease(comp, filepath.Join(testSourcesDir, "test-pkg"), 3)
@@ -105,13 +111,15 @@ func TestTryBumpStaticRelease_NonStandardErrorsWithoutManual(t *testing.T) {
 	writeTestSpec(t, memFS, "kernel", "%{pkg_release}")
 
 	comp := mockComponent(ctrl, "kernel", &projectconfig.ComponentConfig{
-		ReleaseCalculation: projectconfig.ReleaseCalculationAuto,
+		Release: projectconfig.ReleaseConfig{
+			Calculation: projectconfig.ReleaseCalculationAuto,
+		},
 	})
 
 	err := preparer.tryBumpStaticRelease(comp, filepath.Join(testSourcesDir, "kernel"), 3)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "cannot be auto-bumped")
-	assert.Contains(t, err.Error(), "release-calculation")
+	assert.Contains(t, err.Error(), "release.calculation")
 }
 
 func TestTryBumpStaticRelease_NonStandardSucceedsWithManual(t *testing.T) {
@@ -122,7 +130,9 @@ func TestTryBumpStaticRelease_NonStandardSucceedsWithManual(t *testing.T) {
 	writeTestSpec(t, memFS, "kernel", "%{pkg_release}")
 
 	comp := mockComponent(ctrl, "kernel", &projectconfig.ComponentConfig{
-		ReleaseCalculation: projectconfig.ReleaseCalculationManual,
+		Release: projectconfig.ReleaseConfig{
+			Calculation: projectconfig.ReleaseCalculationManual,
+		},
 	})
 
 	err := preparer.tryBumpStaticRelease(comp, filepath.Join(testSourcesDir, "kernel"), 3)

internal/projectconfig/component.go

@@ -122,6 +122,12 @@ const (
 	ReleaseCalculationManual ReleaseCalculation = "manual"
 )
 
+// ReleaseConfig holds release-related configuration for a component.
+type ReleaseConfig struct {
+	// Calculation controls how the Release tag is managed during rendering.
+	Calculation ReleaseCalculation `toml:"calculation,omitempty" json:"calculation,omitempty" validate:"omitempty,oneof=auto manual" jsonschema:"enum=auto,enum=manual,default=auto,title=Release calculation,description=Controls how the Release tag is managed during rendering. Empty or omitted means auto."`
+}
+
 // Defines a component.
 type ComponentConfig struct {
 	// The component's name; not actually present in serialized files.
@@ -139,10 +145,8 @@ type ComponentConfig struct {
 	// Where to get its spec and adjacent files from.
 	Spec SpecSource `toml:"spec,omitempty" json:"spec,omitempty" jsonschema:"title=Spec,description=Identifies where to find the spec for this component"`
 
-	// ReleaseCalculation controls how the Release tag is managed during rendering.
-	// Defaults to auto (empty). Set to "manual" for components that manage their own
-	// release numbering (e.g. kernel).
-	ReleaseCalculation ReleaseCalculation `toml:"release-calculation,omitempty" json:"releaseCalculation,omitempty" validate:"omitempty,oneof=auto manual" jsonschema:"enum=auto,enum=manual,title=Release calculation,description=Controls how the Release tag is managed during rendering. Empty or omitted means auto."`
+	// Release configuration for this component.
+	Release ReleaseConfig `toml:"release,omitempty" json:"release,omitempty" table:"-" jsonschema:"title=Release configuration,description=Configuration for how the Release tag is managed during rendering."`
 
 	// Overlays to apply to sources after they've been acquired. May mutate the spec as well as sources.
 	Overlays []ComponentOverlay `toml:"overlays,omitempty" json:"overlays,omitempty" table:"-" jsonschema:"title=Overlays,description=Overlays to apply to this component's spec and/or sources"`
@@ -192,7 +196,7 @@ func (c *ComponentConfig) WithAbsolutePaths(referenceDir string) *ComponentConfi
 		Name:                 c.Name,
 		SourceConfigFile:     c.SourceConfigFile,
 		RenderedSpecDir:      c.RenderedSpecDir,
-		ReleaseCalculation:   c.ReleaseCalculation,
+		Release:              c.Release,
 		Spec:                 deep.MustCopy(c.Spec),
 		Build:                deep.MustCopy(c.Build),
 		SourceFiles:          deep.MustCopy(c.SourceFiles),

internal/projectconfig/component_test.go

@@ -216,20 +216,20 @@ func TestReleaseCalculationValidation(t *testing.T) {
 	validate := validator.New()
 
 	// Empty (omitted) is valid — resolved to "auto" by the component resolver.
-	require.NoError(t, validate.Struct(&projectconfig.ComponentConfig{}))
+	require.NoError(t, validate.Struct(&projectconfig.ReleaseConfig{}))
 
 	// Explicit "auto" is valid.
-	require.NoError(t, validate.Struct(&projectconfig.ComponentConfig{
-		ReleaseCalculation: projectconfig.ReleaseCalculationAuto,
+	require.NoError(t, validate.Struct(&projectconfig.ReleaseConfig{
+		Calculation: projectconfig.ReleaseCalculationAuto,
 	}))
 
 	// Explicit "manual" is valid.
-	require.NoError(t, validate.Struct(&projectconfig.ComponentConfig{
-		ReleaseCalculation: projectconfig.ReleaseCalculationManual,
+	require.NoError(t, validate.Struct(&projectconfig.ReleaseConfig{
+		Calculation: projectconfig.ReleaseCalculationManual,
 	}))
 
 	// Invalid value is rejected.
-	require.Error(t, validate.Struct(&projectconfig.ComponentConfig{
-		ReleaseCalculation: "manaul",
+	require.Error(t, validate.Struct(&projectconfig.ReleaseConfig{
+		Calculation: "manaul",
 	}))
 }

internal/projectconfig/fingerprint_test.go

@@ -32,6 +32,7 @@ func TestAllFingerprintedFieldsHaveDecision(t *testing.T) {
 		reflect.TypeFor[projectconfig.SpecSource](),
 		reflect.TypeFor[projectconfig.DistroReference](),
 		reflect.TypeFor[projectconfig.SourceFileReference](),
+		reflect.TypeFor[projectconfig.ReleaseConfig](),
 	}
 
 	// Maps "StructName.FieldName" for every field that should carry a

scenario/__snapshots__/TestSnapshotsContainer_config_generate-schema_stdout_1.snap

@@ -106,14 +106,10 @@
           "title": "Spec",
           "description": "Identifies where to find the spec for this component"
         },
-        "release-calculation": {
-          "type": "string",
-          "enum": [
-            "auto",
-            "manual"
-          ],
-          "title": "Release calculation",
-          "description": "Controls how the Release tag is managed during rendering. Empty or omitted means auto."
+        "release": {
+          "$ref": "#/$defs/ReleaseConfig",
+          "title": "Release configuration",
+          "description": "Configuration for how the Release tag is managed during rendering."
         },
         "overlays": {
           "items": {
@@ -660,6 +656,22 @@
       "additionalProperties": false,
       "type": "object"
     },
+    "ReleaseConfig": {
+      "properties": {
+        "calculation": {
+          "type": "string",
+          "enum": [
+            "auto",
+            "manual"
+          ],
+          "title": "Release calculation",
+          "description": "Controls how the Release tag is managed during rendering. Empty or omitted means auto.",
+          "default": "auto"
+        }
+      },
+      "additionalProperties": false,
+      "type": "object"
+    },
     "SourceFileReference": {
       "properties": {
         "filename": {

scenario/__snapshots__/TestSnapshots_config_generate-schema_stdout_1.snap

@@ -106,14 +106,10 @@
           "title": "Spec",
           "description": "Identifies where to find the spec for this component"
         },
-        "release-calculation": {
-          "type": "string",
-          "enum": [
-            "auto",
-            "manual"
-          ],
-          "title": "Release calculation",
-          "description": "Controls how the Release tag is managed during rendering. Empty or omitted means auto."
+        "release": {
+          "$ref": "#/$defs/ReleaseConfig",
+          "title": "Release configuration",
+          "description": "Configuration for how the Release tag is managed during rendering."
         },
         "overlays": {
           "items": {
@@ -660,6 +656,22 @@
       "additionalProperties": false,
       "type": "object"
     },
+    "ReleaseConfig": {
+      "properties": {
+        "calculation": {
+          "type": "string",
+          "enum": [
+            "auto",
+            "manual"
+          ],
+          "title": "Release calculation",
+          "description": "Controls how the Release tag is managed during rendering. Empty or omitted means auto.",
+          "default": "auto"
+        }
+      },
+      "additionalProperties": false,
+      "type": "object"
+    },
     "SourceFileReference": {
       "properties": {
         "filename": {