fix(CloudSqlProxyRunner): don't query connections from Airflow DB (#1…

…8006) Instead of directly querying connections from Airflow DB we use `get_connection()` which also support external secrets backends. Fixes: #18003
apache · Sep 3, 2021 · 21348c1 · 21348c1
1 parent 867e930
commit 21348c1
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/airflow/providers/google/cloud/hooks/cloud_sql.py b/airflow/providers/google/cloud/hooks/cloud_sql.py
@@ -39,7 +39,6 @@
 import httpx
 from googleapiclient.discovery import Resource, build
 from googleapiclient.errors import HttpError
-from sqlalchemy.orm import Session
 
 from airflow.exceptions import AirflowException
 
@@ -51,7 +50,6 @@
 from airflow.providers.mysql.hooks.mysql import MySqlHook
 from airflow.providers.postgres.hooks.postgres import PostgresHook
 from airflow.utils.log.logging_mixin import LoggingMixin
-from airflow.utils.session import provide_session
 
 UNIX_PATH_MAX = 108
 
@@ -516,10 +514,9 @@ def _download_sql_proxy_if_needed(self) -> None:
  os.chmod(self.sql_proxy_path, 0o744) # Set executable bit
  self.sql_proxy_was_downloaded = True
 
- @provide_session
- def _get_credential_parameters(self, session: Session) -> List[str]:
- connection = session.query(Connection).filter(Connection.conn_id == self.gcp_conn_id).first()
- session.expunge_all()
+ def _get_credential_parameters(self) -> List[str]:
+ connection = GoogleBaseHook.get_connection(conn_id=self.gcp_conn_id)
+
  if connection.extra_dejson.get(GCP_CREDENTIALS_KEY_PATH):
  credential_params = ['-credential_file', connection.extra_dejson[GCP_CREDENTIALS_KEY_PATH]]
  elif connection.extra_dejson.get(GCP_CREDENTIALS_KEYFILE_DICT):