ops-cli 2.3.1__py3-none-any.whl → 2.4.0__py3-none-any.whl

ops/cli/__init__.py

@@ -11,6 +11,7 @@
 import os
 from subprocess import Popen, PIPE
 import sys
+from shutil import which
 
 
 def get_output(command, trim=True):
@@ -41,3 +42,8 @@ def get_config_value(config, key):
         err("You must set the %s value in %s.yaml or in the cli as an extra variable: -e %s=value" %
             (e.message, config['cluster'], e.message))
         sys.exit(1)
+
+def check_if_teleport_binary_installed():
+    if which("tsh") is None:
+        err('tsh binary needs to be installed for Teleport to work!')
+        sys.exit(2)

ops/cli/parser.py

@@ -112,5 +112,7 @@ def configure_common_ansible_args(parser):
     parser.add_argument('--noscb', action='store_false', dest='use_scb',
                         help='Disable use of Shell Control Box (SCB) even if '
                              'it is enabled in the cluster config')
+    parser.add_argument('--teleport', action='store_false', dest='use_teleport',
+                        help='Use Teleport for SSH')
 
     return parser

ops/cli/playbook.py

@@ -73,9 +73,11 @@ class PlaybookRunner(object):
     def run(self, args, extra_args):
         logger.info("Found extra_args %s", extra_args)
         inventory_path, ssh_config_paths = self.inventory_generator.generate()
-        ssh_config_path = SshConfigGenerator.get_ssh_config_path(self.cluster_config,
+        ssh_config_generator = SshConfigGenerator(self.ops_config.package_dir)
+        ssh_config_path = ssh_config_generator.get_ssh_config_path(self.cluster_config,
                                                                  ssh_config_paths,
-                                                                 args.use_scb)
+                                                                 args)
+                                                                 
         ssh_config = f"ANSIBLE_SSH_ARGS='-F {ssh_config_path}'"
 
         ansible_config = "ANSIBLE_CONFIG=%s" % self.ops_config.ansible_config_path

ops/cli/run.py

@@ -68,9 +68,10 @@ class CommandRunner(object):
         logger.info("Found extra_args %s", extra_args)
         inventory_path, ssh_config_paths = self.inventory_generator.generate()
         limit = args.host_pattern
