From a86d8c1d9dc5c7400fef05bcc6cb572c0a4bdd20 Mon Sep 17 00:00:00 2001 From: Michael Mandrus Date: Wed, 25 May 2022 23:22:57 -0400 Subject: [PATCH] Turns out if err != nil, then the result is always nil. Return empty values if there is an error. --- pkg/services/secrets/kvstore/remote_plugin.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/services/secrets/kvstore/remote_plugin.go b/pkg/services/secrets/kvstore/remote_plugin.go index 12555d4b4d6..1d3d3a4e688 100644 --- a/pkg/services/secrets/kvstore/remote_plugin.go +++ b/pkg/services/secrets/kvstore/remote_plugin.go @@ -26,9 +26,10 @@ func (kv *secretsKVStorePlugin) Get(ctx context.Context, orgId int64, namespace Type: typ, }, } - res, err := kv.secretsPlugin.Get(ctx, req) - if err == nil && res.Error != "" { + if err != nil { + return "", false, err + } else if res.Error != "" { err = fmt.Errorf(res.Error) } @@ -85,7 +86,9 @@ func (kv *secretsKVStorePlugin) Keys(ctx context.Context, orgId int64, namespace } res, err := kv.secretsPlugin.Keys(ctx, req) - if err == nil && res.Error != "" { + if err != nil { + return nil, err + } else if res.Error != "" { err = fmt.Errorf(res.Error) }