blob: aec4be2ec19ae52355b430450f0cb6e8dfe27bb2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/api_lib/sql/instances.py
index 0d88ffe..814a436 100644
--- a/lib/googlecloudsdk/api_lib/sql/instances.py
+++ b/lib/googlecloudsdk/api_lib/sql/instances.py
@@ -86,18 +86,19 @@ def GetRegionFromZone(gce_zone):
def _GetCloudSqlProxyPath():
"""Determines the path to the cloud_sql_proxy binary."""
sdk_bin_path = config.Paths().sdk_bin_path
- if not sdk_bin_path:
- # Check if cloud_sql_proxy is located on the PATH.
- proxy_path = file_utils.FindExecutableOnPath('cloud_sql_proxy')
- if proxy_path:
- log.debug(
- 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
- return proxy_path
- else:
- raise exceptions.ToolException(
- 'A Cloud SQL Proxy SDK root could not be found. Please check your '
- 'installation.')
- return os.path.join(sdk_bin_path, 'cloud_sql_proxy')
+ if sdk_bin_path and os.path.isfile(os.path.join(sdk_bin_path, 'cloud_sql_proxy')):
+ return os.path.join(sdk_bin_path, 'cloud_sql_proxy')
+
+ # Check if cloud_sql_proxy is located on the PATH.
+ proxy_path = file_utils.FindExecutableOnPath('cloud_sql_proxy')
+ if proxy_path:
+ log.debug(
+ 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
+ return proxy_path
+
+ raise exceptions.ToolException(
+ 'A Cloud SQL Proxy SDK root could not be found. Please check your '
+ 'installation.')
def _RaiseProxyError(error_msg=None):
|