config for arc no longer create temp folder for relay if there isn't …

…a cert and a priv key

src/ssh/azext_ssh/custom.py

@@ -35,7 +35,7 @@ def ssh_vm(cmd, resource_group_name=None, vm_name=None, resource_id=None, ssh_ip
     _assert_args(resource_group_name, vm_name, ssh_ip, resource_id, cert_file, local_user)
     credentials_folder = None
     do_ssh_op = _decide_op_call(cmd, resource_group_name, vm_name, resource_id, ssh_ip, None, None,
-                                ssh_client_path, ssh_args, delete_credentials)
+                                ssh_client_path, ssh_args, delete_credentials, credentials_folder)
     do_ssh_op(cmd, ssh_ip, public_key_file, private_key_file, local_user,
               cert_file, port, use_private_ip, credentials_folder)
 
@@ -49,10 +49,7 @@ def ssh_config(cmd, config_path, resource_group_name=None, vm_name=None, ssh_ip=
     if (public_key_file or private_key_file) and credentials_folder:
         raise azclierror.ArgumentUsageError("--keys-destination-folder can't be used in conjunction with "
                                             "--public-key-file/-p or --private-key-file/-i.")
-
-    do_ssh_op = _decide_op_call(cmd, resource_group_name, vm_name, resource_id, ssh_ip, config_path, overwrite,
-                                None, None, None)
-
+
     # Default credential location
     if not credentials_folder:
         config_folder = os.path.dirname(config_path)
@@ -67,6 +64,9 @@ def ssh_config(cmd, config_path, resource_group_name=None, vm_name=None, ssh_ip=
             folder_name = resource_info['resource_group'] + "-" + resource_info['resource_name']
 
         credentials_folder = os.path.join(config_folder, os.path.join("az_ssh_config", folder_name))
+
+    do_ssh_op = _decide_op_call(cmd, resource_group_name, vm_name, resource_id, ssh_ip, config_path, overwrite,
+                                None, None, False, credentials_folder)
     do_ssh_op(cmd, ssh_ip, public_key_file, private_key_file, local_user,
               cert_file, port, use_private_ip, credentials_folder)
 
@@ -137,8 +137,6 @@ def _do_ssh_op(cmd, ssh_ip, public_key_file, private_key_file, username,
                                                                                                private_key_file,
                                                                                                credentials_folder)
         cert_file, username = _get_and_write_certificate(cmd, public_key_file, None)
-
-    print(cert_file)
 
     op_call(relay_info, proxy_path, vm_name, ssh_ip, username, cert_file, private_key_file, port, is_arc, delete_keys, delete_cert, public_key_file)
 
@@ -378,7 +376,7 @@ def _arc_list_access_details(cmd, resource_group, vm_name):
 
 
 def _decide_op_call(cmd, resource_group_name, vm_name, resource_id, ssh_ip, config_path, overwrite,
-                    ssh_client_path, ssh_args, delete_credentials):
+                    ssh_client_path, ssh_args, delete_credentials, credentials_folder):
 
     # If the user provides an IP address the target will be treated as an Azure VM even if it is an
     # Arc Server. Which just means that the Connectivity Proxy won't be used to establish connection.
@@ -419,7 +417,7 @@ def _decide_op_call(cmd, resource_group_name, vm_name, resource_id, ssh_ip, conf
 
     if config_path:
         op_call = functools.partial(ssh_utils.write_ssh_config, config_path=config_path, overwrite=overwrite,
-                                    resource_group=resource_group_name)
+                                    resource_group=resource_group_name, credentials_folder=credentials_folder)
     else:
         op_call = functools.partial(ssh_utils.start_ssh_connection, ssh_client_path=ssh_client_path, ssh_args=ssh_args,
                                     delete_credentials=delete_credentials)

src/ssh/azext_ssh/ssh_utils.py

@@ -130,7 +130,7 @@ def get_ssh_cert_validity(cert_file):
 
 def write_ssh_config(relay_info, proxy_path, vm_name, ip, username,
                      cert_file, private_key_file, port, is_arc, delete_keys, delete_cert, _,
-                     config_path, overwrite, resource_group):
+                     config_path, overwrite, resource_group, credentials_folder):
 
     common_lines = []
     common_lines.append("\tUser " + username)
@@ -148,7 +148,10 @@ def write_ssh_config(relay_info, proxy_path, vm_name, ip, username,
         elif private_key_file:
             relay_info_dir = os.path.dirname(private_key_file)
         else:
-            relay_info_dir = tempfile.mkdtemp(prefix="ssharcrelayinfo")
+            # create the custom folder
+            relay_info_dir = credentials_folder
+            if not os.path.isdir(relay_info_dir):
+                 os.makedirs(credentials_folder)
 
         if ip:
             relay_info_filename = ip + "-relay_info"
@@ -266,7 +269,6 @@ def _build_args(cert_file, private_key_file, port):
 
 def _do_cleanup(delete_keys, delete_cert, cert_file, private_key, public_key, log_file=None, wait=False):
     if log_file:
-        print("reading log")
         t0 = time.time()
         match = False
         while (time.time() - t0) < const.CLEANUP_TOTAL_TIME_LIMIT_IN_SECONDS and not match:

src/ssh/setup.py

@@ -7,7 +7,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "0.1.9"
+VERSION = "0.2.1"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',