From ad6988be32295e1931251d1b5cd510541c516661 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Wed, 27 Feb 2019 16:26:12 -0500
Subject: Add debugging for errors to Cobra compatibility macros

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
 cmd/podman/cliconfig/commands.go | 56 +++++++++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 9 deletions(-)

(limited to 'cmd')

diff --git a/cmd/podman/cliconfig/commands.go b/cmd/podman/cliconfig/commands.go
index 7d1e762d9..3361c14b8 100644
--- a/cmd/podman/cliconfig/commands.go
+++ b/cmd/podman/cliconfig/commands.go
@@ -1,5 +1,7 @@
 package cliconfig
 
+import "github.com/sirupsen/logrus"
+
 // GlobalIsSet is a compatibility method for urfave
 func (p *PodmanCommand) GlobalIsSet(opt string) bool {
 	flag := p.PersistentFlags().Lookup(opt)
@@ -22,9 +24,13 @@ func (p *PodmanCommand) IsSet(opt string) bool {
 func (p *PodmanCommand) Bool(opt string) bool {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return false
 	}
-	val, _ := p.Flags().GetBool(opt)
+	val, err := p.Flags().GetBool(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
 
@@ -32,9 +38,13 @@ func (p *PodmanCommand) Bool(opt string) bool {
 func (p *PodmanCommand) String(opt string) string {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return ""
 	}
-	val, _ := p.Flags().GetString(opt)
+	val, err := p.Flags().GetString(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
 
@@ -42,9 +52,13 @@ func (p *PodmanCommand) String(opt string) string {
 func (p *PodmanCommand) StringArray(opt string) []string {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return []string{}
 	}
-	val, _ := p.Flags().GetStringArray(opt)
+	val, err := p.Flags().GetStringArray(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
 
@@ -52,9 +66,13 @@ func (p *PodmanCommand) StringArray(opt string) []string {
 func (p *PodmanCommand) StringSlice(opt string) []string {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return []string{}
 	}
-	val, _ := p.Flags().GetStringSlice(opt)
+	val, err := p.Flags().GetStringSlice(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
 
@@ -62,9 +80,13 @@ func (p *PodmanCommand) StringSlice(opt string) []string {
 func (p *PodmanCommand) Int(opt string) int {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return 0
 	}
-	val, _ := p.Flags().GetInt(opt)
+	val, err := p.Flags().GetInt(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
 
@@ -72,9 +94,13 @@ func (p *PodmanCommand) Int(opt string) int {
 func (p *PodmanCommand) Uint(opt string) uint {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return 0
 	}
-	val, _ := p.Flags().GetUint(opt)
+	val, err := p.Flags().GetUint(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
 
@@ -82,9 +108,13 @@ func (p *PodmanCommand) Uint(opt string) uint {
 func (p *PodmanCommand) Int64(opt string) int64 {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return 0
 	}
-	val, _ := p.Flags().GetInt64(opt)
+	val, err := p.Flags().GetInt64(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
 
@@ -92,9 +122,13 @@ func (p *PodmanCommand) Int64(opt string) int64 {
 func (p *PodmanCommand) Uint64(opt string) uint64 {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return 0
 	}
-	val, _ := p.Flags().GetUint64(opt)
+	val, err := p.Flags().GetUint64(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
 
@@ -102,8 +136,12 @@ func (p *PodmanCommand) Uint64(opt string) uint64 {
 func (p *PodmanCommand) Float64(opt string) float64 {
 	flag := p.Flags().Lookup(opt)
 	if flag == nil {
+		logrus.Errorf("Could not find flag %s", opt)
 		return 0
 	}
-	val, _ := p.Flags().GetFloat64(opt)
+	val, err := p.Flags().GetFloat64(opt)
+	if err != nil {
+		logrus.Errorf("Error getting flag %s: %v", opt, err)
+	}
 	return val
 }
-- 
cgit v1.2.3-54-g00ecf