feat(prebuild): add err reporting to builder & directive tasks.

pkg/prebuild/builder/abi.go

@@ -30,6 +30,6 @@ func init() {
 	})
 }
 
-func (b ABI3) Apply(profile string) string {
-	return regAbi4To3.Replace(profile)
+func (b ABI3) Apply(profile string) (string, error) {
+	return regAbi4To3.Replace(profile), nil
 }

pkg/prebuild/builder/complain.go

@@ -30,13 +30,13 @@ func init() {
 	})
 }
 
-func (b Complain) Apply(profile string) string {
+func (b Complain) Apply(profile string) (string, error) {
 	flags := []string{}
 	matches := regFlags.FindStringSubmatch(profile)
 	if len(matches) != 0 {
 		flags = strings.Split(matches[1], ",")
 		if slices.Contains(flags, "complain") {
-			return profile
+			return profile, nil
 		}
 	}
 	flags = append(flags, "complain")
@@ -44,5 +44,5 @@ func (b Complain) Apply(profile string) string {
 
 	// Remove all flags definition, then set manifest' flags
 	profile = regFlags.ReplaceAllLiteralString(profile, "")
-	return regProfileHeader.ReplaceAllLiteralString(profile, strFlags)
+	return regProfileHeader.ReplaceAllLiteralString(profile, strFlags), nil
 }

pkg/prebuild/builder/core.go

@@ -21,7 +21,7 @@ var (
 // Main directive interface
 type Builder interface {
 	cfg.BaseInterface
-	Apply(profile string) string
+	Apply(profile string) (string, error)
 }
 
 func Register(names ...string) {

pkg/prebuild/builder/core_test.go

@@ -15,6 +15,7 @@ func TestBuilder_Apply(t *testing.T) {
 		b       Builder
 		profile string
 		want    string
+		wantErr bool
 	}{
 		{
 			name: "abi3",
@@ -237,7 +238,12 @@ func TestBuilder_Apply(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := tt.b.Apply(tt.profile); got != tt.want {
+			got, err := tt.b.Apply(tt.profile)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Builder.Apply() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
 				t.Errorf("Builder.Apply() = %v, want %v", got, tt.want)
 			}
 		})

pkg/prebuild/builder/dev.go

@@ -31,6 +31,6 @@ func init() {
 	})
 }
 
-func (b Dev) Apply(profile string) string {
-	return regDev.Replace(profile)
+func (b Dev) Apply(profile string) (string, error) {
+	return regDev.Replace(profile), nil
 }

pkg/prebuild/builder/enforce.go

@@ -24,16 +24,16 @@ func init() {
 	})
 }
 
-func (b Enforce) Apply(profile string) string {
+func (b Enforce) Apply(profile string) (string, error) {
 	matches := regFlags.FindStringSubmatch(profile)
 	if len(matches) == 0 {
-		return profile
+		return profile, nil
 	}
 
 	flags := strings.Split(matches[1], ",")
 	idx := slices.Index(flags, "complain")
 	if idx == -1 {
-		return profile
+		return profile, nil
 	}
 	flags = slices.Delete(flags, idx, idx+1)
 	strFlags := "{"
@@ -43,5 +43,5 @@ func (b Enforce) Apply(profile string) string {
 
 	// Remove all flags definition, then set new flags
 	profile = regFlags.ReplaceAllLiteralString(profile, "")
-	return regProfileHeader.ReplaceAllLiteralString(profile, strFlags)
+	return regProfileHeader.ReplaceAllLiteralString(profile, strFlags), nil
 }

pkg/prebuild/builder/fsp.go

@@ -28,6 +28,6 @@ func init() {
 	})
 }
 
-func (b FullSystemPolicy) Apply(profile string) string {
-	return regFullSystemPolicy.Replace(profile)
+func (b FullSystemPolicy) Apply(profile string) (string, error) {
+	return regFullSystemPolicy.Replace(profile), nil
 }

pkg/prebuild/builder/userspace.go

@@ -29,7 +29,7 @@ func init() {
 	})
 }
 
-func (b Userspace) Apply(profile string) string {
+func (b Userspace) Apply(profile string) (string, error) {
 	p := aa.DefaultTunables()
 	p.ParseVariables(profile)
 	p.ResolveAttachments()
@@ -37,7 +37,7 @@ func (b Userspace) Apply(profile string) string {
 	matches := regAttachments.FindAllString(profile, -1)
 	if len(matches) > 0 {
 		strheader := strings.Replace(matches[0], "@{exec_path}", att, -1)
-		return regAttachments.ReplaceAllLiteralString(profile, strheader)
+		return regAttachments.ReplaceAllLiteralString(profile, strheader), nil
 	}
-	return profile
+	return profile, nil
 }