fix: Add Undefines to Build Config (#443)

* Add undefines build config

* Added comment undefines useage

Author: Antonio Salinas

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

@@ -139,7 +139,13 @@ func (p *sourcePreparerImpl) writeMacrosFile(component components.Component, out
 // All macros are collected into a single map and sorted alphabetically by name for
 // deterministic output. If the same macro is defined multiple times (e.g., via both
 // a with flag and an explicit define), the later definition wins. The order of processing
-// is: with flags, then without flags, then explicit defines.
+// is: with flags, then without flags, then explicit defines, then undefines.
+//
+// Undefines remove entries from the generated macros map. This only affects macros that
+// originate from the merged TOML configuration (with, without, and defines fields); it
+// does not undefine arbitrary system-level RPM macros. The primary use case is allowing
+// a component-level TOML file to override a distro-level or project-level default by
+// removing a macro that would otherwise be emitted into the macros file.
 //
 // Note: RPM macro values can contain spaces without special escaping; everything
 // after the macro name (and separating whitespace) is treated as the macro body.
@@ -167,6 +173,12 @@ func GenerateMacrosFileContents(buildConfig projectconfig.ComponentBuildConfig)
 		macros[name] = value
 	}
 
+	// Remove any macros listed in undefines. This allows component-level config to
+	// override distro-level default macro definitions by removing them entirely.
+	for _, undef := range buildConfig.Undefines {
+		delete(macros, undef)
+	}
+
 	// Sort macro names for deterministic output.
 	macroNames := lo.Keys(macros)
 	slices.Sort(macroNames)

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

@@ -248,6 +248,71 @@ func TestGenerateMacrosFileContents_ValuesWithSpaces(t *testing.T) {
 	assert.Contains(t, contents, "%description A package with multiple words")
 }
 
+func TestGenerateMacrosFileContents_UndefinesRemovesDefine(t *testing.T) {
+	// Undefines should remove a macro that was added via defines.
+	contents := sources.GenerateMacrosFileContents(projectconfig.ComponentBuildConfig{
+		Defines: map[string]string{
+			"dist":   ".azl3",
+			"vendor": "Microsoft",
+		},
+		Undefines: []string{"dist"},
+	})
+
+	assert.NotContains(t, contents, "%dist")
+	assert.Contains(t, contents, "%vendor Microsoft")
+}
+
+func TestGenerateMacrosFileContents_UndefinesRemovesWithFlag(t *testing.T) {
+	// Undefines should be able to remove a macro generated from a with flag.
+	contents := sources.GenerateMacrosFileContents(projectconfig.ComponentBuildConfig{
+		With:      []string{"tests", "docs"},
+		Undefines: []string{"_with_tests"},
+	})
+
+	assert.NotContains(t, contents, "_with_tests")
+	assert.Contains(t, contents, "%_with_docs 1")
+}
+
+func TestGenerateMacrosFileContents_UndefinesRemovesWithoutFlag(t *testing.T) {
+	// Undefines should be able to remove a macro generated from a without flag.
+	contents := sources.GenerateMacrosFileContents(projectconfig.ComponentBuildConfig{
+		Without:   []string{"debug", "static"},
+		Undefines: []string{"_without_debug"},
+	})
+
+	assert.NotContains(t, contents, "_without_debug")
+	assert.Contains(t, contents, "%_without_static 1")
+}
+
+func TestGenerateMacrosFileContents_UndefinesNonexistentMacroIsNoop(t *testing.T) {
+	// Undefining a macro that doesn't exist should not cause an error.
+	contents := sources.GenerateMacrosFileContents(projectconfig.ComponentBuildConfig{
+		Defines: map[string]string{
+			"vendor": "Microsoft",
+		},
+		Undefines: []string{"nonexistent"},
+	})
+
+	assert.Contains(t, contents, "%vendor Microsoft")
+}
+
+func TestGenerateMacrosFileContents_UndefinesAllMacros(t *testing.T) {
+	// Undefining all macros should result in only the header.
+	contents := sources.GenerateMacrosFileContents(projectconfig.ComponentBuildConfig{
+		With:    []string{"tests"},
+		Without: []string{"debug"},
+		Defines: map[string]string{
+			"dist": ".azl3",
+		},
+		Undefines: []string{"_with_tests", "_without_debug", "dist"},
+	})
+
+	assert.Contains(t, contents, sources.MacrosFileHeader)
+	assert.NotContains(t, contents, "%_with_tests")
+	assert.NotContains(t, contents, "%_without_debug")
+	assert.NotContains(t, contents, "%dist")
+}
+
 func TestGenerateMacrosFileContents_FullConfig(t *testing.T) {
 	contents := sources.GenerateMacrosFileContents(projectconfig.ComponentBuildConfig{
 		With:    []string{"tests", "docs"},

internal/projectconfig/build.go

@@ -38,6 +38,8 @@ type ComponentBuildConfig struct {
 	Without []string `toml:"without,omitempty" json:"without,omitempty" jsonschema:"title=Without options,description='without' options to pass to the builder."`
 	// Macro definitions.
 	Defines map[string]string `toml:"defines,omitempty" json:"defines,omitempty" jsonschema:"title=Macro definitions,description=Macro definitions to pass to the builder."`
+	// Undefine macros that would otherwise be defined by the component configuration.
+	Undefines []string `toml:"undefines,omitempty" json:"undefines,omitempty" jsonschema:"title=Undefined macros,description=Macro names to undefine when passing to the builder."`
 	// Check section configuration.
 	Check CheckConfig `toml:"check,omitempty" json:"check,omitempty" jsonschema:"title=Check configuration,description=Configuration for the %check section"`
 }

scenario/__snapshots__/TestSnapshotsContainer_config_generate-schema_stdout_1.snap

@@ -45,6 +45,14 @@
           "title": "Macro definitions",
           "description": "Macro definitions to pass to the builder."
         },
+        "undefines": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array",
+          "title": "Undefined macros",
+          "description": "Macro names to undefine when passing to the builder."
+        },
         "check": {
           "$ref": "#/$defs/CheckConfig",
           "title": "Check configuration",

scenario/__snapshots__/TestSnapshots_config_generate-schema_stdout_1.snap

@@ -45,6 +45,14 @@
           "title": "Macro definitions",
           "description": "Macro definitions to pass to the builder."
         },
+        "undefines": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array",
+          "title": "Undefined macros",
+          "description": "Macro names to undefine when passing to the builder."
+        },
         "check": {
           "$ref": "#/$defs/CheckConfig",
           "title": "Check configuration",

schemas/azldev.schema.json

@@ -45,6 +45,14 @@
           "title": "Macro definitions",
           "description": "Macro definitions to pass to the builder."
         },
+        "undefines": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array",
+          "title": "Undefined macros",
+          "description": "Macro names to undefine when passing to the builder."
+        },
         "check": {
           "$ref": "#/$defs/CheckConfig",
           "title": "Check configuration",