Merge "typing: Add types for _format_* helpers"

Author: Zuul

openstackclient/compute/v2/server_event.py

@@ -23,6 +23,7 @@
 
 from cliff import columns
 import iso8601
+from openstack.compute.v2 import server_action as _server_action
 from openstack import exceptions as sdk_exceptions
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
@@ -67,7 +68,8 @@ class ServerActionEventColumn(columns.FormattableColumn[Any]):
     objects as we'd like.
     """
 
-    def _format_event(self, event: Any) -> dict[str, Any]:
+    @staticmethod
+    def _format_event(event: _server_action.ServerAction) -> dict[str, Any]:
         hidden_columns = ['id', 'name', 'location']
         _, columns = utils.get_osc_show_columns_for_sdk_resource(
             event, {}, hidden_columns

openstackclient/identity/common.py

@@ -25,6 +25,8 @@
 from keystoneclient.v3 import projects
 from keystoneclient.v3 import users
 from openstack import exceptions as sdk_exceptions
+from openstack.identity import v3 as identity
+from openstack.identity.v3 import service as _service
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -78,7 +80,9 @@ def find_service(identity_client: Any, name_type_or_id: str) -> Any:
         raise exceptions.CommandError(msg % name_type_or_id)
 
 
-def find_service_sdk(identity_client: Any, name_type_or_id: str) -> Any:
+def find_service_sdk(
+    identity_client: identity.Proxy, name_type_or_id: str
+) -> _service.Service:
     """Find a service by id, name or type."""
 
     try:

openstackclient/identity/v3/application_credential.py

@@ -24,6 +24,9 @@
 import uuid
 
 from cliff import columns as cliff_columns
+from openstack.identity.v3 import (
+    application_credential as _application_credential,
+)
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -43,8 +46,10 @@ def human_readable(self) -> str:
 
 
 def _format_application_credential(
-    application_credential: Any, *, include_secret: bool = False
-) -> tuple[tuple[str, ...], Any]:
+    application_credential: _application_credential.ApplicationCredential,
+    *,
+    include_secret: bool = False,
+) -> tuple[tuple[str, ...], Iterable[Any]]:
     column_headers: tuple[str, ...] = (
         'ID',
         'Name',
@@ -78,7 +83,9 @@ def _format_application_credential(
 
 
 def _format_application_credentials(
-    application_credentials: Any,
+    application_credentials: Iterable[
+        _application_credential.ApplicationCredential
+    ],
 ) -> tuple[tuple[str, ...], Any]:
     column_headers = (
         'ID',

openstackclient/identity/v3/credential.py

@@ -20,6 +20,7 @@
 import logging
 from typing import Any
 
+from openstack.identity.v3 import credential as _credential
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -28,11 +29,12 @@
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_credential(credential: Any) -> tuple[tuple[str, ...], Any]:
+def _format_credential(
+    credential: _credential.Credential,
+) -> tuple[tuple[str, ...], Iterable[Any]]:
     columns = (
         'blob',
         'id',

openstackclient/identity/v3/domain.py

@@ -21,6 +21,7 @@
 from typing import Any
 
 from openstack import exceptions as sdk_exceptions
+from openstack.identity.v3 import domain as _domain
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -29,11 +30,12 @@
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_domain(domain: Any) -> tuple[tuple[str, ...], Any]:
+def _format_domain(
+    domain: _domain.Domain,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = (
         'id',
         'name',

openstackclient/identity/v3/endpoint.py

@@ -21,6 +21,7 @@
 from typing import Any
 
 from openstack.identity.v3 import endpoint as _endpoint
+from openstack.identity.v3 import service as _service
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -29,12 +30,11 @@
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
-
 LOG = logging.getLogger(__name__)
 
 
 def _format_endpoint(
-    endpoint: Any, service: Any
+    endpoint: _endpoint.Endpoint, service: _service.Service
 ) -> tuple[tuple[str, ...], Any]:
     columns = (
         'is_enabled',
@@ -433,7 +433,7 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
             parsed_args.endpoint, ignore_missing=False
         )
 
-        kwargs = {}
+        kwargs: dict[str, object] = {}
 
         if parsed_args.service:
             service = common.find_service_sdk(

openstackclient/identity/v3/federation_protocol.py

@@ -19,18 +19,20 @@
 import logging
 from typing import Any
 
+from openstack.identity.v3 import federation_protocol as _federation_protocol
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient import command
 from openstackclient.i18n import _
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_protocol(protocol: Any) -> tuple[tuple[str, ...], Any]:
+def _format_protocol(
+    protocol: _federation_protocol.FederationProtocol,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = ('name', 'idp_id', 'mapping_id')
     column_headers = ('id', 'identity_provider', 'mapping')
     return (

openstackclient/identity/v3/group.py

@@ -21,6 +21,7 @@
 from typing import Any
 
 from openstack import exceptions as sdk_exc
+from openstack.identity.v3 import group as _group
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -29,11 +30,12 @@
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_group(group: Any) -> tuple[tuple[str, ...], Any]:
+def _format_group(
+    group: _group.Group,
+) -> tuple[tuple[str, ...], Iterable[Any]]:
     columns = (
         'description',
         'domain_id',

openstackclient/identity/v3/identity_provider.py

@@ -18,6 +18,7 @@
 import logging
 from typing import Any
 
+from openstack.identity.v3 import identity_provider as _identity_provider
 from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
@@ -32,7 +33,7 @@
 
 
 def _format_identity_provider(
-    idp: Any,
+    idp: _identity_provider.IdentityProvider,
 ) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = (
         'authorization_ttl',

openstackclient/identity/v3/limit.py

@@ -18,6 +18,7 @@
 import logging
 from typing import Any
 
+from openstack.identity.v3 import limit as _limit
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -29,7 +30,9 @@
 LOG = logging.getLogger(__name__)
 
 
-def _format_limit(limit: Any) -> tuple[tuple[str, ...], Any]:
+def _format_limit(
+    limit: _limit.Limit,
+) -> tuple[tuple[str, ...], Iterable[Any]]:
     columns = (
         "description",
         "id",
@@ -164,7 +167,7 @@ def take_action(
             self.app.client_manager.sdk_connection.identity, '3'
         )
 
-        kwargs = {}
+        kwargs: dict[str, object] = {}
         if parsed_args.service:
             kwargs["service_id"] = common_utils.find_service_sdk(
                 identity_client, parsed_args.service