From f3c54dea37bb0f01e3478000ba614163c98ca067 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <ville.brofeldt@apple.com>
Date: Wed, 5 Oct 2022 12:45:13 +0300
Subject: [PATCH] chore(key-value): remove redundant exception logging

---
 superset/key_value/commands/create.py         |  1 -
 superset/key_value/commands/delete.py         |  1 -
 superset/key_value/commands/delete_expired.py |  1 -
 superset/key_value/commands/get.py            |  1 -
 superset/key_value/commands/update.py         |  1 -
 superset/key_value/commands/upsert.py         | 11 +++++++----
 superset/key_value/exceptions.py              |  4 ++++
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/superset/key_value/commands/create.py b/superset/key_value/commands/create.py
index d4ab4c5c3882a..93e99c223ba59 100644
--- a/superset/key_value/commands/create.py
+++ b/superset/key_value/commands/create.py
@@ -64,7 +64,6 @@ def run(self) -> Key:
             return self.create()
         except SQLAlchemyError as ex:
             db.session.rollback()
-            logger.exception("Error running create command")
             raise KeyValueCreateFailedError() from ex
 
     def validate(self) -> None:
diff --git a/superset/key_value/commands/delete.py b/superset/key_value/commands/delete.py
index f8ad291714ae1..b3cf84be07515 100644
--- a/superset/key_value/commands/delete.py
+++ b/superset/key_value/commands/delete.py
@@ -50,7 +50,6 @@ def run(self) -> bool:
             return self.delete()
         except SQLAlchemyError as ex:
             db.session.rollback()
-            logger.exception("Error running delete command")
             raise KeyValueDeleteFailedError() from ex
 
     def validate(self) -> None:
diff --git a/superset/key_value/commands/delete_expired.py b/superset/key_value/commands/delete_expired.py
index 4031d13968302..166a9f6f87abe 100644
--- a/superset/key_value/commands/delete_expired.py
+++ b/superset/key_value/commands/delete_expired.py
@@ -46,7 +46,6 @@ def run(self) -> None:
             self.delete_expired()
         except SQLAlchemyError as ex:
             db.session.rollback()
-            logger.exception("Error running delete command")
             raise KeyValueDeleteFailedError() from ex
 
     def validate(self) -> None:
diff --git a/superset/key_value/commands/get.py b/superset/key_value/commands/get.py
index 01560949e37ff..44c02331cccb9 100644
--- a/superset/key_value/commands/get.py
+++ b/superset/key_value/commands/get.py
@@ -52,7 +52,6 @@ def run(self) -> Any:
         try:
             return self.get()
         except SQLAlchemyError as ex:
-            logger.exception("Error running get command")
             raise KeyValueGetFailedError() from ex
 
     def validate(self) -> None:
diff --git a/superset/key_value/commands/update.py b/superset/key_value/commands/update.py
index 4078a0dcb6c41..b69ca5e70d76b 100644
--- a/superset/key_value/commands/update.py
+++ b/superset/key_value/commands/update.py
@@ -66,7 +66,6 @@ def run(self) -> Optional[Key]:
             return self.update()
         except SQLAlchemyError as ex:
             db.session.rollback()
-            logger.exception("Error running update command")
             raise KeyValueUpdateFailedError() from ex
 
     def validate(self) -> None:
diff --git a/superset/key_value/commands/upsert.py b/superset/key_value/commands/upsert.py
index 80b02555955f4..06b33c90fcfec 100644
--- a/superset/key_value/commands/upsert.py
+++ b/superset/key_value/commands/upsert.py
@@ -26,7 +26,10 @@
 from superset import db
 from superset.commands.base import BaseCommand
 from superset.key_value.commands.create import CreateKeyValueCommand
-from superset.key_value.exceptions import KeyValueUpdateFailedError
+from superset.key_value.exceptions import (
+    KeyValueCreateFailedError,
+    KeyValueUpsertFailedError,
+)
 from superset.key_value.models import KeyValueEntry
 from superset.key_value.types import Key, KeyValueResource
 from superset.key_value.utils import get_filter
@@ -66,10 +69,9 @@ def __init__(
     def run(self) -> Key:
         try:
             return self.upsert()
-        except SQLAlchemyError as ex:
+        except (KeyValueCreateFailedError, SQLAlchemyError) as ex:
             db.session.rollback()
-            logger.exception("Error running update command")
-            raise KeyValueUpdateFailedError() from ex
+            raise KeyValueUpsertFailedError() from ex
 
     def validate(self) -> None:
         pass
@@ -90,6 +92,7 @@ def upsert(self) -> Key:
             db.session.merge(entry)
             db.session.commit()
             return Key(entry.id, entry.uuid)
+
         return CreateKeyValueCommand(
             resource=self.resource,
             value=self.value,
diff --git a/superset/key_value/exceptions.py b/superset/key_value/exceptions.py
index fc66d24c2f323..b05daf6b89e02 100644
--- a/superset/key_value/exceptions.py
+++ b/superset/key_value/exceptions.py
@@ -46,5 +46,9 @@ class KeyValueUpdateFailedError(UpdateFailedError):
     message = _("An error occurred while updating the value.")
 
 
+class KeyValueUpsertFailedError(UpdateFailedError):
+    message = _("An error occurred while upserting the value.")
+
+
 class KeyValueAccessDeniedError(ForbiddenError):
     message = _("You don't have permission to modify the value.")