[AAM-65858] Add ops-cli Teleport support

Author: mstanescu_adobe

README.md

@@ -762,7 +762,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
 

src/ops/cli/inventory.py

@@ -55,8 +55,8 @@ def run(self, args, extra_args):
             group_string = ", ".join(group_names)
             host_id = host.vars.get('ec2_InstanceId', '')
             if host_id != '':
-                name_and_id = "%s -- %s" % (stringc(host.name,
-                                                    'blue'), stringc(host_id, 'blue'))
+                name_and_id = "%s -- %s"  % (stringc(self.get_ec2_hostname(host), 'blue'),
+                                            stringc(host.name, 'blue'))
             else:
                 name_and_id = "%s" % stringc(host.name, 'blue')
             display("%s (%s)" % (name_and_id, stringc(group_string, 'green')))
@@ -68,6 +68,9 @@ def get_inventory_hosts(self, args):
 
         return self.ansible_inventory.get_hosts(limit)
 
+    def get_ec2_hostname(self, host):
+        return host.vars.get('ec2_tag_Adobe_FQDN') or host.vars.get('ec2_tag_CMDB_hostname') or ''
+
     def get_host_facts(self, host, indent="\t"):
         vars = host.get_vars()
         ret = yaml.dump(

src/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

src/ops/cli/playbook.py

@@ -73,9 +73,11 @@ def __init__(self, ops_config, root_dir, inventory_generator,
     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

src/ops/cli/run.py

@@ -68,9 +68,10 @@ def run(self, args, extra_args):
         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}' \\