spec: reject subpackage strip control

Keep automatic dependency discovery package-scoped, but reject strip control where targets cannot safely apply it independently.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Author: cpuguy83

artifacts.go

@@ -51,21 +51,12 @@ type Artifacts struct {
 	// Groups is a list of groups to add to the system when the package is installed.
 	Groups []AddGroupConfig `yaml:"groups,omitempty" json:"groups,omitempty"`
 
-	// DisableStrip is used to disable stripping of artifacts.
+	// DisableStrip disables stripping of root package artifacts.
+	// It is not supported in subpackages.
 	DisableStrip bool `yaml:"disable_strip,omitempty" json:"disable_strip,omitempty"`
 
-	// DisableAutoRequires is used to disable automatic dependency discovery for
-	// the produced package.
-	//
-	// Some tooling, such as `rpmbuild`, will look at all artifacts and
-	// automatically inject missing dependencies into the package metadata.
-	// For instance, if you include a `.sh` script, rpmbuild with automatically
-	// add `bash` as a dependency for the package.
-	// It also does this for libraries being linked against.
-	//
-	// This is useful if you want to have more control over the dependencies
-	// that are included in the package.
-	// However, you must be careful to manually include all dependencies that are required.
+	// DisableAutoRequires disables automatic dependency discovery for package
+	// artifacts. Required dependencies must be declared explicitly when it is enabled.
 	DisableAutoRequires bool `yaml:"disable_auto_requires,omitempty" json:"disable_auto_requires,omitempty"`
 }
 

docs/spec.schema.json

@@ -307,13 +307,13 @@
 					"type": [
 						"boolean"
 					],
-					"description": "DisableAutoRequires is used to disable automatic dependency discovery for\nthe produced package.\n\nSome tooling, such as `rpmbuild`, will look at all artifacts and\nautomatically inject missing dependencies into the package metadata.\nFor instance, if you include a `.sh` script, rpmbuild with automatically\nadd `bash` as a dependency for the package.\nIt also does this for libraries being linked against.\n\nThis is useful if you want to have more control over the dependencies\nthat are included in the package.\nHowever, you must be careful to manually include all dependencies that are required."
+					"description": "DisableAutoRequires disables automatic dependency discovery for package\nartifacts. Required dependencies must be declared explicitly when it is enabled."
 				},
 				"disable_strip": {
 					"type": [
 						"boolean"
 					],
-					"description": "DisableStrip is used to disable stripping of artifacts."
+					"description": "DisableStrip disables stripping of root package artifacts.\nIt is not supported in subpackages."
 				},
 				"docs": {
 					"additionalProperties": {

subpackage.go

@@ -132,6 +132,9 @@ func (s *SubPackage) validate() error {
 	}
 
 	if s.Artifacts != nil {
+		if s.Artifacts.DisableStrip {
+			errs = append(errs, fmt.Errorf("artifacts: disable_strip is only valid for root package artifacts"))
+		}
 		if err := s.Artifacts.validate(); err != nil {
 			errs = append(errs, errors.Wrap(err, "artifacts"))
 		}

subpackage_test.go

@@ -163,6 +163,95 @@ func TestSubPackageMetadataIsStatic(t *testing.T) {
 	}
 }
 
+func TestSubPackageArtifactControls(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name      string
+		artifacts *Artifacts
+		errSubstr string
+	}{
+		{
+			name: "A supplemental package with disable_strip enabled is rejected",
+			artifacts: &Artifacts{
+				DisableStrip: true,
+			},
+			errSubstr: "artifacts: disable_strip is only valid for root package artifacts",
+		},
+		{
+			name: "A supplemental package with disable_auto_requires enabled is valid",
+			artifacts: &Artifacts{
+				DisableAutoRequires: true,
+			},
+		},
+		{
+			name:      "A supplemental package with root-only artifact controls unset is valid",
+			artifacts: &Artifacts{},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			pkg := SubPackage{
+				Description: "Tools package",
+				Artifacts:   tc.artifacts,
+			}
+
+			err := pkg.validate()
+
+			if tc.errSubstr == "" {
+				assert.NilError(t, err)
+				return
+			}
+			assert.ErrorContains(t, err, tc.errSubstr)
+		})
+	}
+}
+
+func TestRootPackageArtifactControls(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name      string
+		artifacts Artifacts
+	}{
+		{
+			name: "A root package with disable_strip enabled is valid",
+			artifacts: Artifacts{
+				DisableStrip: true,
+			},
+		},
+		{
+			name: "A root package with disable_auto_requires enabled is valid",
+			artifacts: Artifacts{
+				DisableAutoRequires: true,
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			spec := Spec{
+				Name:        "tools",
+				Description: "Tools package",
+				Website:     "https://example.com",
+				Version:     "1.0.0",
+				Revision:    "1",
+				License:     "MIT",
+				Artifacts:   tc.artifacts,
+			}
+
+			err := spec.Validate()
+
+			assert.NilError(t, err)
+		})
+	}
+}
+
 func TestSubPackageBuildArgumentSubstitution(t *testing.T) {
 	t.Parallel()