Merge "typing: Typing updates for recent SDK changes"

Author: Zuul

openstackclient/compute/v2/console.py

@@ -150,11 +150,11 @@ def take_action(
             parsed_args.server, ignore_missing=False
         )
 
-        data = compute_client.create_console(
+        console = compute_client.create_console(
             server.id, console_type=parsed_args.url_type
         )
 
-        display_columns, columns = _get_console_columns(data)
-        data = utils.get_dict_properties(data, columns)
+        display_columns, columns = _get_console_columns(console)
+        data = utils.get_dict_properties(console, columns)
 
         return (display_columns, data)

openstackclient/compute/v2/server_image.py

@@ -90,11 +90,16 @@ def _show_progress(progress: int | None) -> None:
         else:
             image_name = server.name
 
-        image_id = compute_client.create_server_image(
+        image = compute_client.create_server_image(
             server.id,
             image_name,
             parsed_args.properties,
-        ).id
+        )
+        if not image:
+            msg = _('Error creating server image: %s')
+            raise exceptions.CommandError(msg, parsed_args.server)
+
+        image_id = image.id
 
         if parsed_args.wait:
             if utils.wait_for_status(
@@ -104,10 +109,8 @@ def _show_progress(progress: int | None) -> None:
             ):
                 self.app.stdout.write('\n')
             else:
-                LOG.error(
-                    _('Error creating server image: %s'), parsed_args.server
-                )
-                raise exceptions.CommandError
+                msg = _('Error creating server image: %s')
+                raise exceptions.CommandError(msg, parsed_args.server)
 
         image = image_client.find_image(image_id, ignore_missing=False)
 

openstackclient/identity/v3/application_credential.py

@@ -221,6 +221,9 @@ def take_action(
             raise exceptions.CommandError('invalid authentication info')
 
         user_id = auth.get_user_id(conn.session)
+        if user_id is None:
+            msg = _("failed to retrieve auth info for current session")
+            raise exceptions.CommandError(msg)
 
         role_ids = []
         for role in parsed_args.roles: