refactor: surface errors when running reports

This commit is contained in:
Jose Diaz-Gonzalez
2020-02-22 06:29:14 -05:00
parent 59316f4a21
commit 26e8524ae5
10 changed files with 42 additions and 33 deletions

View File

@@ -2,6 +2,7 @@ package common
import (
"bufio"
"errors"
"fmt"
"io/ioutil"
"os"
@@ -353,7 +354,7 @@ func ReadFirstLine(filename string) (text string) {
}
// ReportSingleApp is an internal function that displays a report for an app
func ReportSingleApp(reportType string, appName string, infoFlag string, infoFlags map[string]string, trimPrefix bool, uppercaseFirstCharacter bool) {
func ReportSingleApp(reportType string, appName string, infoFlag string, infoFlags map[string]string, trimPrefix bool, uppercaseFirstCharacter bool) error {
flags := []string{}
for key := range infoFlags {
flags = append(flags, key)
@@ -377,14 +378,14 @@ func ReportSingleApp(reportType string, appName string, infoFlag string, infoFla
LogVerbose(fmt.Sprintf("%s%s", RightPad(fmt.Sprintf("%s:", key), 31, " "), v))
}
return
return nil
}
for _, k := range flags {
if infoFlag == k {
v := infoFlags[k]
fmt.Println(v)
return
return nil
}
}
@@ -393,7 +394,8 @@ func ReportSingleApp(reportType string, appName string, infoFlag string, infoFla
for i := 0; i < len(keys); i++ {
strkeys[i] = keys[i].String()
}
LogFail(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")))
return errors.New(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")))
}
// RightPad right-pads the string with pad up to len runes