fix: correct issue where all flags were not shown if an invalid flag was specified

This commit is contained in:
Jose Diaz-Gonzalez
2021-01-07 01:34:05 -05:00
parent 666bb9dfee
commit d70a9be97e
8 changed files with 56 additions and 20 deletions

View File

@@ -18,10 +18,15 @@ func ReportSingleApp(appName, infoFlag string) error {
"--app-locked": reportLocked, "--app-locked": reportLocked,
} }
flagKeys := []string{}
for flagKey := range flags {
flagKeys = append(flagKeys, flagKey)
}
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, infoFlag, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("app", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("app", appName, infoFlag, infoFlags, flagKeys, trimPrefix, uppercaseFirstCharacter)
} }
func reportDir(appName string) string { func reportDir(appName string) string {

View File

@@ -16,10 +16,15 @@ func ReportSingleApp(appName, infoFlag string) error {
"--buildpacks-list": reportList, "--buildpacks-list": reportList,
} }
flagKeys := []string{}
for flagKey := range flags {
flagKeys = append(flagKeys, flagKey)
}
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, infoFlag, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("buildpacks", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("buildpacks", appName, infoFlag, infoFlags, flagKeys, trimPrefix, uppercaseFirstCharacter)
} }
func reportList(appName string) string { func reportList(appName string) string {

View File

@@ -7,7 +7,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"reflect"
"regexp" "regexp"
"sort" "sort"
"strconv" "strconv"
@@ -324,7 +323,7 @@ func ParseReportArgs(pluginName string, arguments []string) ([]string, string, e
} }
// ReportSingleApp is an internal function that displays a report for an app // 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) error { func ReportSingleApp(reportType string, appName string, infoFlag string, infoFlags map[string]string, infoFlagKeys []string, trimPrefix bool, uppercaseFirstCharacter bool) error {
flags := []string{} flags := []string{}
for key := range infoFlags { for key := range infoFlags {
flags = append(flags, key) flags = append(flags, key)
@@ -334,7 +333,11 @@ func ReportSingleApp(reportType string, appName string, infoFlag string, infoFla
if len(infoFlag) == 0 { if len(infoFlag) == 0 {
LogInfo2Quiet(fmt.Sprintf("%s %v information", appName, reportType)) LogInfo2Quiet(fmt.Sprintf("%s %v information", appName, reportType))
for _, k := range flags { for _, k := range flags {
v := infoFlags[k] v, ok := infoFlags[k]
if !ok {
continue
}
prefix := "--" prefix := "--"
if trimPrefix { if trimPrefix {
prefix = fmt.Sprintf("--%v-", reportType) prefix = fmt.Sprintf("--%v-", reportType)
@@ -353,19 +356,17 @@ func ReportSingleApp(reportType string, appName string, infoFlag string, infoFla
for _, k := range flags { for _, k := range flags {
if infoFlag == k { if infoFlag == k {
v := infoFlags[k] v, ok := infoFlags[k]
if !ok {
continue
}
fmt.Println(v) fmt.Println(v)
return nil return nil
} }
} }
keys := reflect.ValueOf(infoFlags).MapKeys() sort.Strings(infoFlagKeys)
strkeys := make([]string, len(keys)) return fmt.Errorf("Invalid flag passed, valid flags: %s", strings.Join(infoFlagKeys, ", "))
for i := 0; i < len(keys); i++ {
strkeys[i] = keys[i].String()
}
return fmt.Errorf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", "))
} }
// RightPad right-pads the string with pad up to len runes // RightPad right-pads the string with pad up to len runes

View File

@@ -15,10 +15,15 @@ func ReportSingleApp(appName, infoFlag string) error {
"--logs-global-vector-sink": reportGlobalVectorSink, "--logs-global-vector-sink": reportGlobalVectorSink,
} }
flagKeys := []string{}
for flagKey := range flags {
flagKeys = append(flagKeys, flagKey)
}
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, infoFlag, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("logs", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("logs", appName, infoFlag, infoFlags, flagKeys, trimPrefix, uppercaseFirstCharacter)
} }
func reportVectorSink(appName string) string { func reportVectorSink(appName string) string {

View File

@@ -19,10 +19,15 @@ func ReportSingleApp(appName, infoFlag string) error {
"--network-web-listeners": reportWebListeners, "--network-web-listeners": reportWebListeners,
} }
flagKeys := []string{}
for flagKey := range flags {
flagKeys = append(flagKeys, flagKey)
}
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, infoFlag, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("network", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("network", appName, infoFlag, infoFlags, flagKeys, trimPrefix, uppercaseFirstCharacter)
} }
func reportBindAllInterfaces(appName string) string { func reportBindAllInterfaces(appName string) string {

View File

@@ -18,10 +18,15 @@ func ReportSingleApp(appName string, infoFlag string) error {
"--proxy-port-map": reportPortMap, "--proxy-port-map": reportPortMap,
} }
flagKeys := []string{}
for flagKey := range flags {
flagKeys = append(flagKeys, flagKey)
}
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, infoFlag, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("proxy", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("proxy", appName, infoFlag, infoFlags, flagKeys, trimPrefix, uppercaseFirstCharacter)
} }
func reportEnabled(appName string) string { func reportEnabled(appName string) string {

View File

@@ -28,10 +28,15 @@ func ReportSingleApp(appName, infoFlag string) error {
flags[flag] = fn flags[flag] = fn
} }
flagKeys := []string{}
for flagKey := range flags {
flagKeys = append(flagKeys, flagKey)
}
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, infoFlag, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("ps", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("ps", appName, infoFlag, infoFlags, flagKeys, trimPrefix, uppercaseFirstCharacter)
} }
func addStatusFlags(appName string, infoFlag string) map[string]common.ReportFunc { func addStatusFlags(appName string, infoFlag string) map[string]common.ReportFunc {

View File

@@ -28,15 +28,20 @@ func ReportSingleApp(appName, infoFlag string) error {
return nil return nil
} }
infoFlags := map[string]string{} flags := map[string]string{}
for key, value := range resources { for key, value := range resources {
flag := fmt.Sprintf("--resource-%v", key) flag := fmt.Sprintf("--resource-%v", key)
infoFlags[flag] = value flags[flag] = value
}
flagKeys := []string{}
for flagKey := range flags {
flagKeys = append(flagKeys, flagKey)
} }
trimPrefix := true trimPrefix := true
uppercaseFirstCharacter := false uppercaseFirstCharacter := false
return common.ReportSingleApp("resource", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("resource", appName, infoFlag, flags, flagKeys, trimPrefix, uppercaseFirstCharacter)
} }
// GetResourceValue fetches a single value for a given app/process/request/key combination // GetResourceValue fetches a single value for a given app/process/request/key combination