Use kwargs

Author: Matei Stanescu

src/ops/inventory/sshconfig.py

@@ -49,13 +49,14 @@ def get_ssh_config_path(self, cluster_config, ssh_config_paths, args):
                           f"the proxy is running.",
                           color='blue',
                           stderr=True)
-            return self.generate_ssh_scb_config(ssh_config_tpl_path, ssh_proxy_port)
+            return self.generate_ssh_config_from_template(ssh_config_tpl_path, ssh_proxy_port)
         elif teleport_enabled:
             display.display(f"Using Teleport for SSH connections.\n"
                           f"Make sure you are logged in with 'tsh login'.",
                           color='blue',
                           stderr=True)
-            return self.generate_ssh_teleport_config(ssh_config_paths.get(SshConfigGenerator.SSH_TELEPORT_PROXY_TPL_FILE))
+            ssh_config_tpl_path = ssh_config_paths.get(SshConfigGenerator.SSH_TELEPORT_PROXY_TPL_FILE)
+            return self.generate_ssh_config_from_template(ssh_config_tpl_path, ssh_username=os.getlogin())
         else:
             return ssh_config_paths.get(SshConfigGenerator.SSH_CONFIG_FILE)
 
@@ -79,16 +80,8 @@ def get_ssh_proxy_port(self, ssh_config_path):
         ssh_port_path = ssh_config_path.replace("_tpl", "_port")
         return  Path(ssh_port_path).read_text()
 
-    def generate_ssh_scb_config(self, ssh_config_tpl_path, scb_proxy_port):
-        ssh_config_content = Path(ssh_config_tpl_path).read_text().format(
-            scb_proxy_port=scb_proxy_port
-        )
-        return self.generate_file_from_template(ssh_config_tpl_path, ssh_config_content)
-
-    def generate_ssh_teleport_config(self,  ssh_config_tpl_path):
-        ssh_config_content = Path(ssh_config_tpl_path).read_text().format(
-            ssh_username=os.getlogin()
-        )
+    def generate_ssh_config_from_template(self, ssh_config_tpl_path, **template_vars):
+        ssh_config_content = Path(ssh_config_tpl_path).read_text().format(**template_vars)
         return self.generate_file_from_template(ssh_config_tpl_path, ssh_config_content)
 
     def generate_file_from_template(self, ssh_config_tpl_path, ssh_config_content):