typing: Fixes for typed SDK find_* proxy methods

openstacksdk 4.12.0 added type hints for the find_* proxy methods
(change If7d64340224c3510d5d7eb831af29409213a304a). This introduces a
few new issues. Address them.

Change-Id: Ia404ecfd68639e760fc8b8ad00ed0b4da00650c8
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/common/project_cleanup.py

@@ -105,7 +105,8 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
             project = identity_client.find_project(
                 name_or_id=parsed_args.project, ignore_missing=False
             )
-            connection = connection.connect_as_project(project)
+            # FIXME(stephenfin): The type in SDK is wrong
+            connection = connection.connect_as_project(project)  # type: ignore
 
         if connection:
             status_queue: queue.Queue[Any] = queue.Queue()

openstackclient/compute/v2/flavor.py

@@ -553,15 +553,15 @@ def take_action(
 
         # Since we need to inject "access_project_id" into resource - convert
         # it to dict and treat it respectively
-        flavor = flavor.to_dict()
-        flavor['access_project_ids'] = access_projects
+        flavor_dict = flavor.to_dict()
+        flavor_dict['access_project_ids'] = access_projects
 
-        display_columns, columns = _get_flavor_columns(flavor)
+        display_columns, columns = _get_flavor_columns(flavor_dict)
         data = utils.get_dict_properties(
-            flavor, columns, formatters=_formatters
+            flavor_dict, columns, formatters=_formatters
         )
 
-        return (display_columns, data)
+        return display_columns, data
 
 
 class UnsetFlavor(command.Command):

openstackclient/compute/v2/server.py

@@ -417,7 +417,7 @@ def take_action(
         else:
             net_id = parsed_args.network
 
-        kwargs = {'net_id': net_id}
+        kwargs: dict[str, Any] = {'net_id': net_id}
         if parsed_args.fixed_ip_address:
             kwargs['fixed_ips'] = [
                 {"ip_address": parsed_args.fixed_ip_address}
@@ -3148,9 +3148,8 @@ def take_action(
                 s.image_id = IMAGE_STRING_FOR_BFV
 
             if not sdk_utils.supports_microversion(compute_client, '2.47'):
-                flavor = flavors.get(s.flavor['id'])
-                if flavor:
-                    s.flavor_name = flavor.name
+                if s.flavor['id'] in flavors:
+                    s.flavor_name = flavors[s.flavor['id']].name
                 s.flavor_id = s.flavor['id']
             else:
                 s.flavor_name = s.flavor['original_name']

openstackclient/identity/v3/application_credential.py

@@ -289,13 +289,17 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
         identity_client = sdk_utils.ensure_service_version(
             self.app.client_manager.sdk_connection.identity, '3'
         )
+
         conn = self.app.client_manager.sdk_connection
         auth = conn.config.get_auth()
         if auth is None:
             # this will never happen
             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)
 
         errors = 0
         for ac in parsed_args.application_credential:
@@ -387,12 +391,17 @@ def take_action(
         identity_client = sdk_utils.ensure_service_version(
             self.app.client_manager.sdk_connection.identity, '3'
         )
+
         conn = self.app.client_manager.sdk_connection
         auth = conn.config.get_auth()
         if auth is None:
             # this will never happen
             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)
 
         application_credential = identity_client.find_application_credential(
             user_id, parsed_args.application_credential, ignore_missing=False

openstackclient/identity/v3/project.py

@@ -556,8 +556,8 @@ def take_action(
         if parsed_args.children:
             kwargs['subtree_as_ids'] = True
 
-        project = identity_client.find_project(
+        project_obj = identity_client.find_project(
             project, **kwargs, ignore_missing=False
         )
 
-        return _format_project(project)
+        return _format_project(project_obj)

openstackclient/identity/v3/trust.py

@@ -123,7 +123,7 @@ def take_action(
             self.app.client_manager.sdk_connection.identity, '3'
         )
 
-        kwargs = {}
+        kwargs: dict[str, Any] = {}
 
         # NOTE(stevemar): Find the two users, project and roles that
         # are necessary for making a trust usable, the API dictates that

openstackclient/identity/v3/user.py

@@ -262,7 +262,7 @@ def take_action(
             self.app.client_manager.sdk_connection.identity, '3'
         )
 
-        kwargs = {}
+        kwargs: dict[str, Any] = {}
 
         domain_id = None
         if parsed_args.domain:

openstackclient/image/v2/image.py

@@ -1533,7 +1533,7 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
                     # out, what was changed inside
                     # NOTE: ping gtema to improve that in SDK
                     new_props = kwargs.get(
-                        'properties', image.get('properties').copy()
+                        'properties', image['properties'].copy()
                     )
                     new_props.pop(k, None)
                     kwargs['properties'] = new_props

openstackclient/network/v2/floating_ip.py

@@ -540,11 +540,13 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
 
     def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
-        attrs = {}
         obj = client.find_ip(
             parsed_args.floating_ip,
             ignore_missing=False,
         )
+
+        attrs: dict[str, Any] = {}
+
         if parsed_args.port:
             port = client.find_port(parsed_args.port, ignore_missing=False)
             attrs['port_id'] = port.id

openstackclient/network/v2/floating_ip_port_forwarding.py

@@ -325,7 +325,7 @@ def take_action(
             'Description',
         )
 
-        query = {}
+        query: dict[str, Any] = {}
 
         if parsed_args.port:
             port = client.find_port(parsed_args.port, ignore_missing=False)