Update error message for apparmor parser

dmcgowan · dmcgowan · commit 8aca314ddb4f · 2022-01-07T12:31:02.000-08:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go
@@ -151,7 +151,7 @@ func generate(p *data, o io.Writer) error {
 func load(path string) error {
 	out, err := aaParser("-Kr", path)
 	if err != nil {
-		return fmt.Errorf("%s: %s", err, out)
+		return fmt.Errorf("parser error(%q): %w", strings.TrimSpace(out), err)
 	}
 	return nil
 }
@@ -164,10 +164,7 @@ func macroExists(m string) bool {
 
 func aaParser(args ...string) (string, error) {
 	out, err := exec.Command("apparmor_parser", args...).CombinedOutput()
-	if err != nil {
-		return "", err
-	}
-	return string(out), nil
+	return string(out), err
 }
 
 func getVersion() (int, error) {

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ func generate(p *data, o io.Writer) error {`
`151`	`151`	`func load(path string) error {`
`152`	`152`	`out, err := aaParser("-Kr", path)`
`153`	`153`	`if err != nil {`
`154`		`- return fmt.Errorf("%s: %s", err, out)`
	`154`	`+ return fmt.Errorf("parser error(%q): %w", strings.TrimSpace(out), err)`
`155`	`155`	`}`
`156`	`156`	`return nil`
`157`	`157`	`}`
`@@ -164,10 +164,7 @@ func macroExists(m string) bool {`
`164`	`164`
`165`	`165`	`func aaParser(args ...string) (string, error) {`
`166`	`166`	`out, err := exec.Command("apparmor_parser", args...).CombinedOutput()`
`167`		`- if err != nil {`
`168`		`- return "", err`
`169`		`- }`
`170`		`- return string(out), nil`
	`167`	`+ return string(out), err`
`171`	`168`	`}`
`172`	`169`
`173`	`170`	`func getVersion() (int, error) {`