From b5f8d566d83ef6469d32c58b5e7d8f4b3efb9783 Mon Sep 17 00:00:00 2001
From: vivekjainx86 <vivekjainx86@gmail.com>
Date: Mon, 23 May 2022 12:47:47 +0530
Subject: [PATCH 1/2] Handle k8s list error

---
 pkg/cmd/postgresdump.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/cmd/postgresdump.go b/pkg/cmd/postgresdump.go
index 87c0f87..3d01d15 100644
--- a/pkg/cmd/postgresdump.go
+++ b/pkg/cmd/postgresdump.go
@@ -77,10 +77,11 @@ var postgresdumpCMD = &cobra.Command{
 		}
 
 		postgresUserList := &v1beta2.PostgresUserList{}
-		_ = kubeObj.Client.List(ctx, postgresUserList, client.InNamespace(target.Namespace))
-		if len(postgresUserList.Items) == 0 {
-			return errors.Wrap(err, "failed to get postgres users list")
+		err = kubeObj.Client.List(ctx, postgresUserList, client.InNamespace(target.Namespace))
+		if err != nil {
+			return errors.Wrap(err, "failed to get postgres user")
 		}
+
 		postgresUser := &v1beta2.PostgresUser{}
 		for _, postgresUsr := range postgresUserList.Items {
 			if postgresUsr.Spec.Mode == "owner" && postgresUsr.Name == args[0] {
@@ -89,7 +90,7 @@ var postgresdumpCMD = &cobra.Command{
 			}
 		}
 		if postgresUser.Name == "" {
-			return errors.Wrap(err, "failed to get postgres user")
+			return fmt.Errorf("No Postgres users of type owner found in namespace: %s", target.Namespace)
 		}
 
 		var instanceName string

From bb298dda0ce7a881252a5ca7274114cb39bbdcdb Mon Sep 17 00:00:00 2001
From: vivekjainx86 <vivekjainx86@gmail.com>
Date: Mon, 23 May 2022 14:13:23 +0530
Subject: [PATCH 2/2] use New/Errorf for throwing new error

---
 pkg/cmd/decrypt.go     | 2 +-
 pkg/cmd/edit/object.go | 2 +-
 pkg/cmd/password.go    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/cmd/decrypt.go b/pkg/cmd/decrypt.go
index 3ec11ab..f3550a3 100644
--- a/pkg/cmd/decrypt.go
+++ b/pkg/cmd/decrypt.go
@@ -137,7 +137,7 @@ func GetDecryptedData(kmsService kmsiface.KMSAPI, encryptedData []byte) ([]byte,
 	// Decrypt file content
 	plaintext, ok = secretbox.Open(plaintext, p.Message, p.Nonce, plainDataKey)
 	if !ok {
-		return plaintext, errors.Wrap(err, "error decrypting value with data key")
+		return plaintext, errors.New("Error decrypting value with data key")
 	}
 	return plaintext, nil
 }
diff --git a/pkg/cmd/edit/object.go b/pkg/cmd/edit/object.go
index 5e66d34..cde22a0 100644
--- a/pkg/cmd/edit/object.go
+++ b/pkg/cmd/edit/object.go
@@ -234,7 +234,7 @@ func (o *Object) Decrypt(kmsService kmsiface.KMSAPI, recrypt bool) error {
 			var plaintext []byte
 			plaintext, ok = secretbox.Open(plaintext, p.Message, p.Nonce, plainDataKey)
 			if !ok {
-				return errors.Wrapf(err, "error decrypting value with data key for %s", key)
+				return errors.Errorf("error decrypting value with data key for %s", key)
 			}
 			dec.Data[key] = string(plaintext)
 			keyUsageCount[keyId] = keyUsageCount[keyId] + 1
diff --git a/pkg/cmd/password.go b/pkg/cmd/password.go
index 37bfc67..b4e02db 100644
--- a/pkg/cmd/password.go
+++ b/pkg/cmd/password.go
@@ -113,7 +113,7 @@ var passwordCmd = &cobra.Command{
 				}
 			}
 			if len(readOnlysecrets) == 0 {
-				return errors.Wrapf(err, "no readonly secrets found for instance %s", args[0])
+				return errors.Errorf("no readonly secrets found for instance %s", args[0])
 			}
 			// prompt user to select a readonly secret
 			prompt := promptui.Select{