-        ssh_config_path = SshConfigGenerator.get_ssh_config_path(self.cluster_config,
+        ssh_config_generator = SshConfigGenerator(self.ops_config.package_dir)
+        ssh_config_path = ssh_config_generator.get_ssh_config_path(self.cluster_config,
                                                                  ssh_config_paths,
-                                                                 args.use_scb)
+                                                                 args)
         extra_args = ' '.join(args.extra_args)
         command = """cd {root_dir}
 ANSIBLE_SSH_ARGS='-F {ssh_config}' ANSIBLE_CONFIG={ansible_config_path} ansible -i {inventory_path} '{limit}' \\

ops/cli/ssh.py

@@ -16,7 +16,7 @@ from .parser import configure_common_arguments
 from ansible.inventory.host import Host
 from ops.inventory.sshconfig import SshConfigGenerator
 
-from . import err
+from . import err, check_if_teleport_binary_installed
 import sys
 import getpass
 import re
@@ -75,7 +75,7 @@ class SshParserConfig(SubParserConfig):
             action="store_true",
             help="Port tunnel a machine that does not have SSH. "
                  "Implies --ipaddress, and --tunnel; requires --local and --remote"
-                )
+            )
         parser.add_argument(
             '--keygen',
             action='store_true',
@@ -86,6 +86,11 @@ class SshParserConfig(SubParserConfig):
             dest='use_scb',
             help='Disable use of Shell Control Box (SCB) even if it is '
                  'enabled in the cluster config')
+        parser.add_argument(
+            '--teleport',
+            action='store_false',
+            dest='use_teleport',
+            help='Use Teleport for SSH')
         parser.add_argument(
             '--auto_scb_port',
             action='store_true',
@@ -162,6 +167,60 @@ class SshRunner(object):
 
     def run(self, args, extra_args):
         logger.info("Found extra_args %s", extra_args)
+
+        self.check_if_keygen_arg(args)
+        self.exit_when_local_arg_not_match_regex(args)
+        self.exit_when_tunnel_used_with_incorrect_parameters(args)
+        self.exit_when_scb_enabled_but_scb_host_not_set(self.is_scb_enabled(args), self.get_scb_host(args))
+        self.exit_when_scb_proxy_used_with_incorect_parameters(args, self.get_scb_proxy_port(args))
+
+        group = "%s,&%s" % (self.cluster_name, args.role)
+        self.set_args_index(args)
+        self.set_args_if_nossh(args)
+
+        display("Expression %s matched hosts (max 10): " % group, stderr=True)
+        host_names = self.get_host_names(group, self.get_hosts_with_fallback(args, group))
+        display('\n'.join(host_names), color='blue')
+
+        host = self.resolve_host(args, host_names, group)
+        ssh_host = self.resolve_ssh_host(args, host)
+        ssh_user = args.user or self.get_ssh_user_from_config()
+
+        self.ssh_opts_extend_with_user_arg(ssh_user, args)
+
+
+        ssh_config = SshConfig(self.is_scb_enabled(args),
+                               self.is_teleport_enabled(args),
+                               self.get_ssh_config_prop(args),
+                               ssh_user,
+                               ssh_host,
+                               self.get_ssh_host_dest(args, ssh_host),
+                               self.get_ssh_host_bastion(args, ssh_host),
+                               self.get_scb_host(args),
+                               self.get_scb_ssh_host(ssh_host, args),
+                               host,
+                               self.get_scb_proxy_port(args))
+
+        command = self.build_ssh_command(args, ssh_config)
+        display(command, color="purple")
+
+        self.check_passwordless_wrapper()
+
+        display(
+            "SSH-ing to %s[%d] => %s" %
+            (args.role,
+             args.index,
+             host.name),
+            color="green",
+            stderr=True)
+
+        return dict(command=command)
+
+    def get_ssh_config_prop(self, args):
+        return args.ssh_config or self.ops_config.get(
+            'ssh.config') or self.ansible_inventory.get_ssh_config()
+
+    def check_if_keygen_arg(self, args):
         if args.keygen:
             if self.cluster_config.has_ssh_keys:
                 err('Cluster already has ssh keys, refusing to overwrite')
@@ -172,64 +231,41 @@ class SshRunner(object):
                 display(
                     'Trying to generate ssh keys in:\n{} and \n{}'.format(
                         pub_key_file, prv_key_file))
-                if os.path.isfile(
-                        pub_key_file) or os.path.isfile(prv_key_file):
+                if os.path.isfile(pub_key_file) or os.path.isfile(prv_key_file):
                     err('Although we do not have a complete keyset, one of the files exists and we refuse to overwrite\n')
                     sys.exit(2)
                 else:
                     # generate ssh keypair. The passphrase will be the name of
                     # the cluster
-                    cmd = "ssh-keygen -t rsa -b 4096 -N {} -f {}".format(
-                        self.cluster_name, prv_key_file).split(' ')
+                    cmd = "ssh-keygen -t rsa -b 4096 -N {} -f {}".format(self.cluster_name, prv_key_file).split(' ')
                     print(cmd)
                     call(cmd)
             return
 
-        if args.local and not IP_HOST_REG_EX.match(args.local):
-            err('The --local parameter must be in the form of host-ip:port or port')
-            sys.exit(2)
-
-        if args.tunnel or args.nossh:
-            if args.local is None or args.remote is None:
-                err('When using --tunnel or --nossh both the --local and --remote parameters are required')
-                sys.exit(2)
-
-        scb_settings = self.cluster_config.get('scb', {})
-        scb_enabled = scb_settings.get('enabled') and args.use_scb
-        scb_host = scb_settings.get('host') or self.ops_config.get('scb.host')
-        scb_proxy_port = scb_settings.get('proxy_port')
-
-        if scb_enabled and not scb_host:
-            err('When scb is enabled scb_host is required!')
-            sys.exit(2)
-
-        if args.proxy:
-            if args.local is None and (args.auto_scb_port is False and not scb_proxy_port):
-                err('When using --proxy the --local parameter is required if not using '
-                    '--auto_scb_port and scb.proxy_port is not configured in the cluster config')
-                sys.exit(2)
-
-        group = "%s,&%s" % (self.cluster_name, args.role)
-
+    def set_args_index(self, args):
         args.index = args.index - 1
         if args.index < 0:
             args.index = 0
 
-        hosts = self.ansible_inventory.get_hosts(group)
+    def get_hosts_with_fallback(self, args, group):
+        hosts = self.get_ansible_hosts(group)
         if len(hosts) <= args.index:
-            group = args.role
-            hosts = self.ansible_inventory.get_hosts(group)
-            if not hosts:
-                display(
-                    "No host found in inventory, using provided name %s" %
+            hosts = self.ansible_inventory.get_hosts(args.role)
+            self.exit_if_hosts_null(args, hosts)
+        return hosts
+
+    def exit_if_hosts_null(self, args, hosts):
+        if not hosts:
+            display("No host found in inventory, using provided name %s" %
                     (args.role), color="purple", stderr=True)
 
-        display("Expression %s matched hosts (max 10): " % group, stderr=True)
-        host_names = [host.name for host in hosts]
-        for name in host_names[:10]:
-            display(name, color='blue')
+    def get_host_names(self, group, hosts):
+        return [host.name for host in hosts[:10]]
+
+    def get_ansible_hosts(self, group):
+        return self.ansible_inventory.get_hosts(group)
 
-        host = None
+    def resolve_host(self, args, host_names, group):
         if host_names:
             if args.index < len(host_names):
                 host = self.ansible_inventory.get_host(host_names[args.index])
@@ -238,85 +274,102 @@ class SshRunner(object):
                     "Index out of bounds for %s" %
                     (group), color="red", stderr=True)
                 return
-        if host:
-            ssh_host = host.vars.get('ansible_ssh_host') or host.name
         else:
             # no host found in inventory, use the role provided
-            bastion = self.ansible_inventory.get_hosts(
-                'bastion')[0].vars.get('ansible_ssh_host')
             host = Host(name=args.role)
-            ssh_host = f'{bastion}--{host.name}'
-        ssh_user = self.cluster_config.get('ssh_user') or self.ops_config.get(
-            'ssh.user') or getpass.getuser()
-        if args.user:
-            ssh_user = args.user
-        if ssh_user and '-l' not in args.ssh_opts:
-            args.ssh_opts.extend(['-l', ssh_user])
+        return host
+
+    def resolve_ssh_host(self, args, host):
+        
+        if host and self.is_teleport_enabled(args):
+            return host.vars.get('ec2_tag_hostname') or host.vars.get('ec2_tag_CMDB_hostname') or host.vars.get('ec2_tag_CMDB_hostname') or host.name
+
+        if host and not self.is_teleport_enabled(args):
+            return host.vars.get('ansible_ssh_host') or host.name
 
+        if args.nossh:
+            return self.ansible_inventory.get_hosts(
+                'bastion')[0].vars.get('ansible_ssh_host')
+
+        bastion = self.ansible_inventory.get_hosts(
+                'bastion')[0].vars.get('ansible_ssh_host')
+        return f'{bastion}--{host.name}'
+  
+
+    def set_args_if_nossh(self, args):
         if args.nossh:
             args.tunnel = True
             args.ipaddress = True
-            ssh_host = self.ansible_inventory.get_hosts(
-                'bastion')[0].vars.get('ansible_ssh_host')
 
-        # if args.tunnel or args.proxy:
-        #     ssh_config = args.ssh_config or 'ssh.tunnel.config'
-        # else:
-        #     ssh_config = args.ssh_config or self.ansible_inventory.get_ssh_config()
-        ssh_config = args.ssh_config or self.ops_config.get(
-            'ssh.config') or self.ansible_inventory.get_ssh_config()
+    def get_ssh_host_parts(self, ssh_host):
+            return ssh_host.split('--')
 
-        ssh_host_bastion, ssh_host_dest = None, None
-        if args.ssh_dest_user:
-            ssh_host_parts = ssh_host.split('--')
-            ssh_host_bastion = ssh_host_parts[0]
-            ssh_host_dest = ssh_host_parts[1] if len(ssh_host_parts) > 1 else None
+    def get_ssh_host_dest(self, args, ssh_host):
+        return self.get_ssh_host_parts(ssh_host)[1] if args.ssh_dest_user and len(self.get_ssh_host_parts(ssh_host)) > 1 else None
 
-        scb_ssh_host = None
-        if scb_enabled:
-            # scb->bastion->host vs scb->bastion
-            scb_delimiter = "--" if "--" in ssh_host else "@"
-            scb_ssh_host = f"{ssh_host}{scb_delimiter}{scb_host}"
+    def get_ssh_host_bastion(self, args, ssh_host):
+        return self.get_ssh_host_parts(ssh_host)[0] if args.ssh_dest_user else None
 
-        if args.tunnel:
-            if args.ipaddress:
-                host_ip = host.vars.get('private_ip_address')
-            else:
-                host_ip = 'localhost'
-            if scb_enabled:
-                command = f"ssh -F {ssh_config} {ssh_user}@{scb_ssh_host} " \
-                          f"-4 -T -L {args.local}:{host_ip}:{args.remote:d}"
-            else:
-                command = f"ssh -F {ssh_config} {ssh_host} " \
-                          f"-4 -N -L {args.local}:{host_ip}:{args.remote:d}"
-        else:
-            if scb_enabled:
-                command = f"ssh -F {ssh_config} {ssh_user}@{scb_ssh_host}"
-                if args.ssh_dest_user and ssh_host_dest:
-                    command = (f"ssh -F {ssh_config} -t {ssh_user}@{ssh_host_bastion}@{scb_host} "
-                               f"ssh {args.ssh_dest_user}@{ssh_host_dest}")
-            else:
-                command = f"ssh -F {ssh_config} {ssh_host}"
-                if args.ssh_dest_user and ssh_host_dest:
-                    command = (f"ssh -F {ssh_config} -t {ssh_user}@{ssh_host_bastion} "
-                               f"ssh {args.ssh_dest_user}@{ssh_host_dest}")
-
-        if args.proxy:
-            if scb_enabled:
-                proxy_port = args.local or SshConfigGenerator.generate_ssh_scb_proxy_port(
-                    self.ansible_inventory.generated_path.removesuffix("/inventory"),
-                    args.auto_scb_port,
-                    scb_proxy_port
-                )
-                command = f"ssh -F {ssh_config} {ssh_user}@{scb_ssh_host} " \
-                          f"-4 -T -D {proxy_port} -o 'ExitOnForwardFailure yes'"
-            else:
-                command = f"ssh -F {ssh_config} {ssh_host} " \
-                          f"-4 -N -D {args.local} -f -o 'ExitOnForwardFailure yes'"
+    def get_scb_ssh_host(self, ssh_host, args):
+        scb_delimiter = ("--" if "--" in ssh_host else "@") if self.is_scb_enabled(args) else None # scb->bastion->host vs scb->bastion
+        return f"{ssh_host}{scb_delimiter}{self.get_scb_host(args)}" if self.is_scb_enabled(args) else None
 
-        if args.ssh_opts:
-            command = f"{command} {' '.join(args.ssh_opts)}"
+    def ssh_opts_extend_with_user_arg(self, ssh_user, args):
+        if ssh_user and '-l' not in args.ssh_opts and not self.is_teleport_enabled(args):
+            args.ssh_opts.extend(['-l', ssh_user])
+
+    def get_ssh_user_from_config(self):
+        return self.cluster_config.get('ssh_user') or self.ops_config.get('ssh.user') or getpass.getuser()
 
+    def exit_when_local_arg_not_match_regex(self, args):
+        if args.local and not IP_HOST_REG_EX.match(args.local):
+            err('The --local parameter must be in the form of host-ip:port or port')
+            sys.exit(2)
+
+    def exit_when_tunnel_used_with_incorrect_parameters(self, args):
+        if args.tunnel or args.nossh:
+            if args.local is None or args.remote is None:
+                err('When using --tunnel or --nossh both the --local and --remote parameters are required')
+                sys.exit(2)
+
+    def exit_when_scb_proxy_used_with_incorect_parameters(self, args, scb_proxy_port):
+        if self.is_scb_enabled(args) and args.proxy and args.local is None and (args.auto_scb_port is False and not scb_proxy_port):
+            err('When using --proxy the --local parameter is required if not using '
+                    '--auto_scb_port and scb.proxy_port is not configured in the cluster config')
+            sys.exit(2)
+
+    def exit_when_scb_enabled_but_scb_host_not_set(self, scb_enabled, scb_host):
+        if scb_enabled and not scb_host:
+            err('When scb is enabled scb_host is required!')
+            sys.exit(2)
+
+    def get_scb_info_if_enabled(self, args):
+        scb_settings = self.cluster_config.get('scb', {})
+        return (True,
+                scb_settings.get('host') or self.ops_config.get('scb.host'),
+                scb_settings.get('proxy_port')) \
+            if scb_settings.get('enabled') and args.use_scb \
+            else (False, None, None)
+
+    def is_scb_enabled(self, args):
+        return True if self.get_cluster_config('scb').get('enabled') and self.use_scb_arg_set(args) else False
+
+    def get_scb_host(self, args):
+        return self.get_cluster_config('scb').get('host') if self.is_scb_enabled(args) and self.use_scb_arg_set(args) else None
+
+    def get_scb_proxy_port(self, args):
+        return self.get_cluster_config('scb').get('proxy_port') if self.is_scb_enabled(args) and self.use_scb_arg_set(args) else None
+
+    def use_scb_arg_set(self, args):
+        return True if args.use_scb else False
+
+    def get_cluster_config(self, section):
+        return self.cluster_config.get(section, {})
+
+    def is_teleport_enabled(self, args):
+         return True if self.get_cluster_config('teleport').get('enabled') and args.use_teleport else False
+
+    def check_passwordless_wrapper(self):
         # Check if optional sshpass is available and print info message
         sshpass_path = os.path.expanduser("~/bin/sshpass")
         if (os.path.isfile(sshpass_path) and os.access(sshpass_path, os.X_OK)):
@@ -326,12 +379,82 @@ class SshRunner(object):
             display("sshpass passwordless wrapper NOT available in %s" %
                     (sshpass_path), color="purple", stderr=True)
 
-        display(
-            "SSH-ing to %s[%d] => %s" %
-            (args.role,
-             args.index,
-             host.name),
-            color="green",
-            stderr=True)
+    def wrap_command_with_opts(self, initial_command, args):
+        return f"{initial_command} {' '.join(args.ssh_opts)}"
 
-        return dict(command=command)
+    def build_ssh_command(self, args, ssh_config):
+        if args.tunnel:
+            return self.build_tunnel_command(args, ssh_config)
+        elif args.proxy:
+            return self.build_proxy_command(args, ssh_config)
+        else:
+            return self.build_regular_command(args, ssh_config)
+
+    def build_regular_command(self, args, ssh_config):
+        if ssh_config.scb_enabled:
+            command = f"ssh -F {ssh_config.ssh_config_prop} {ssh_config.ssh_user}@{ssh_config.scb_ssh_host}"
+            if args.ssh_dest_user and ssh_config.ssh_host_dest:
+                command = (f"ssh -F {ssh_config.ssh_config_prop} -t {ssh_config.ssh_user}@{ssh_config.ssh_host_bastion}@{ssh_config.scb_host} "
+                                f"ssh {args.ssh_dest_user}@{ssh_config.ssh_host_dest}")
+        elif ssh_config.teleport_enabled:
+            check_if_teleport_binary_installed()
+            ssh_opts = ' '.join(args.ssh_opts) if args.ssh_opts else ''
+            return (f"tsh ssh {ssh_opts} {ssh_config.ssh_user}@{ssh_config.ssh_host}" if ssh_opts 
+                            else f"tsh ssh {ssh_config.ssh_user}@{ssh_config.ssh_host}")
+        else:
+            command = f"ssh -F {ssh_config.ssh_config_prop} {ssh_config.ssh_host}"
+            if args.ssh_dest_user and ssh_config.ssh_host_dest:
+                command = (f"ssh -F {ssh_config.ssh_config_prop} -t {ssh_config.ssh_user}@{ssh_config.ssh_host_bastion} "
+                                f"ssh {args.ssh_dest_user}@{ssh_config.ssh_host_dest}")
+        return self.wrap_command_with_opts(command, args)
+
+    def build_tunnel_command(self, args, ssh_config):
+        if ssh_config.scb_enabled:
+            target_host = f"{ssh_config.ssh_user}@{ssh_config.scb_ssh_host}"
+            command = f"ssh -F {ssh_config.ssh_config_prop} {target_host} " \
+                   f"-4 -N -L {args.local}:{self.get_host_ip(args, ssh_config.host)}:{args.remote:d}"
+        elif ssh_config.teleport_enabled:
+            check_if_teleport_binary_installed()
+            command = f"tsh ssh -L {args.local}:{self.get_host_ip(args, ssh_config.host)}:{args.remote} {ssh_config.ssh_host}"
+        else:
+            command = f"ssh -F {ssh_config.ssh_config_prop} {ssh_config.ssh_host} " \
+                   f"-4 -N -L {args.local}:{self.get_host_ip(args, ssh_config.host)}:{args.remote:d}"
+        return self.wrap_command_with_opts(command, args)
+
+    def build_proxy_command(self, args, ssh_config):
+        ssh_config_generator = SshConfigGenerator(self.ops_config.package_dir)
+        if ssh_config.scb_enabled:
+            proxy_port = args.local or ssh_config_generator.generate_ssh_scb_proxy_port(
+                self.ansible_inventory.generated_path.removesuffix("/inventory"), args.auto_scb_port,
+                ssh_config.scb_proxy_port)
+            command = f"ssh -F {ssh_config.ssh_config_prop} {ssh_config.ssh_user}@{ssh_config.scb_ssh_host} " \
+                      f"-4 -T -D {proxy_port} -o 'ExitOnForwardFailure yes'"
+        elif ssh_config.teleport_enabled:
+            check_if_teleport_binary_installed()
+            proxy_port = args.local or ssh_config_generator.get_random_generated_port()
+            command = f"tsh ssh -D {proxy_port} {ssh_config.ssh_host}"
+        else:
+            command = f"ssh -F {ssh_config.ssh_config_prop} {ssh_config.ssh_host} " \
+                      f"-4 -N -D {args.local} -f -o 'ExitOnForwardFailure yes'"
+        return self.wrap_command_with_opts(command, args)
+
+    def get_host_ip(self, args, host):
+        return host.vars.get('private_ip_address') if args.ipaddress else 'localhost'
+
+
+
+
+class SshConfig(object):
+    def __init__(self, scb_enabled, teleport_enabled, ssh_config_prop, ssh_user, ssh_host, ssh_host_dest,
+                 ssh_host_bastion, scb_host, scb_ssh_host, host, scb_proxy_port):
+        self.scb_enabled = scb_enabled
+        self.teleport_enabled = teleport_enabled
+        self.ssh_config_prop = ssh_config_prop
+        self.ssh_user = ssh_user
+        self.ssh_host = ssh_host
+        self.ssh_host_dest = ssh_host_dest
+        self.ssh_host_bastion = ssh_host_bastion
+        self.scb_host = scb_host
+        self.scb_ssh_host = scb_ssh_host
+        self.host = host
+        self.scb_proxy_port = scb_proxy_port

ops/cli/sync.py

@@ -31,11 +31,15 @@ class SyncParserConfig(SubParserConfig):
         parser.add_argument('--noscb', action='store_false', dest='use_scb',
                             help='Disable use of Shell Control Box (SCB) '
                                  'even if it is enabled in the cluster config')
+        parser.add_argument(
+            '--teleport',
+            action='store_false',
+            dest='use_teleport',
+            help='Use Teleport for SSH')
         parser.add_argument(
             'opts',
-            default=['-va --progress'],
             nargs='*',
-            help='Rsync opts')
+            help='Sync opts')
 
     def get_help(self):
         return 'Sync files from/to a cluster'
@@ -54,6 +58,9 @@ class SyncParserConfig(SubParserConfig):
 
         # extra rsync options
         ops cluster.yml sync 'dcs[0]:/usr/local/demdex/conf' /tmp/configurator-data -l remote_user -- --progress
+
+        # extra sync option for Teleport (recursive download, quiet, port)
+        ops cluster.yml sync 'dcs[0]:/usr/local/demdex/conf' /tmp/configurator-data -- --recursive/port/quiet
         """
 
 
