|
|
|
@ -2,7 +2,7 @@ diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/ap |
|
|
|
|
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):
|
|
|
|
|
@@ -85,18 +85,19 @@ def GetRegionFromZone(gce_zone):
|
|
|
|
|
def _GetCloudSqlProxyPath():
|
|
|
|
|
"""Determines the path to the cloud_sql_proxy binary."""
|
|
|
|
|
sdk_bin_path = config.Paths().sdk_bin_path
|
|
|
|
@ -14,7 +14,7 @@ index 0d88ffe..814a436 100644 |
|
|
|
|
- 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
|
|
|
|
|
- return proxy_path
|
|
|
|
|
- else:
|
|
|
|
|
- raise exceptions.ToolException(
|
|
|
|
|
- raise sql_exceptions.SqlProxyNotFound(
|
|
|
|
|
- 'A Cloud SQL Proxy SDK root could not be found. Please check your '
|
|
|
|
|
- 'installation.')
|
|
|
|
|
- return os.path.join(sdk_bin_path, 'cloud_sql_proxy')
|
|
|
|
@ -28,7 +28,7 @@ index 0d88ffe..814a436 100644 |
|
|
|
|
+ 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
|
|
|
|
|
+ return proxy_path
|
|
|
|
|
+
|
|
|
|
|
+ raise exceptions.ToolException(
|
|
|
|
|
+ raise sql_exceptions.SqlProxyNotFound(
|
|
|
|
|
+ 'A Cloud SQL Proxy SDK root could not be found. Please check your '
|
|
|
|
|
+ 'installation.')
|
|
|
|
|
|
|
|
|
|