This is an automated email from the ASF dual-hosted git repository. hugh pushed a commit to branch 2021.21.1 in repository https://gitbox.apache.org/repos/asf/superset.git
commit 3c16d6fcffc828db66d4581ead585913955a2b90 Author: Hugh A. Miles II <[email protected]> AuthorDate: Wed May 26 16:13:26 2021 -0400 fix merge conflict --- superset/db_engine_specs/base.py | 4 +++- superset/db_engine_specs/bigquery.py | 2 +- superset/models/core.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py index 97321b8..a79560c 100644 --- a/superset/db_engine_specs/base.py +++ b/superset/db_engine_specs/base.py @@ -1372,7 +1372,9 @@ class BasicParametersMixin: ) @classmethod - def get_parameters_from_uri(cls, uri: str) -> BasicParametersType: + def get_parameters_from_uri( + cls, uri: str, encrypted_extra: Optional[Dict[str, Any]] = None + ) -> BasicParametersType: url = make_url(uri) encryption = all( item in url.query.items() for item in cls.encryption_parameters.items() diff --git a/superset/db_engine_specs/bigquery.py b/superset/db_engine_specs/bigquery.py index a7ce77c..32414d2 100644 --- a/superset/db_engine_specs/bigquery.py +++ b/superset/db_engine_specs/bigquery.py @@ -49,7 +49,7 @@ ma_plugin = MarshmallowPlugin() class BigQueryParametersSchema(Schema): credentials_info = EncryptedField( - description="Contents of BigQuery JSON credentials.", + required=True, description="Contents of BigQuery JSON credentials.", ) diff --git a/superset/models/core.py b/superset/models/core.py index 540974f..ee8e822 100755 --- a/superset/models/core.py +++ b/superset/models/core.py @@ -246,7 +246,8 @@ class Database( self.db_engine_spec, "get_parameters_from_uri" ): uri = make_url(self.sqlalchemy_uri_decrypted) - return {**parameters, **self.db_engine_spec.get_parameters_from_uri(uri)} # type: ignore + encrypted_extra = self.get_encrypted_extra() + return {**parameters, **self.db_engine_spec.get_parameters_from_uri(uri, encrypted_extra=encrypted_extra)} # type: ignore return parameters
