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