Skip to content

Commit 2702590

Browse files
author
Uziel Silva
committed
fix(main) Fix linting and undefined cases
Changelog: - Fix linting issues - Define `self.proxy` on the constructor - Prevent issues with undefined variables
1 parent f5be3ac commit 2702590

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

google/cloud/sql/connector/connector.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
from google.cloud.sql.connector.lazy import LazyRefreshCache
3838
from google.cloud.sql.connector.monitored_cache import MonitoredCache
3939
import google.cloud.sql.connector.pg8000 as pg8000
40+
from google.cloud.sql.connector.proxy import start_local_proxy
4041
import google.cloud.sql.connector.psycopg as psycopg
4142
import google.cloud.sql.connector.pymysql as pymysql
4243
import google.cloud.sql.connector.pytds as pytds
4344
from google.cloud.sql.connector.resolver import DefaultResolver
4445
from google.cloud.sql.connector.resolver import DnsResolver
4546
from google.cloud.sql.connector.utils import format_database_user
4647
from google.cloud.sql.connector.utils import generate_keys
47-
from google.cloud.sql.connector.proxy import start_local_proxy
4848

4949
logger = logging.getLogger(name=__name__)
5050

@@ -156,6 +156,7 @@ def __init__(
156156
# connection name string and enable_iam_auth boolean flag
157157
self._cache: dict[tuple[str, bool], MonitoredCache] = {}
158158
self._client: Optional[CloudSQLClient] = None
159+
self._proxy: Optional[asyncio.Task] = None
159160

160161
# initialize credentials
161162
scopes = ["https://www.googleapis.com/auth/sqlservice.admin"]
@@ -385,7 +386,7 @@ async def connect_async(
385386
# async drivers are unblocking and can be awaited directly
386387
if driver in ASYNC_DRIVERS:
387388
return await connector(
388-
host,
389+
ip_address,
389390
await conn_info.create_ssl_context(enable_iam_auth),
390391
**kwargs,
391392
)

google/cloud/sql/connector/proxy.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
limitations under the License.
1515
"""
1616

17-
import socket
18-
import os
19-
import ssl
2017
import asyncio
18+
import os
2119
from pathlib import Path
20+
import socket
21+
import ssl
2222
from typing import Optional
2323

2424
from google.cloud.sql.connector.exceptions import LocalProxyStartupError

google/cloud/sql/connector/psycopg.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import ssl
1818
from typing import Any, TYPE_CHECKING
19-
import threading
2019

2120
SERVER_PROXY_PORT = 3307
2221

tests/unit/test_psycopg.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
import ssl
1919
from typing import Any
2020

21-
from mock import patch, PropertyMock
21+
from mock import patch
22+
from mock import PropertyMock
2223
import pytest
2324

2425
from google.cloud.sql.connector.psycopg import connect

0 commit comments

Comments
 (0)