[SSH] Cast "certificate_validity" as an int before calling ListCreden…

…tials (#7077)
Azure · Mar 7, 2024 · 1659fae · 1659fae
1 parent c4baba3
commit 1659fae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/ssh/HISTORY.md b/src/ssh/HISTORY.md
@@ -1,7 +1,8 @@
 Release History
 ===============
-upcoming
+2.0.3
 -----
+* [Bug Fix] Ensure that certificate validity value is always an integer when retrieving relay information for connecting to Arc Machines.
 * Add support to ARM64 clients when connecting to Arc Machines. Connect proxy now available for ARM64 architecture.
 
 2.0.2

diff --git a/src/ssh/azext_ssh/connectivity_utils.py b/src/ssh/azext_ssh/connectivity_utils.py
@@ -178,7 +178,7 @@ def _list_credentials(cmd, resource_uri, certificate_validity_in_seconds):
     list_cred_args = {
         'endpoint_name': 'default',
         'resource_uri': resource_uri,
-        'expiresin': certificate_validity_in_seconds,
+        'expiresin': int(certificate_validity_in_seconds),
         'service_name': "SSH"
     }
 
@@ -224,7 +224,7 @@ def get_client_side_proxy(arc_proxy_folder):
         os.chmod(install_location, os.stat(install_location).st_mode | stat.S_IXUSR)
         print_styled_text((Style.SUCCESS, f"SSH Client Proxy saved to {install_location}"))
 
-        _download_proxy_license()
+        _download_proxy_license(arc_proxy_folder)
 
     return install_location
 
@@ -272,8 +272,9 @@ def _get_proxy_filename_and_url(arc_proxy_folder):
     return request_uri, install_location, older_location
 
 
-def _download_proxy_license():
-    proxy_dir = os.path.join('~', ".clientsshproxy")
+def _download_proxy_license(proxy_dir):
+    if not proxy_dir:
+        proxy_dir = os.path.join('~', ".clientsshproxy")
     license_uri = f"{consts.CLIENT_PROXY_STORAGE_URL}/{consts.CLIENT_PROXY_RELEASE}/LICENSE.txt"
     license_install_location = os.path.expanduser(os.path.join(proxy_dir, "LICENSE.txt"))
 

diff --git a/src/ssh/setup.py b/src/ssh/setup.py
@@ -7,7 +7,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "2.0.2"
+VERSION = "2.0.3"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',