Add flag --allow-incomplete

Cornelius Weig · Cornelius Weig · commit 50b440a60070 · 2020-01-10T12:45:17.000+01:00
This new flag controls whether to fail with an error or continue with a
warning, when fetching the list of api resources fails.
diff --git a/cmd/root.go b/cmd/root.go
@@ -90,6 +90,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&v, "verbosity", "v", constants.DefaultLogLevel.String(), "Log level (debug, info, warn, error, fatal, panic)")
 
 	rootCmd.Flags().BoolVar(&ketallOptions.UseCache, constants.FlagUseCache, false, "use cached list of server resources")
+	rootCmd.Flags().BoolVar(&ketallOptions.AllowIncomplete, constants.FlagAllowIncomplete, true, "show partial results when fetching of API resources fails")
 	rootCmd.Flags().StringVar(&ketallOptions.Scope, constants.FlagScope, "", "only resources with scope cluster|namespace")
 	rootCmd.Flags().StringVar(&ketallOptions.Since, constants.FlagSince, "", "only resources younger than given age")
 	rootCmd.Flags().StringVarP(&ketallOptions.Selector, constants.FlagSelector, "l", "", "selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)")
diff --git a/doc/USAGE.md b/doc/USAGE.md
@@ -16,6 +16,7 @@ kubectl get-all
 - `--exclude` will filter out the given resources (either plural names `componentstatuses` or short form `cs`). Defaults to `events` because those are rarely useful.
 - ...and many standard `kubectl` options. Have a look at `kubectl get-all --help` for a full list of supported flags.
 - `--use-cache` will consider the http cache to determine the server resources to look at. Disabled by default.
+- `--allow-incomplete` will show partial results when fetching the list of API resources fails. Enabled by default.
 - `--verbosity` set the log level (one of debug, info, warn, error, fatal, panic).
 
 **Hint**: If you do not have access to all resources, bulk fetching needs to be disabled. You can speed things up by explicitly excluding all resources which you may not access.
diff --git a/internal/client/client.go b/internal/client/client.go
@@ -94,10 +94,10 @@ func fetchAvailableGroupResources(cache bool, scope string, flags *genericcliopt
 
 	resources, err := client.ServerPreferredResources()
 	if err != nil {
-		if resources == nil {
+		if resources == nil || !viper.GetBool(constants.FlagAllowIncomplete) {
 			return nil, errors.Wrap(err, "get preferred resources")
 		}
-		logrus.Warnf("Could not fetch complete list of api resources, results will be incomplete: %s", err)
+		logrus.Warnf("Could not fetch complete list of API resources, results will be incomplete: %s", err)
 	}
 
 	var grs []groupResource
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
@@ -21,11 +21,12 @@ import "github.com/sirupsen/logrus"
 const (
 	DefaultLogLevel = logrus.WarnLevel
 
-	FlagExclude       = "exclude"
-	FlagNamespace     = "namespace"
-	FlagScope         = "only-scope"
-	FlagSince         = "since"
-	FlagUseCache      = "use-cache"
-	FlagSelector      = "selector"
-	FlagFieldSelector = "field-selector"
+	FlagExclude         = "exclude"
+	FlagNamespace       = "namespace"
+	FlagScope           = "only-scope"
+	FlagSince           = "since"
+	FlagUseCache        = "use-cache"
+	FlagAllowIncomplete = "allow-incomplete"
+	FlagSelector        = "selector"
+	FlagFieldSelector   = "field-selector"
 )
diff --git a/internal/options/options.go b/internal/options/options.go
@@ -31,6 +31,7 @@ type KetallOptions struct {
 	GenericCliFlags *genericclioptions.ConfigFlags
 	PrintFlags      KAPrintFlags
 	UseCache        bool
+	AllowIncomplete bool
 	Scope           string
 	Since           string
 	Selector        string

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,10 @@ func fetchAvailableGroupResources(cache bool, scope string, flags *genericcliopt`
`94`	`94`
`95`	`95`	`resources, err := client.ServerPreferredResources()`
`96`	`96`	`if err != nil {`
`97`		`- if resources == nil {`
	`97`	`+ if resources == nil \|\| !viper.GetBool(constants.FlagAllowIncomplete) {`
`98`	`98`	`return nil, errors.Wrap(err, "get preferred resources")`
`99`	`99`	`}`
`100`		`- logrus.Warnf("Could not fetch complete list of api resources, results will be incomplete: %s", err)`
	`100`	`+ logrus.Warnf("Could not fetch complete list of API resources, results will be incomplete: %s", err)`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`var grs []groupResource`