forked from apache/airflow
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[AIRFLOW-XXXX] Expose SQLAlchemy's connect_args and make it configura…
…ble (apache#6478) In many use cases users need to configure SQLAlchemy's connect_args (e.g. pass ssl.check_hostname=False to PyMySQL), and Airflow should expose this option and make it configurable.
- Loading branch information
Showing
4 changed files
with
125 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # | ||
| # 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. | ||
|
|
||
| import unittest | ||
|
|
||
| from sqlalchemy.pool import NullPool | ||
|
|
||
| from airflow import settings | ||
| from tests.compat import patch | ||
| from tests.test_utils.config import conf_vars | ||
|
|
||
| SQL_ALCHEMY_CONNECT_ARGS = { | ||
| 'test': 43503, | ||
| 'dict': { | ||
| 'is': 1, | ||
| 'supported': 'too' | ||
| } | ||
| } | ||
|
|
||
|
|
||
| class TestSqlAlchemySettings(unittest.TestCase): | ||
| def setUp(self): | ||
| self.old_engine = settings.engine | ||
| self.old_session = settings.Session | ||
| self.old_conn = settings.SQL_ALCHEMY_CONN | ||
| settings.SQL_ALCHEMY_CONN = "mysql+foobar://user:pass@host/dbname?inline=param&another=param" | ||
|
|
||
| def tearDown(self): | ||
| settings.engine = self.old_engine | ||
| settings.Session = self.old_session | ||
| settings.SQL_ALCHEMY_CONN = self.old_conn | ||
|
|
||
| @patch('airflow.settings.setup_event_handlers') | ||
| @patch('airflow.settings.scoped_session') | ||
| @patch('airflow.settings.sessionmaker') | ||
| @patch('airflow.settings.create_engine') | ||
| def test_configure_orm_with_default_values(self, | ||
| mock_create_engine, | ||
| mock_sessionmaker, | ||
| mock_scoped_session, | ||
| mock_setup_event_handlers): | ||
| settings.configure_orm() | ||
| mock_create_engine.assert_called_once_with( | ||
| settings.SQL_ALCHEMY_CONN, | ||
| connect_args={}, | ||
| encoding='utf-8', | ||
| max_overflow=10, | ||
| pool_pre_ping=True, | ||
| pool_recycle=1800, | ||
| pool_size=5 | ||
| ) | ||
|
|
||
| @patch('airflow.settings.setup_event_handlers') | ||
| @patch('airflow.settings.scoped_session') | ||
| @patch('airflow.settings.sessionmaker') | ||
| @patch('airflow.settings.create_engine') | ||
| def test_sql_alchemy_connect_args(self, | ||
| mock_create_engine, | ||
| mock_sessionmaker, | ||
| mock_scoped_session, | ||
| mock_setup_event_handlers): | ||
| config = { | ||
| ('core', 'sql_alchemy_connect_args'): 'tests.test_sqlalchemy_config.SQL_ALCHEMY_CONNECT_ARGS', | ||
| ('core', 'sql_alchemy_pool_enabled'): 'False' | ||
| } | ||
| with conf_vars(config): | ||
| settings.configure_orm() | ||
| mock_create_engine.assert_called_once_with( | ||
| settings.SQL_ALCHEMY_CONN, | ||
| connect_args=SQL_ALCHEMY_CONNECT_ARGS, | ||
| poolclass=NullPool, | ||
| encoding='utf-8' | ||
| ) | ||
|
|
||
| @patch('airflow.settings.setup_event_handlers') | ||
| @patch('airflow.settings.scoped_session') | ||
| @patch('airflow.settings.sessionmaker') | ||
| @patch('airflow.settings.create_engine') | ||
| def test_sql_alchemy_invalid_connect_args(self, | ||
| mock_create_engine, | ||
| mock_sessionmaker, | ||
| mock_scoped_session, | ||
| mock_setup_event_handlers): | ||
| config = { | ||
| ('core', 'sql_alchemy_connect_args'): 'does.not.exist', | ||
| ('core', 'sql_alchemy_pool_enabled'): 'False' | ||
| } | ||
| with self.assertRaises(ImportError): | ||
| with conf_vars(config): | ||
| settings.configure_orm() |