[superset] branch hugh-bg-fe updated: fix key reference for encrypted extra

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hugh pushed a commit to branch hugh-bg-fe
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/hugh-bg-fe by this push:
     new a22ceba  fix key reference for encrypted extra
a22ceba is described below

commit a22ceba88d30dfe84bb9029b4484e114774041be
Author: hughhhh <hu...@gmail.com>
AuthorDate: Fri May 21 10:06:22 2021 -0400

    fix key reference for encrypted extra
---
 superset/databases/commands/validate.py | 2 +-
 superset/models/core.py                 | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/superset/databases/commands/validate.py b/superset/databases/commands/validate.py
index beb028b..7e7af32 100644
--- a/superset/databases/commands/validate.py
+++ b/superset/databases/commands/validate.py
@@ -84,7 +84,7 @@ class ValidateDatabaseParametersCommand(BaseCommand):
         # try to connect
         sqlalchemy_uri = engine_spec.build_sqlalchemy_uri(
             self._properties["parameters"],  # type: ignore
-            self._properties["encrypted_extra"],
+            self._properties.get("encrypted_extra", "{}"),
         )
         if self._model and sqlalchemy_uri == self._model.safe_sqlalchemy_uri():
             sqlalchemy_uri = self._model.sqlalchemy_uri_decrypted
diff --git a/superset/models/core.py b/superset/models/core.py
index 3889f41..1868af6 100755
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -55,7 +55,6 @@ from sqlalchemy.sql import expression, Select
 
 from superset import app, db_engine_specs, is_feature_enabled
 from superset.db_engine_specs.base import TimeGrain
-from superset.db_engine_specs.bigquery import BigQueryEngineSpec
 from superset.extensions import cache_manager, encrypted_field_factory, security_manager
 from superset.models.helpers import AuditMixinNullable, ImportExportMixin
 from superset.models.tags import FavStarUpdater
@@ -242,7 +241,6 @@ class Database(
     def parameters(self) -> Dict[str, Any]:
         # Build parameters if db_engine_spec is a subclass of BasicParametersMixin
         parameters = {"engine": self.backend}
-
         if hasattr(self.db_engine_spec, "parameters_schema") and hasattr(
             self.db_engine_spec, "get_parameters_from_uri"
         ):