python-openstackclient 8.3.0__py3-none-any.whl → 10.0.0__py3-none-any.whl

openstackclient/identity/v3/identity_provider.py

@@ -13,8 +13,12 @@
 
 """Identity v3 IdentityProvider action implementations"""
 
+import argparse
+from collections.abc import Iterable, Sequence
 import logging
+from typing import Any
 
+from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 from osc_lib import utils
@@ -27,10 +31,35 @@ from openstackclient.identity import common
 LOG = logging.getLogger(__name__)
 
 
+def _format_identity_provider(idp):
+    columns = (
+        'authorization_ttl',
+        'description',
+        'domain_id',
+        'is_enabled',
+        'name',
+        'remote_ids',
+    )
+    column_headers = (
+        'authorization_ttl',
+        'description',
+        'domain_id',
+        'enabled',
+        'id',
+        'remote_ids',
+    )
+    return (
+        column_headers,
+        utils.get_item_properties(
+            idp, columns, formatters={'remote_ids': format_columns.ListColumn}
+        ),
+    )
+
+
 class CreateIdentityProvider(command.ShowOne):
     _description = _("Create new identity provider")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'identity_provider_id',
@@ -98,26 +127,34 @@ class CreateIdentityProvider(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        remote_ids: list[str] | None = None
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
+        kwargs = {'is_enabled': parsed_args.enabled}
+        if parsed_args.identity_provider_id:
+            kwargs['id'] = parsed_args.identity_provider_id
+        if parsed_args.description:
+            kwargs['description'] = parsed_args.description
+
         if parsed_args.remote_id_file:
             file_content = utils.read_blob_file_contents(
                 parsed_args.remote_id_file
             )
             remote_ids = file_content.splitlines()
-            remote_ids = list(map(str.strip, remote_ids))
+            kwargs['remote_ids'] = list(map(str.strip, remote_ids))
         elif parsed_args.remote_ids:
-            remote_ids = parsed_args.remote_ids
+            kwargs['remote_ids'] = parsed_args.remote_ids
 
-        domain_id = None
         if parsed_args.domain:
-            domain_id = common.find_domain(
-                identity_client, parsed_args.domain
-            ).id
+            kwargs['domain_id'] = common.find_domain_id_sdk(
+                identity_client,
+                parsed_args.domain,
+                validate_actor_existence=False,
+            )
 
-        # TODO(pas-ha) actually check for 3.14 microversion
-        kwargs = {}
         auth_ttl = parsed_args.authorization_ttl
         if auth_ttl is not None:
             if auth_ttl < 0:
@@ -127,26 +164,15 @@ class CreateIdentityProvider(command.ShowOne):
                 raise exceptions.CommandError(msg)
             kwargs['authorization_ttl'] = auth_ttl
 
-        idp = identity_client.federation.identity_providers.create(
-            id=parsed_args.identity_provider_id,
-            remote_ids=remote_ids,
-            description=parsed_args.description,
-            domain_id=domain_id,
-            enabled=parsed_args.enabled,
-            **kwargs,
-        )
+        idp = identity_client.create_identity_provider(**kwargs)
 
-        idp._info.pop('links', None)
-        idp._info['remote_ids'] = format_columns.ListColumn(
-            idp._info.pop('remote_ids', [])
-        )
-        return zip(*sorted(idp._info.items()))
+        return _format_identity_provider(idp)
 
 
 class DeleteIdentityProvider(command.Command):
     _description = _("Delete identity provider(s)")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'identity_provider',
@@ -156,17 +182,19 @@ class DeleteIdentityProvider(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
         result = 0
         for i in parsed_args.identity_provider:
             try:
-                identity_client.federation.identity_providers.delete(i)
+                identity_client.delete_identity_provider(i)
             except Exception as e:
                 result += 1
                 LOG.error(
                     _(
-                        "Failed to delete identity providers with "
+                        "Failed to delete identity provider with "
                         "name or ID '%(provider)s': %(e)s"
                     ),
                     {'provider': i, 'e': e},
@@ -183,34 +211,39 @@ class DeleteIdentityProvider(command.Command):
 class ListIdentityProvider(command.Lister):
     _description = _("List identity providers")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             '--id',
             metavar='<id>',
-            help=_('The Identity Providers’ ID attribute'),
+            help=_('Filter identity providers by ID'),
         )
         parser.add_argument(
             '--enabled',
             dest='enabled',
             action='store_true',
-            help=_('The Identity Providers that are enabled will be returned'),
+            help=_('List only enabled identity providers'),
         )
         return parser
 
-    def take_action(self, parsed_args):
-        columns = ('ID', 'Enabled', 'Domain ID', 'Description')
-        identity_client = self.app.client_manager.identity
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
+        columns = ('id', 'is_enabled', 'domain_id', 'description')
+        column_headers = ('ID', 'Enabled', 'Domain ID', 'Description')
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         kwargs = {}
         if parsed_args.id:
             kwargs['id'] = parsed_args.id
         if parsed_args.enabled:
-            kwargs['enabled'] = True
+            kwargs['is_enabled'] = True
 
-        data = identity_client.federation.identity_providers.list(**kwargs)
+        data = identity_client.identity_providers(**kwargs)
         return (
-            columns,
+            column_headers,
             (
                 utils.get_item_properties(
                     s,
@@ -225,7 +258,7 @@ class ListIdentityProvider(command.Lister):
 class SetIdentityProvider(command.Command):
     _description = _("Set identity provider properties")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'identity_provider',
@@ -279,8 +312,10 @@ class SetIdentityProvider(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        federation_client = self.app.client_manager.identity.federation
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         # Always set remote_ids if either is passed in
         if parsed_args.remote_id_file:
@@ -297,13 +332,14 @@ class SetIdentityProvider(command.Command):
         if parsed_args.description:
             kwargs['description'] = parsed_args.description
         if parsed_args.enable:
-            kwargs['enabled'] = True
+            kwargs['is_enabled'] = True
         if parsed_args.disable:
-            kwargs['enabled'] = False
+            kwargs['is_enabled'] = False
         if parsed_args.remote_id_file or parsed_args.remote_ids:
             kwargs['remote_ids'] = remote_ids
 
-        # TODO(pas-ha) actually check for 3.14 microversion
+        # NOTE(0weng): This is now possible in SDK! An option should be added.
+        # Original comment:
         # TODO(pas-ha) make it possible to reset authorization_ttl
         # back to None value.
         # Currently not possible as filter_kwargs decorator in
@@ -318,7 +354,7 @@ class SetIdentityProvider(command.Command):
                 raise exceptions.CommandError(msg)
             kwargs['authorization_ttl'] = auth_ttl
 
-        federation_client.identity_providers.update(
+        identity_client.update_identity_provider(
             parsed_args.identity_provider, **kwargs
         )
 
@@ -326,7 +362,7 @@ class SetIdentityProvider(command.Command):
 class ShowIdentityProvider(command.ShowOne):
     _description = _("Display identity provider details")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'identity_provider',
@@ -335,15 +371,14 @@ class ShowIdentityProvider(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        idp = utils.find_resource(
-            identity_client.federation.identity_providers,
-            parsed_args.identity_provider,
-            id=parsed_args.identity_provider,
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
+        idp = identity_client.get_identity_provider(
+            parsed_args.identity_provider
         )
 
-        idp._info.pop('links', None)
-        remote_ids = format_columns.ListColumn(idp._info.pop('remote_ids', []))
-        idp._info['remote_ids'] = remote_ids
-        return zip(*sorted(idp._info.items()))
+        return _format_identity_provider(idp)

openstackclient/identity/v3/implied_role.py

@@ -15,7 +15,10 @@
 
 """Identity v3 Implied Role action implementations"""
 
+import argparse
+from collections.abc import Iterable, Sequence
 import logging
+from typing import Any
 
 
 from openstackclient import command
@@ -25,7 +28,9 @@ from openstackclient.i18n import _
 LOG = logging.getLogger(__name__)
 
 
-def _get_role_ids(identity_client, parsed_args):
+def _get_role_ids(
+    identity_client: Any, parsed_args: argparse.Namespace
+) -> tuple[Any, Any]:
     """Return prior and implied role id(s)
 
     If prior and implied role id(s) are retrievable from identity
@@ -50,7 +55,7 @@ def _get_role_ids(identity_client, parsed_args):
 class CreateImpliedRole(command.ShowOne):
     _description = _("Creates an association between prior and implied roles")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'role',
@@ -65,7 +70,9 @@ class CreateImpliedRole(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
         identity_client = self.app.client_manager.identity
         (prior_role_id, implied_role_id) = _get_role_ids(
             identity_client, parsed_args
@@ -74,13 +81,16 @@ class CreateImpliedRole(command.ShowOne):
             prior_role_id, implied_role_id
         )
         response._info.pop('links', None)
-        return zip(*sorted([(k, v['id']) for k, v in response._info.items()]))
+        col_headers, col_data = zip(
+            *sorted([(k, v['id']) for k, v in response._info.items()])
+        )
+        return col_headers, col_data
 
 
 class DeleteImpliedRole(command.Command):
     _description = _("Deletes an association between prior and implied roles")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'role',
@@ -95,7 +105,7 @@ class DeleteImpliedRole(command.Command):
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
         identity_client = self.app.client_manager.identity
         (prior_role_id, implied_role_id) = _get_role_ids(
             identity_client, parsed_args
@@ -112,12 +122,14 @@ class ListImpliedRole(command.Lister):
         'Implied Role Name',
     ]
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         return parser
 
-    def take_action(self, parsed_args):
-        def _list_implied(response):
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[tuple[Any, ...]]]:
+        def _list_implied(response: Any) -> Iterable[tuple[Any, ...]]:
             for rule in response:
                 for implies in rule.implies:
                     yield (

openstackclient/identity/v3/limit.py

@@ -13,8 +13,12 @@
 
 """Limits action implementations."""
 
+import argparse
+from collections.abc import Iterable, Sequence
 import logging
+from typing import Any
 
+from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -25,10 +29,32 @@ from openstackclient.identity import common as common_utils
 LOG = logging.getLogger(__name__)
 
 
+def _format_limit(limit: Any) -> tuple[tuple[str, ...], Any]:
+    columns = (
+        "description",
+        "id",
+        "project_id",
+        "region_id",
+        "resource_limit",
+        "resource_name",
+        "service_id",
+    )
+    column_headers = (
+        "description",
+        "id",
+        "project_id",
+        "region_id",
+        "resource_limit",
+        "resource_name",
+        "service_id",
+    )
+    return (column_headers, utils.get_item_properties(limit, columns))
+
+
 class CreateLimit(command.ShowOne):
     _description = _("Create a limit")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             '--description',
@@ -46,6 +72,7 @@ class CreateLimit(command.ShowOne):
             required=True,
             help=_('Project to associate the resource limit to'),
         )
+        common_utils.add_project_domain_option_to_parser(parser)
         parser.add_argument(
             '--service',
             metavar='<service>',
@@ -66,54 +93,44 @@ class CreateLimit(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
-        project = common_utils.find_project(
-            identity_client, parsed_args.project
+        kwargs = {
+            "resource_name": parsed_args.resource_name,
+            "resource_limit": parsed_args.resource_limit,
+        }
+        if parsed_args.description:
+            kwargs["description"] = parsed_args.description
+
+        kwargs["project_id"] = common_utils.find_project_id_sdk(
+            identity_client,
+            parsed_args.project,
+            domain_name_or_id=parsed_args.project_domain,
         )
-        service = common_utils.find_service(
+
+        kwargs["service_id"] = common_utils.find_service_sdk(
             identity_client, parsed_args.service
-        )
-        region = None
+        ).id
+
         if parsed_args.region:
-            if 'None' not in parsed_args.region:
-                # NOTE (vishakha): Due to bug #1799153 and for any another
-                # related case where GET resource API does not support the
-                # filter by name, osc_lib.utils.find_resource() method cannot
-                # be used because that method try to fall back to list all the
-                # resource if requested resource cannot be get via name. Which
-                # ends up with NoUniqueMatch error.
-                # So osc_lib.utils.find_resource() function cannot be used for
-                # 'regions', using common_utils.get_resource() instead.
-                region = common_utils.get_resource(
-                    identity_client.regions, parsed_args.region
-                )
-            else:
-                self.log.warning(
-                    _(
-                        "Passing 'None' to indicate no region is deprecated. "
-                        "Instead, don't pass --region."
-                    )
-                )
+            kwargs["region_id"] = identity_client.get_region(
+                parsed_args.region
+            ).id
 
-        limit = identity_client.limits.create(
-            project,
-            service,
-            parsed_args.resource_name,
-            parsed_args.resource_limit,
-            description=parsed_args.description,
-            region=region,
-        )
+        limit = identity_client.create_limit(**kwargs)
 
-        limit._info.pop('links', None)
-        return zip(*sorted(limit._info.items()))
+        return _format_limit(limit)
 
 
 class ListLimit(command.Lister):
     _description = _("List limits")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             '--service',
@@ -136,50 +153,45 @@ class ListLimit(command.Lister):
             metavar='<project>',
             help=_('List resource limits associated with project'),
         )
+        common_utils.add_project_domain_option_to_parser(parser)
+
         return parser
 
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
-        service = None
+        kwargs = {}
         if parsed_args.service:
-            service = common_utils.find_service(
+            kwargs["service_id"] = common_utils.find_service_sdk(
                 identity_client, parsed_args.service
             )
-        region = None
+
         if parsed_args.region:
-            if 'None' not in parsed_args.region:
-                # NOTE (vishakha): Due to bug #1799153 and for any another
-                # related case where GET resource API does not support the
-                # filter by name, osc_lib.utils.find_resource() method cannot
-                # be used because that method try to fall back to list all the
-                # resource if requested resource cannot be get via name. Which
-                # ends up with NoUniqueMatch error.
-                # So osc_lib.utils.find_resource() function cannot be used for
-                # 'regions', using common_utils.get_resource() instead.
-                region = common_utils.get_resource(
-                    identity_client.regions, parsed_args.region
-                )
-            else:
-                self.log.warning(
-                    _(
-                        "Passing 'None' to indicate no region is deprecated. "
-                        "Instead, don't pass --region."
-                    )
-                )
+            kwargs["region_id"] = identity_client.get_region(
+                parsed_args.region
+            ).id
 
-        project = None
         if parsed_args.project:
-            project = utils.find_resource(
-                identity_client.projects, parsed_args.project
+            project_domain_id = None
+            if parsed_args.project_domain:
+                project_domain_id = common_utils.find_domain_id_sdk(
+                    identity_client, parsed_args.project_domain
+                )
+
+            kwargs["project_id"] = common_utils._find_sdk_id(
+                identity_client.find_project,
+                name_or_id=parsed_args.project,
+                domain_id=project_domain_id,
             )
 
-        limits = identity_client.limits.list(
-            service=service,
-            resource_name=parsed_args.resource_name,
-            region=region,
-            project=project,
-        )
+        if parsed_args.resource_name:
+            kwargs["resource_name"] = parsed_args.resource_name
+
+        limits = identity_client.limits(**kwargs)
 
         columns = (
             'ID',
@@ -199,7 +211,7 @@ class ListLimit(command.Lister):
 class ShowLimit(command.ShowOne):
     _description = _("Display limit details")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'limit_id',
@@ -208,17 +220,20 @@ class ShowLimit(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        limit = identity_client.limits.get(parsed_args.limit_id)
-        limit._info.pop('links', None)
-        return zip(*sorted(limit._info.items()))
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
+        limit = identity_client.get_limit(parsed_args.limit_id)
+        return _format_limit(limit)
 
 
 class SetLimit(command.ShowOne):
     _description = _("Update information about a limit")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'limit_id',
@@ -239,40 +254,48 @@ class SetLimit(command.ShowOne):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-
-        limit = identity_client.limits.update(
-            parsed_args.limit_id,
-            description=parsed_args.description,
-            resource_limit=parsed_args.resource_limit,
+    def take_action(
+        self, parsed_args: argparse.Namespace
+    ) -> tuple[Sequence[str], Iterable[Any]]:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
         )
 
-        limit._info.pop('links', None)
+        kwargs = {}
+        if parsed_args.description:
+            kwargs["description"] = parsed_args.description
+        if parsed_args.resource_limit:
+            kwargs["resource_limit"] = parsed_args.resource_limit
+        limit = identity_client.update_limit(parsed_args.limit_id, **kwargs)
 
-        return zip(*sorted(limit._info.items()))
+        return _format_limit(limit)
 
 
 class DeleteLimit(command.Command):
     _description = _("Delete a limit")
 
-    def get_parser(self, prog_name):
+    def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'limit_id',
             metavar='<limit-id>',
             nargs="+",
-            help=_('Limit to delete (ID)'),
+            help=_(
+                'Limit to delete (ID) '
+                '(repeat option to remove multiple limits)'
+            ),
         )
         return parser
 
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+    def take_action(self, parsed_args: argparse.Namespace) -> None:
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         errors = 0
         for limit_id in parsed_args.limit_id:
             try:
-                identity_client.limits.delete(limit_id)
+                identity_client.delete_limit(limit_id)
             except Exception as e:
                 errors += 1
                 LOG.error(