@@ -73,29 +80,37 @@ class SyncRunner(object):
 
     def run(self, args, extra_args):
         logger.info("Found extra_args %s", extra_args)
-        inventory_path, ssh_config_paths = self.inventory_generator.generate()
+        
         src = PathExpr(args.src)
         dest = PathExpr(args.dest)
+        remote = self.get_remote(dest, src)
 
-        ssh_config_path = SshConfigGenerator.get_ssh_config_path(self.cluster_config,
-                                                                 ssh_config_paths,
-                                                                 args.use_scb)
         if src.is_remote and dest.is_remote:
             display(
-                'Too remote expressions are not allowed',
+                'Two remote expressions are not allowed',
                 stderr=True,
                 color='red')
             return
 
-        if src.is_remote:
-            remote = src
-        else:
-            remote = dest
-
         display(
             "Looking for hosts for pattern '%s'" %
             remote.pattern, stderr=True)
 
+        if self.is_teleport_enabled(args):
+            check_if_teleport_binary_installed()
+            command = self.execute_teleport_scp(args, src, dest)
+        else:
+            ssh_user = self.cluster_config.get('ssh_user') or self.ops_config.get('ssh.user') or getpass.getuser()
+            if remote.remote_user:
+                ssh_user = remote.remote_user
+            elif args.user:
+                ssh_user = args.user
+            ssh_host = self.populate_remote_hosts(remote)[0]
+            command = self.execute_rsync_scp(args, src, dest, ssh_user, ssh_host, self.get_ssh_config_path(args))
+
+        return dict(command=command)
+
+    def populate_remote_hosts(self, remote):
         remote_hosts = []
         hosts = self.ansible_inventory.get_hosts(remote.pattern)
         if not hosts:
