devstack-cli 11.0.83__py3-none-any.whl → 11.0.84__py3-none-any.whl

cli.py

@@ -1002,10 +1002,11 @@ class Cli:
         logger.info('Connecting to CDE')
         known_hosts = await self._get_known_hosts()
         if known_hosts is None:
+            logger.error('Cannot connect to CDE. Host-key not found.')
             return
         self.known_hosts_file = await _create_temp_file(exit_stack=self.exit_stack, content=known_hosts)
         self.ssh_client = paramiko.SSHClient()
-        self.ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        self.ssh_client.load_host_keys(self.known_hosts_file.name)
         try:
             self.ssh_client.connect(
                 hostname=self.hostname,
@@ -1022,34 +1023,18 @@ class Cli:
         logger.info('Connected to CDE')
 
     async def _get_known_hosts(self: 'Cli') -> typing.Optional[str]:
-        if self.cde['value']['hostkey']:
-            if self.cde['value']['hostkey'].startswith(self.cde['value']['hostname']):
-                return self.cde['value']['hostkey']
-            return f"{self.cde['value']['hostname']} {self.cde['value']['hostkey']}"
         if not self.cde:
             logger.error('No CDE is selected. Cannot fetch host-key.')
             return None
         if not self.is_cde_running:
             logger.error('CDE is not running. Cannot fetch host-key.')
             return None
-        logger.debug('Scanning hostkeys of "%s"', self.hostname)
-        try:
-            stdout, stderr = await run_subprocess(
-                'ssh-keyscan',
-                [
-                    self.hostname,
-                ],
-                name='ssh-keyscan',
-                print_stdout=False,
-                print_stderr=False,
-            )
-        except SubprocessError as ex:
-            logger.error('%s Failed to fetch hostkeys. Is you CDE running?', ex)  # noqa: TRY400
-            sys.exit(1)
-        known_hosts = stdout
-        with contextlib.suppress(FileNotFoundError):
-            known_hosts += pathlib.Path(os.path.expandvars('$HOME/.ssh/known_hosts')).read_bytes()
-        return known_hosts
+        if not self.cde['value']['hostkey']:
+            logger.error('CDE record does not contain a hostkey.')
+            return None
+        if self.cde['value']['hostkey'].startswith(self.cde['value']['hostname']):
+            return self.cde['value']['hostkey']
+        return f"{self.cde['value']['hostname']} {self.cde['value']['hostkey']}"
 
     async def _disconnect_cde(self: 'Cli') -> None:
         logger.info('Disconnecting from CDE')

{devstack_cli-11.0.83.dist-info → devstack_cli-11.0.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: devstack-cli
-Version: 11.0.83
+Version: 11.0.84
 Summary: Command-line access to Cloud Development Environments (CDEs) created by Cloudomation DevStack
 Author-email: Stefan Mückstein <stefan@cloudomation.com>
 Project-URL: Homepage, https://cloudomation.com/

devstack_cli-11.0.84.dist-info/RECORD

@@ -0,0 +1,9 @@
+__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cli.py,sha256=hcWads1pYl3HKD5oRNmO0QdLxiTwZAdkNQBJ2J9bdYU,78948
+version.py,sha256=HJYf0m_9gulsCX42Jl1pHFeGC4PbMO4lYxekjZOi7oY,180
+devstack_cli-11.0.84.dist-info/LICENSE,sha256=OBXZbEUMtIHIzyISkJ9fJlf_imds3rcKqeQu9yiyUJI,1055
+devstack_cli-11.0.84.dist-info/METADATA,sha256=AEpd3gg3dLQeRdblLsD9Hcs1wZKG8jhXybW13-9NXuo,4287
+devstack_cli-11.0.84.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+devstack_cli-11.0.84.dist-info/entry_points.txt,sha256=f0xb4DIk0a7E5kyZ7YpoLhtjoagQj5VQpeBbW9a8A9Y,42
+devstack_cli-11.0.84.dist-info/top_level.txt,sha256=lP8zvU46Am_G0MPcNmCI6f0sMfwpDUWpTROaPs-IEPk,21
+devstack_cli-11.0.84.dist-info/RECORD,,

version.py

@@ -4,6 +4,6 @@ constants, set by build
 
 MAJOR = '11'
 BRANCH_NAME = 'release-11'
-BUILD_DATE = '2025-02-10-044518'
-SHORT_SHA = 'b8aa0c3'
-VERSION = '11+release-11.2025-02-10-044518.b8aa0c3'
+BUILD_DATE = '2025-02-10-112610'
+SHORT_SHA = '5cc11b4'
+VERSION = '11+release-11.2025-02-10-112610.5cc11b4'

devstack_cli-11.0.83.dist-info/RECORD

@@ -1,9 +0,0 @@
-__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cli.py,sha256=_k9ZnI2n6T9tPqBasTj5c0EECaHJvWRFwTcoxPRik2o,79526
-version.py,sha256=oQplPMp28xVgc4xkJB2_VKADgQ7VfXmif3LaFfGYAj8,180
-devstack_cli-11.0.83.dist-info/LICENSE,sha256=OBXZbEUMtIHIzyISkJ9fJlf_imds3rcKqeQu9yiyUJI,1055
-devstack_cli-11.0.83.dist-info/METADATA,sha256=UsbgvY8Vrs2AErciQXxOz5kk0fzVmC1FO684cq1QuVk,4287
-devstack_cli-11.0.83.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-devstack_cli-11.0.83.dist-info/entry_points.txt,sha256=f0xb4DIk0a7E5kyZ7YpoLhtjoagQj5VQpeBbW9a8A9Y,42
-devstack_cli-11.0.83.dist-info/top_level.txt,sha256=lP8zvU46Am_G0MPcNmCI6f0sMfwpDUWpTROaPs-IEPk,21
-devstack_cli-11.0.83.dist-info/RECORD,,