From fdc4c47f1c175407f3eee54e9796f9b6bae94c2f Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Fri, 15 Jul 2022 00:11:55 +0200
Subject: [PATCH] Encryption: Re-order error check (#52251) (#52293)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 973b3112d76c9a9286a3694909375cc4b56925da)

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
---
 pkg/services/secrets/database/database.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/services/secrets/database/database.go b/pkg/services/secrets/database/database.go
index 57867d81d55..7a88a9f4862 100644
--- a/pkg/services/secrets/database/database.go
+++ b/pkg/services/secrets/database/database.go
@@ -38,14 +38,14 @@ func (ss *SecretsStoreImpl) GetDataKey(ctx context.Context, id string) (*secrets
 		return err
 	})
 
-	if !exists {
-		return nil, secrets.ErrDataKeyNotFound
-	}
-
 	if err != nil {
 		return nil, fmt.Errorf("failed getting data key: %w", err)
 	}
 
+	if !exists {
+		return nil, secrets.ErrDataKeyNotFound
+	}
+
 	return dataKey, nil
 }