@@ -106,28 +121,43 @@ class SyncRunner(object):
             for host in hosts:
                 ssh_host = host.get_vars().get('ansible_ssh_host') or host
                 remote_hosts.append(ssh_host)
+        return remote_hosts
 
-        for ssh_host in remote_hosts:
-            ssh_user = self.cluster_config.get('ssh_user') or self.ops_config.get(
-                'ssh.user') or getpass.getuser()
-            if remote.remote_user:
-                ssh_user = remote.remote_user
-            elif args.user:
-                ssh_user = args.user
-
-            from_path = src.with_user_and_path(ssh_user, ssh_host)
-            to_path = dest.with_user_and_path(ssh_user, ssh_host)
-
-            command = 'rsync {opts} {from_path} {to_path} -e "ssh -F {ssh_config}"'.format(
-                opts=" ".join(args.opts),
-                from_path=from_path,
-                to_path=to_path,
-                ssh_config=ssh_config_path
-
-            )
-
-            return dict(command=command)
-
+    def get_remote(self, dest, src):
+        if src.is_remote:
+            remote = src
+        else:
+            remote = dest
+        return remote
+
+    def get_ssh_config_path(self, args):
+        ssh_config_generator = SshConfigGenerator(self.ops_config.package_dir)
+        _, ssh_config_paths = self.inventory_generator.generate()
+        return ssh_config_generator.get_ssh_config_path(self.cluster_config,
+                                                ssh_config_paths,
+                                                
+                                                args)
+
+    def execute_teleport_scp(self, args, src, dest):
+        return 'tsh scp {opts} {from_path} {to_path}'.format(
+                    from_path=src,
+                    to_path=dest,
+                    opts=" ".join(args.opts)
+                )
+
+    def execute_rsync_scp(self, args, src, dest, ssh_user, ssh_host, ssh_config_path):
+        from_path = src.with_user_and_path(ssh_user, ssh_host)
+        to_path = dest.with_user_and_path(ssh_user, ssh_host)
+        return 'rsync {opts} {from_path} {to_path} -e "ssh -F {ssh_config}"'.format(
+                    opts=" ".join(args.opts),
+                    from_path=from_path,
+                    to_path=to_path,
+                    ssh_config=ssh_config_path
+                )
+                
+
+    def is_teleport_enabled(self, args):
+         return True if self.cluster_config.get('teleport', {}).get('enabled') and args.use_teleport else False
 
 class PathExpr(object):
 

ops/data/ssh/ssh.teleport.config.tpl

@@ -0,0 +1,9 @@
+# teleport.cfg
+Host *
+    ProxyCommand "/usr/local/bin/tsh" proxy ssh --cluster=teleport-prod --proxy=teleport.adobe.net:443 %r@%n:%p
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+    ControlMaster auto
+    ControlPersist 600s
+    User {ssh_username}
+    Port 22

ops/inventory/__init__.py

@@ -8,4 +8,22 @@
 # OF ANY KIND, either express or implied. See the License for the specific language
 # governing permissions and limitations under the License.
 
+import sys
+from shutil import which
 from .ec2inventory import Ec2Inventory
+
+def display(msg, **kwargs):
+    # use ansible pretty printer if available
+    try:
+        from ansible.playbook.play import display
+        display.display(msg, **kwargs)
+    except ImportError:
+        print(msg)
+
+def err(msg):
+    display(str(msg), stderr=True, color='red')
+
+def check_if_teleport_binary_installed():
+    if which("tsh") is None:
+        err('tsh binary needs to be installed for Teleport to work!')
+        sys.exit(2)

ops/inventory/ec2inventory.py

@@ -17,11 +17,13 @@ from botocore.exceptions import NoRegionError, NoCredentialsError, PartialCreden
 
 
 class Ec2Inventory(object):
+
+
     @staticmethod
     def _empty_inventory():
         return {"_meta": {"hostvars": {}}}
 
-    def __init__(self, boto_profile, regions, filters=None, bastion_filters=None):
+    def __init__(self, boto_profile, regions, filters=None, bastion_filters=None, teleport_enabled=False):
 
         self.filters = filters or []
         self.regions = regions.split(',')
@@ -29,6 +31,7 @@ class Ec2Inventory(object):
         self.bastion_filters = bastion_filters or []
         self.group_callbacks = []
         self.boto3_session = self.create_boto3_session(boto_profile)
+        self.teleport_enabled = teleport_enabled
 
         # Inventory grouped by instance IDs, tags, security groups, regions,
         # and availability zones
@@ -145,7 +148,11 @@ class Ec2Inventory(object):
         if not dest:
             return
 
-        if bastion_ip and bastion_ip != instance.get('PublicIpAddress'):
+        if self.teleport_enabled:
+            ansible_ssh_host = self.get_tag_value(instance, ['hostname','CMDB_hostname','Adobe:FQDN'])
+            if not ansible_ssh_host:
+                ansible_ssh_host = instance.get('PrivateIpAddress')
+        elif bastion_ip and bastion_ip != instance.get('PublicIpAddress'):
             ansible_ssh_host = bastion_ip + "--" + instance.get('PrivateIpAddress')
         elif instance.get('PublicIpAddress'):
             ansible_ssh_host = instance.get('PublicIpAddress')
@@ -183,6 +190,13 @@ class Ec2Inventory(object):
         self.inventory["_meta"]["hostvars"][dest] = self.get_host_info_dict_from_instance(instance)
         self.inventory["_meta"]["hostvars"][dest]['ansible_ssh_host'] = ansible_ssh_host
 
+    def get_tag_value(self, instance, tag_keys):
+        for tag_key in tag_keys:
+            for tag in instance.get('Tags', []):
+                if tag['Key'] == tag_key:
+                    return tag['Value']
+        return None
+
     def get_host_info_dict_from_instance(self, instance):
         instance_vars = {}
         for key, value in instance.items():

ops/inventory/plugin/cns.py

@@ -26,6 +26,7 @@ def cns(args):
             jsn = ec2(dict(
                 region=region,
                 boto_profile=profile,
+                teleport_enabled=args.get('teleport_enabled', False),
                 cache=args.get('cache', 3600 * 24),
                 filters=[
                     {'Name': 'tag:cluster', 'Values': [cns_cluster]}

ops/inventory/plugin/ec2.py

@@ -14,6 +14,7 @@ from ops.inventory.ec2inventory import Ec2Inventory
 def ec2(args):
     filters = args.get('filters', [])
     bastion_filters = args.get('bastion', [])
+    teleport_enabled = args.get('teleport_enabled')
 
     if args.get('cluster') and not args.get('filters'):
         filters = [{'Name': 'tag:cluster', 'Values': [args.get('cluster')]}]
@@ -27,4 +28,6 @@ def ec2(args):
     return Ec2Inventory(boto_profile=args['boto_profile'],
                         regions=args['region'],
                         filters=filters,
-                        bastion_filters=bastion_filters).get_as_json()
+                        bastion_filters=bastion_filters,
+                        teleport_enabled=teleport_enabled
+                        ).get_as_json()

ops/inventory/sshconfig.py

@@ -13,16 +13,18 @@ import socketserver
 from shutil import copy
 from pathlib import Path
 from ansible.playbook.play import display
+from . import check_if_teleport_binary_installed
 
 
 class SshConfigGenerator(object):
     SSH_CONFIG_FILE = "ssh.config"
     SSH_SCB_PROXY_TPL_FILE = "ssh.scb.proxy.config.tpl"
+    SSH_TELEPORT_PROXY_TPL_FILE = "ssh.teleport.config.tpl"
 
     def __init__(self, package_dir):
         self.package_dir = package_dir
         self.ssh_data_dir = self.package_dir + '/data/ssh'
-        self.ssh_config_files = [self.SSH_CONFIG_FILE, self.SSH_SCB_PROXY_TPL_FILE]
+        self.ssh_config_files = [self.SSH_CONFIG_FILE, self.SSH_SCB_PROXY_TPL_FILE, self.SSH_TELEPORT_PROXY_TPL_FILE]
 
     def generate(self, directory):
         dest_ssh_config = {}
@@ -36,40 +38,39 @@ class SshConfigGenerator(object):
         return [f"{self.ssh_data_dir}/{ssh_config_file}"
                 for ssh_config_file in self.ssh_config_files]
 
-    @staticmethod
-    def get_ssh_config_path(cluster_config, ssh_config_paths, use_scb):
-        scb_settings = cluster_config.get('scb', {})
-        scb_enabled = scb_settings.get('enabled') and use_scb
+    def get_ssh_config_path(self, cluster_config, ssh_config_paths, args):
+        scb_enabled, teleport_enabled = self.get_proxy_type_information(cluster_config, args)
         if scb_enabled:
             ssh_config_tpl_path = ssh_config_paths.get(SshConfigGenerator.SSH_SCB_PROXY_TPL_FILE)
-            scb_proxy_port = SshConfigGenerator.get_ssh_scb_proxy_port(ssh_config_tpl_path)
-            ssh_config_path = SshConfigGenerator.generate_ssh_scb_config(ssh_config_tpl_path,
-                                                                         scb_proxy_port)
-            display.display(f"Connecting via scb proxy at 127.0.0.1:{scb_proxy_port}.\n"
-                            f"This proxy should have already been started and running "
-                            f"in a different terminal window.\n"
-                            f"If there are connection issues double check that "
-                            f"the proxy is running.",
-                            color='blue',
-                            stderr=True)
+            ssh_proxy_port = self.get_ssh_proxy_port(ssh_config_tpl_path)
+            display.display(f"Connecting via scb proxy at 127.0.0.1:{ssh_proxy_port}.\n"
+                          f"This proxy should have already been started and running "
+                          f"in a different terminal window.\n"
+                          f"If there are connection issues double check that "
+                          f"the proxy is running.",
+                          color='blue',
+                          stderr=True)
+            return self.generate_ssh_config_from_template(ssh_config_tpl_path, scb_proxy_port=ssh_proxy_port)
+        elif teleport_enabled:
+            check_if_teleport_binary_installed()
+            display.display(f"Using Teleport for SSH connections.\n"
+                          f"Make sure you are logged in with 'tsh login'.",
+                          color='blue',
+                          stderr=True)
+            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:
-            ssh_config_path = ssh_config_paths.get(SshConfigGenerator.SSH_CONFIG_FILE)
-        return ssh_config_path
+            return ssh_config_paths.get(SshConfigGenerator.SSH_CONFIG_FILE)
 
-    @staticmethod
-    def generate_ssh_scb_proxy_port(ssh_config_path, auto_scb_port, scb_config_port):
+    def generate_ssh_scb_proxy_port(self, ssh_config_path, auto_scb_port, scb_config_port):
         ssh_config_port_path = f"{ssh_config_path}/ssh_scb_proxy_config_port"
         if auto_scb_port:
-            with socketserver.TCPServer(("localhost", 0), None) as s:
-                generated_port = s.server_address[1]
-            display.display(f"Using auto generated port {generated_port} for scb proxy port",
-                            color='blue',
-                            stderr=True)
+            generated_port = self.get_random_generated_port()
         else:
             generated_port = scb_config_port
             display.display(f"Using port {generated_port} from cluster config for scb proxy port",
-                            color='blue',
-                            stderr=True)
+                          color='blue',
+                          stderr=True)
 
         with open(ssh_config_port_path, 'w') as f:
             f.write(str(generated_port))
@@ -77,22 +78,32 @@ class SshConfigGenerator(object):
 
         return generated_port
 
-
-    @staticmethod
-    def get_ssh_scb_proxy_port(ssh_config_path):
+    def get_ssh_proxy_port(self, ssh_config_path):
         ssh_port_path = ssh_config_path.replace("_tpl", "_port")
-        ssh_scb_proxy_port = Path(ssh_port_path).read_text()
-        return ssh_scb_proxy_port
-
-    @staticmethod
-    def generate_ssh_scb_config(ssh_config_tpl_path, scb_proxy_port):
-        ssh_config_template = Path(ssh_config_tpl_path).read_text()
-        ssh_config_content = ssh_config_template.format(
-            scb_proxy_port=scb_proxy_port
-        )
+        return  Path(ssh_port_path).read_text()
+
+    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):
         ssh_config_path = ssh_config_tpl_path.removesuffix("_tpl")
         with open(ssh_config_path, 'w') as f:
             f.write(ssh_config_content)
             os.fchmod(f.fileno(), 0o644)
-
         return ssh_config_path
+
+    def  get_proxy_type_information(self, cluster_config, args):
+            scb_settings = cluster_config.get('scb', {})
+            scb_enabled = scb_settings.get('enabled') and args.use_scb
+            teleport_settings = cluster_config.get('teleport', {})
+            teleport_enabled = teleport_settings.get('enabled') and args.use_teleport
+            return scb_enabled, teleport_enabled
+
+    def get_random_generated_port(self):
+        with socketserver.TCPServer(("localhost", 0), None) as s:
+            generated_port = s.server_address[1]
+            display.display(f"Using auto generated port {generated_port} for scb proxy port",
+                        color='blue',
+                        stderr=True)
+            return generated_port

{ops_cli-2.3.1.dist-info → ops_cli-2.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ops-cli
-Version: 2.3.1
+Version: 2.4.0
 Summary: Ops - wrapper for Terraform, Ansible, and SSH for cloud automation
 Home-page: https://github.com/adobe/ops-cli
 Author: Adobe
@@ -26,12 +26,12 @@ License-File: LICENSE
 Requires-Dist: adal==1.2.7
 Requires-Dist: ansible==8.7.0; python_version >= "3.9"
 Requires-Dist: ansible-core==2.15.13; python_version >= "3.9"
-Requires-Dist: awscli==1.32.6; python_version >= "3.8"
+Requires-Dist: awscli==1.42.30; python_version >= "3.9"
 Requires-Dist: azure==4.0.0
 Requires-Dist: azure-applicationinsights==0.1.1
 Requires-Dist: azure-batch==4.1.3
 Requires-Dist: azure-common==1.1.28
-Requires-Dist: azure-core==1.32.0; python_version >= "3.8"
+Requires-Dist: azure-core==1.38.0; python_version >= "3.9"
 Requires-Dist: azure-cosmosdb-nspkg==2.0.2
 Requires-Dist: azure-cosmosdb-table==1.0.6
 Requires-Dist: azure-datalake-store==0.0.53
@@ -110,58 +110,55 @@ Requires-Dist: azure-storage-blob==1.5.0
 Requires-Dist: azure-storage-common==1.4.2
 Requires-Dist: azure-storage-file==1.4.0
 Requires-Dist: azure-storage-queue==1.4.0
-Requires-Dist: backports.functools-lru-cache==1.6.6; python_version >= "2.6"
-Requires-Dist: boto3==1.34.6; python_version >= "3.8"
-Requires-Dist: botocore==1.34.6; python_version >= "3.8"
-Requires-Dist: cachetools==5.5.0; python_version >= "3.7"
-Requires-Dist: certifi==2024.12.14; python_version >= "3.6"
-Requires-Dist: cffi==1.17.1; python_version >= "3.8"
-Requires-Dist: charset-normalizer==3.4.1; python_version >= "3.7"
-Requires-Dist: colorama==0.4.4; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4"
-Requires-Dist: cryptography==44.0.0; python_version >= "3.7" and python_full_version not in "3.9.0, 3.9.1"
-Requires-Dist: deepmerge==1.1.1
-Requires-Dist: docutils==0.16; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4"
+Requires-Dist: boto3==1.40.30; python_version >= "3.9"
+Requires-Dist: botocore==1.40.30; python_version >= "3.9"
+Requires-Dist: certifi==2026.1.4; python_version >= "3.7"
+Requires-Dist: cffi==2.0.0; python_version >= "3.9"
+Requires-Dist: charset-normalizer==3.4.4; python_version >= "3.7"
+Requires-Dist: colorama==0.4.6; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6"
+Requires-Dist: cryptography==46.0.4; python_version >= "3.8" and python_full_version not in "3.9.0, 3.9.1"
+Requires-Dist: deepmerge==2.0; python_version >= "3.8"
+Requires-Dist: docutils==0.19; python_version >= "3.7"
+Requires-Dist: durationpy==0.10
 Requires-Dist: gitdb==4.0.12; python_version >= "3.7"
-Requires-Dist: gitpython==3.1.44; python_version >= "3.7"
-Requires-Dist: google-auth==2.37.0; python_version >= "3.7"
+Requires-Dist: gitpython==3.1.46; python_version >= "3.7"
+Requires-Dist: google-auth==2.48.0; python_version >= "3.8"
 Requires-Dist: hashmerge==0.2
-Requires-Dist: himl==0.15.2; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: himl==0.18.0; python_version >= "3.9"
 Requires-Dist: hvac==1.2.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0"
-Requires-Dist: idna==3.10; python_version >= "3.6"
+Requires-Dist: idna==3.11; python_version >= "3.8"
 Requires-Dist: inflection==0.5.1; python_version >= "3.5"
 Requires-Dist: isodate==0.7.2; python_version >= "3.7"
-Requires-Dist: jinja2==3.1.4; python_version >= "3.7"
-Requires-Dist: jmespath==1.0.1; python_version >= "3.7"
-Requires-Dist: kubernetes==26.1.0; python_version >= "3.6"
-Requires-Dist: lru-cache==0.2.3
-Requires-Dist: markupsafe==3.0.2; python_version >= "3.9"
-Requires-Dist: msal==1.31.1; python_version >= "3.7"
+Requires-Dist: jinja2==3.1.6; python_version >= "3.7"
+Requires-Dist: jmespath==1.1.0; python_version >= "3.9"
+Requires-Dist: kubernetes==33.1.0; python_version >= "3.6"
+Requires-Dist: markupsafe==3.0.3; python_version >= "3.9"
+Requires-Dist: msal==1.34.0; python_version >= "3.8"
 Requires-Dist: msrest==0.7.1; python_version >= "3.6"
 Requires-Dist: msrestazure==0.6.4
-Requires-Dist: oauthlib==3.2.2; python_version >= "3.6"
-Requires-Dist: packaging==24.2; python_version >= "3.8"
+Requires-Dist: oauthlib==3.3.1; python_version >= "3.8"
+Requires-Dist: packaging==26.0; python_version >= "3.8"
 Requires-Dist: passgen==1.1.1
 Requires-Dist: pathlib2==2.3.7.post1
-Requires-Dist: pyasn1==0.6.1; python_version >= "3.8"
-Requires-Dist: pyasn1-modules==0.4.1; python_version >= "3.8"
-Requires-Dist: pycparser==2.22; python_version >= "3.8"
+Requires-Dist: pyasn1==0.6.2; python_version >= "3.8"
+Requires-Dist: pyasn1-modules==0.4.2; python_version >= "3.8"
+Requires-Dist: pycparser==3.0; python_version >= "3.10"
 Requires-Dist: pyhcl==0.4.5
-Requires-Dist: pyjwt[crypto]==2.10.1; python_version >= "3.9"
+Requires-Dist: pyjwt[crypto]==2.11.0; python_version >= "3.9"
 Requires-Dist: python-consul==1.1.0
 Requires-Dist: python-dateutil==2.9.0.post0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
 Requires-Dist: pyyaml==6.0.1; python_version >= "3.6"
-Requires-Dist: requests==2.32.3; python_version >= "3.8"
+Requires-Dist: requests==2.32.5; python_version >= "3.9"
 Requires-Dist: requests-oauthlib==2.0.0; python_version >= "3.4"
 Requires-Dist: resolvelib==1.0.1
 Requires-Dist: rsa==4.7.2; python_version >= "3.5" and python_version < "4"
-Requires-Dist: s3transfer==0.10.4; python_version >= "3.8"
-Requires-Dist: setuptools==75.8.0; python_version >= "3.9"
+Requires-Dist: s3transfer==0.14.0; python_version >= "3.9"
 Requires-Dist: simpledi==0.4.1
 Requires-Dist: six==1.17.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2"
 Requires-Dist: smmap==5.0.2; python_version >= "3.7"
-Requires-Dist: typing-extensions==4.12.2; python_version >= "3.8"
-Requires-Dist: urllib3==2.0.7; python_version >= "3.7"
-Requires-Dist: websocket-client==1.8.0; python_version >= "3.8"
+Requires-Dist: typing-extensions==4.15.0; python_version >= "3.9"
+Requires-Dist: urllib3==2.6.0; python_version >= "3.9"
+Requires-Dist: websocket-client==1.9.0; python_version >= "3.9"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -169,6 +166,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -326,7 +324,7 @@ workon ops
 # uninstall previous `ops` version (if you have it)
 pip uninstall ops --yes
 
-# install ops-cli v2.3.1 stable release
+# install ops-cli v2.4.0 stable release
 pip install --upgrade ops-cli
 ```
 
@@ -342,7 +340,7 @@ You can try out `ops-cli`, by using docker. The docker image has all required pr
 
 To start out a container, running the latest `ops-cli` docker image run:
 ```sh
-docker run -it ghcr.io/adobe/ops-cli:2.3.1 bash
+docker run -it ghcr.io/adobe/ops-cli:2.4.0 bash
 ```
 
 After the container has started, you can start using `ops-cli`:
@@ -713,6 +711,23 @@ If there are connection issues double check that the proxy is running.
 ...
 ```
 
+#### Teleport
+Teleport (https://goteleport.com/) provides secretless SSH.
+`ops` has support for using Teleport as ssh  for the following operations: `ssh, tunnel, proxy, ansible play, run and sync`
+
+In order to use Teleport an extra section needs to be added to the cluster config file:
+***
+```
+inventory:
+  - plugin: cns
+    args:
+      teleport_enabled: True -> add this to existing configuration
+
+
+teleport:
+  enabled: true -> add this whole block
+```
+
 ### Play
 
 Run an ansible playbook.
@@ -937,7 +952,7 @@ env LDFLAGS="-L$(brew --prefix openssl)/lib" CFLAGS="-I$(brew --prefix openssl)/
 
 ## Running tests
 
-- on your machine: `py.test tests`
+- on your machine: `python -m pytest tests` or `build_scripts/run_tests.sh`
 
 # Troubleshooting
 

{ops_cli-2.3.1.dist-info → ops_cli-2.4.0.dist-info}/RECORD

@@ -12,18 +12,18 @@ ops/ansible/filter_plugins/commonfilters.py,sha256=Ya1fKYAsoqYsuLbzP48Oaz2AYWfne
 ops/ansible/vars_plugins/__init__.py,sha256=v9uW7YO2C7EC4MQWr_TMH_K-1ALd0uLl9vZ_h3xCQkg,596
 ops/ansible/vars_plugins/clusterconfig.py,sha256=qmIrTp1V0gLdbtBI5A0HMmICe8z0xUq7LzO3pmIJlsI,1378
 ops/ansible/vars_plugins/opsconfig.py,sha256=lfKCD7XRoDTW80QXEGcm3tV6ASnzoCGdxy5zpaimT4k,1615
-ops/cli/__init__.py,sha256=LcPvjP6p7l8At8CIjyWvm0mhYzMGJqFv45AcTls1IhM,1376
+ops/cli/__init__.py,sha256=npLihw242EI2DzH7pkAgZnTp7GgPxh9fdHnzANuYFRQ,1562
 ops/cli/aws.py,sha256=OsmpOVv1924_lvNESeElLgcEi1caYTnI88C7wzXie78,911
 ops/cli/config.py,sha256=T0ZfW1bWdSr1dF4oqsvTjUtUiCr7RVm4_rFdezgGCqM,7629
 ops/cli/config_generator.py,sha256=ARGp5kAgdMLqtrHyQb_dE9sEuM1bAnVddfWDxd_5OdA,1718
 ops/cli/helmfile.py,sha256=2ipKyFMY5M87U1mXDQle_UsOXICdQ-0VX2f97TAg0I8,6354
 ops/cli/inventory.py,sha256=kSqNw978_P7OrFzLng5ipzuJBh6WqtvjvLDtiNwFQ8A,3109
 ops/cli/packer.py,sha256=GAgi6uPWO0wv3uIEwl0O2sb4fQtpCbL1561nP8Y_Lpc,2626
-ops/cli/parser.py,sha256=tzXvpu4GycyHSjERFrjQVEFZYVzOszLhDEjpkFYJ-oc,4377
-ops/cli/playbook.py,sha256=rPaIfUUMSTgITxzrvkVyTpPJ2UfqYnk3WfjY3jDrHO0,5287
-ops/cli/run.py,sha256=cwT2rQEBRip_OndkSQLFR7Q8D5BD6L5BbAq6nehKhco,3373
-ops/cli/ssh.py,sha256=AGDtNqLnbOjIbVxAnxfEJDpi5m1D0tOO3ml3uQ3bhgQ,14196
-ops/cli/sync.py,sha256=8K3Dsh6cwv9gTat0KXvRemHmqpAWd46pHfS8wMS9Olk,5663
+ops/cli/parser.py,sha256=YGxYgMwduTnTTjNNWXYZoasBOZ9LUkE4wlx8WIsOqiE,4511
+ops/cli/playbook.py,sha256=5WaYFgt2wRMycPoRWDRSICXPUfYRlxHwpe9GhezytR4,5426
+ops/cli/run.py,sha256=qvhikkF4Wjbn8CH4sj_e_jI_fZ8id-Q7VmlTtnXOjxs,3446
+ops/cli/ssh.py,sha256=nehRK6CEyfybMgC_O_04Cl1lj1dbsJj1Is2xzec9Fu8,20426
+ops/cli/sync.py,sha256=_eImwQWm125VZ-_NPUkeXCjROH0JDp6thBgAMmt2N6E,7057
 ops/cli/terraform.py,sha256=XeLXr_nFpdnsHdEfAFj_oiurvIhDQv-xE3L-NpMTcB0,12446
 ops/data/ansible/ansible.cfg,sha256=LE0Ve37qwQnbM1AJfHX442yh6HMMzM1FPCTCUKZElV8,186
 ops/data/ansible/tasks/deploy_prometheus_alert_rules.yml,sha256=JAtUk9s7r4Nd5s5BC6BzlhyZZr6aPGWVeyrd6HocDGI,888
@@ -31,29 +31,30 @@ ops/data/ansible/tasks/install_rpm.yml,sha256=DAGcuQnKeeJQd-DJByfQTL1MeNPguhJjWq
 ops/data/ansible/tasks/remove_prometheus_alert_rules.yml,sha256=LBNKpuAwY3gtyOrdD3EcHDVg9fMxUK4_uocOjiFaLuY,1397
 ops/data/ssh/ssh.config,sha256=nFgQkQ9VGLYCFKj9rm0KvuHtC-jHK5QCBFRv_XSKHxg,1208
 ops/data/ssh/ssh.scb.proxy.config.tpl,sha256=iFoNY3N_Oz1ADTX_B2NEoK4ysMngGLmpC7uUeQUSx8E,536
+ops/data/ssh/ssh.teleport.config.tpl,sha256=ARGcK1VONCNnFEX3P9Q3hRuulkBx6C4dOZFCr70eb5k,278
 ops/data/ssh/ssh.tunnel.config,sha256=G12kyR8FAnoZKGNUSE01oQnwMQ8gTJJt3HXBiERRWHo,364
 ops/data/terraform/terraformrc,sha256=500iIw-7B3IwASuuO-0xqWolbdGbwmsneitIAcVw6hE,53
 ops/hierarchical/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ops/hierarchical/composition_config_generator.py,sha256=tOW5bl7frRFJOLtFGBv0HzSFPCEAp2YViRF071sTAq4,7219
 ops/inventory/SKMS.py,sha256=jv4nHTKbDmJBTNf3HgGyKSfAJ10akKdDxNoGOcPehfo,17616
-ops/inventory/__init__.py,sha256=yvYO8z4aCdcOEYIjy27YL7fcbPqZAwQk9y_3YcNVAGU,643
+ops/inventory/__init__.py,sha256=WwwekRxaxU6S_HXSqZe-2XFkW59j0CAUh1OU6xadtHo,1119
 ops/inventory/azurerm.py,sha256=pWZqbZP9-7ChHNK1DwfSlt9hU6lcJjvNXmvduR2G5tQ,33507
 ops/inventory/caching.py,sha256=G2sJJ7nPHCqNBz3Vh0vxrFWQZt6B_11yS50GeZ8_1Bs,2000
-ops/inventory/ec2inventory.py,sha256=Zz3pB6hGLkzZa_ZIwpF2DfBXM_IQDIUmlwUIyy5D2HU,10655
+ops/inventory/ec2inventory.py,sha256=AmUnCWfoYYKmk35sxfzMs0Pst35LDkqeCx2mT6PpVtU,11208
 ops/inventory/generator.py,sha256=BcjUxMoWTnmx-P_S-1fLjqG3PUhyMyAO2S-037KG5q0,10885
-ops/inventory/sshconfig.py,sha256=lxqKyH0uCRCk4XXZISGrtX_d0c7OREg2Hh77ndtz05k,4438
+ops/inventory/sshconfig.py,sha256=8j5hwTjAE9ua0mcIl0jMp8vE5cz6kNRWc9nQZ_WNbL4,5437
 ops/inventory/plugin/__init__.py,sha256=kSOYPdE9T0Ixe6tQUYoOl_udNbFZdVatvRf6bkf92aE,725
 ops/inventory/plugin/azr.py,sha256=8-G3mEc0WQV7ZhJ4z6X-Wo90nQ7zAzHwgLpV4l_gbjo,5910
-ops/inventory/plugin/cns.py,sha256=X7CUMA8ltGxDfCkvaeEHsd60g8Y_C_gJk7287UM-qHw,1763
-ops/inventory/plugin/ec2.py,sha256=M9Z_MJukDUyA1XtvHeiRGuTUh8A3ibHfDINJDUwLo-U,1332
+ops/inventory/plugin/cns.py,sha256=7VeQSaoy4v3gDSbej7TdcpxuCC6_DkH-kLRj5Z9Urv4,1833
+ops/inventory/plugin/ec2.py,sha256=ySlR8l_uPE-RLxBBxUdaGVy1EeaBbs0zP6_BLpdoj5w,1468
 ops/inventory/plugin/legacy_pcs.py,sha256=ii1kOkwD9PIaOlleJa3_yE95ojCoPlBPKSBu5naZhxw,1184
 ops/inventory/plugin/skms.py,sha256=pFMpvfbXCf0KPgEOj5oAD7UzpUZ5zL1lcN4wESOjPuI,8517
 ops/jinja/__init__.py,sha256=Nvmvb1edSAehNKYyroo26Jrxjzbu_TOCBS8Y9mMEOyA,1743
 ops/terraform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ops/terraform/terraform_cmd_generator.py,sha256=5yfzS7aOOjVDUYHwBadFvPjWKEFJWk9SEOhTZHywlG0,21728
-ops_cli-2.3.1.dist-info/LICENSE,sha256=ff5lJoiLrFF1nJn5pRJiuicRqMEqBn8hgWCd2aQGa4Q,11335
-ops_cli-2.3.1.dist-info/METADATA,sha256=BPyIZTmGXQgCcflehCFyGRo1_fy23bwMebVqp7Bfo1g,39904
-ops_cli-2.3.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ops_cli-2.3.1.dist-info/entry_points.txt,sha256=maaS2Tf8WvxMXckssedK13LXegD9jgHB2AT8xiEfVpQ,37
-ops_cli-2.3.1.dist-info/top_level.txt,sha256=enC05wWafSg8iDKIvj3gvtAtEP2kYCyN5Gmd689q-_I,4
-ops_cli-2.3.1.dist-info/RECORD,,
+ops_cli-2.4.0.dist-info/licenses/LICENSE,sha256=ff5lJoiLrFF1nJn5pRJiuicRqMEqBn8hgWCd2aQGa4Q,11335
+ops_cli-2.4.0.dist-info/METADATA,sha256=4coN_Fja0ywn0cXXVwJ_w9mpn1Xr6hMX-C9RvAPpPTU,40163
+ops_cli-2.4.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+ops_cli-2.4.0.dist-info/entry_points.txt,sha256=maaS2Tf8WvxMXckssedK13LXegD9jgHB2AT8xiEfVpQ,37
+ops_cli-2.4.0.dist-info/top_level.txt,sha256=enC05wWafSg8iDKIvj3gvtAtEP2kYCyN5Gmd689q-_I,4
+ops_cli-2.4.0.dist-info/RECORD,,

{ops_cli-2.3.1.dist-info → ops_cli-2.4.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any