Merge pull request #131752 from iAmMrinal0/update/google-cloud-sdk
This commit is contained in:
commit
d905ae22c6
|
@ -2,7 +2,7 @@ diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/ap
|
||||||
index 0d88ffe..814a436 100644
|
index 0d88ffe..814a436 100644
|
||||||
--- a/lib/googlecloudsdk/api_lib/sql/instances.py
|
--- a/lib/googlecloudsdk/api_lib/sql/instances.py
|
||||||
+++ b/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():
|
def _GetCloudSqlProxyPath():
|
||||||
"""Determines the path to the cloud_sql_proxy binary."""
|
"""Determines the path to the cloud_sql_proxy binary."""
|
||||||
sdk_bin_path = config.Paths().sdk_bin_path
|
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))
|
- 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
|
||||||
- return proxy_path
|
- return proxy_path
|
||||||
- else:
|
- else:
|
||||||
- raise exceptions.ToolException(
|
- raise sql_exceptions.SqlProxyNotFound(
|
||||||
- 'A Cloud SQL Proxy SDK root could not be found. Please check your '
|
- 'A Cloud SQL Proxy SDK root could not be found. Please check your '
|
||||||
- 'installation.')
|
- 'installation.')
|
||||||
- return os.path.join(sdk_bin_path, 'cloud_sql_proxy')
|
- 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))
|
+ 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path))
|
||||||
+ return 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 '
|
+ 'A Cloud SQL Proxy SDK root could not be found. Please check your '
|
||||||
+ 'installation.')
|
+ 'installation.')
|
||||||
|
|
||||||
|
|
|
@ -21,23 +21,23 @@ let
|
||||||
sources = name: system: {
|
sources = name: system: {
|
||||||
x86_64-darwin = {
|
x86_64-darwin = {
|
||||||
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
|
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
|
||||||
sha256 = "1h02pywzjn2d4p07xic1936w5qjbaz33qny8afrgzvgbqnqx7dvs";
|
sha256 = "0gln8v1yyyis9sd8hldw4g1hdx1022iqqacq3lca5mfhp2j9bffk";
|
||||||
};
|
};
|
||||||
|
|
||||||
aarch64-darwin = {
|
aarch64-darwin = {
|
||||||
url = "${baseUrl}/${name}-darwin-arm.tar.gz";
|
url = "${baseUrl}/${name}-darwin-arm.tar.gz";
|
||||||
sha256 = "0qrmrxzphslhq3xf01zh91v7fvqn0z4hv8rpd15qwq9q84d2c3gr";
|
sha256 = "1wzi81a2p5wj547nb2i60iz76c78iv2pbynjb266a53i8d1ldxla";
|
||||||
};
|
};
|
||||||
|
|
||||||
x86_64-linux = {
|
x86_64-linux = {
|
||||||
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
||||||
sha256 = "0lz14d9gs6k0zbnyvrl6zyj8w7f6a5z7q95y48jkizc822rajhc3";
|
sha256 = "1vlcwab68d8rpzkjcwj83qn35bq0awsl15p35x5qpsymmvf046l6";
|
||||||
};
|
};
|
||||||
}.${system};
|
}.${system};
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "google-cloud-sdk";
|
pname = "google-cloud-sdk";
|
||||||
version = "348.0.0";
|
version = "350.0.0";
|
||||||
|
|
||||||
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
|
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue