Antonio-RiveroMartnez commented on code in PR #21912: URL: https://github.com/apache/superset/pull/21912#discussion_r1019223551
########## superset/databases/models.py: ########## @@ -0,0 +1,86 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from typing import Any, Dict + +import sqlalchemy as sa +from flask_appbuilder import Model +from sqlalchemy.orm import backref, relationship +from sqlalchemy_utils import EncryptedType + +from superset import app +from superset.models.core import Database +from superset.models.helpers import ( + AuditMixinNullable, + ExtraJSONMixin, + ImportExportMixin, +) + +app_config = app.config + + +class SSHTunnel(Model, AuditMixinNullable, ExtraJSONMixin, ImportExportMixin): + """ + A ssh tunnel configuration in a database. + """ + + __tablename__ = "ssh_tunnel" + + id = sa.Column(sa.Integer, primary_key=True) + database_id = sa.Column(sa.Integer, sa.ForeignKey("dbs.id"), nullable=False) + database: Database = relationship( + "Database", + backref=backref("ssh_tunnel_credentials", cascade="all, delete-orphan"), Review Comment: Do we need to rename this to be `ssh_tunnel` in this file? ########## superset/databases/commands/test_connection.py: ########## @@ -90,7 +90,13 @@ def run(self) -> None: # pylint: disable=too-many-statements database.set_sqlalchemy_uri(uri) database.db_engine_spec.mutate_db_for_connection_test(database) - engine = database.get_sqla_engine() + from superset.databases.models import SSHTunnel + + if self._properties.get("ssh_tunnel_credentials"): Review Comment: Do we need to rename this to be `ssh_tunnel` in this file? ########## superset/migrations/versions/2022-10-20_10-48_f3c2d8ec8595_create_ssh_tunnel_credentials_tbl.py: ########## @@ -0,0 +1,75 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +"""create_ssh_tunnel_credentials_tbl + +Revision ID: f3c2d8ec8595 +Revises: deb4c9d4a4ef +Create Date: 2022-10-20 10:48:08.722861 + +""" + +# revision identifiers, used by Alembic. +revision = "f3c2d8ec8595" +down_revision = "deb4c9d4a4ef" + +from uuid import uuid4 + +import sqlalchemy as sa +from alembic import op +from sqlalchemy_utils import UUIDType + +from superset import app +from superset.extensions import encrypted_field_factory + +app_config = app.config + + +def upgrade(): + op.create_table( + "ssh_tunnel_credentials", Review Comment: Does this means user will still be creating a `ssh_tunnel_credentials` table? ########## superset/databases/schemas.py: ########## @@ -482,6 +502,8 @@ class DatabaseTestConnectionSchema(Schema, DatabaseParametersSchemaMixin): validate=[Length(1, 1024), sqlalchemy_uri_validator], ) + ssh_tunnel_credentials = fields.Nested(DatabaseSSHTunnel, allow_none=True) Review Comment: Do we need to rename this to be `ssh_tunnel` in this file? ########## superset/models/core.py: ########## @@ -368,17 +372,36 @@ def get_sqla_engine_with_context( schema: Optional[str] = None, nullpool: bool = True, source: Optional[utils.QuerySource] = None, + ssh_tunnel_credentials: Optional["SSHTunnel"] = None ) -> Engine: + ssh_params = None + if ssh_tunnel_credentials: Review Comment: Do we need to rename this to be `ssh_tunnel` in this file? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
