python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

openstackclient/identity/v3/application_credential.py

@@ -18,6 +18,7 @@
 import datetime
 import json
 import logging
+import uuid
 
 from osc_lib.command import command
 from osc_lib import exceptions
@@ -30,11 +31,35 @@ from openstackclient.identity import common
 LOG = logging.getLogger(__name__)
 
 
+# TODO(stephenfin): Move this to osc_lib since it's useful elsewhere
+def is_uuid_like(value) -> bool:
+    """Returns validation of a value as a UUID.
+
+    :param val: Value to verify
+    :type val: string
+    :returns: bool
+
+    .. versionchanged:: 1.1.1
+       Support non-lowercase UUIDs.
+    """
+    try:
+        formatted_value = (
+            value.replace('urn:', '')
+            .replace('uuid:', '')
+            .strip('{}')
+            .replace('-', '')
+            .lower()
+        )
+        return str(uuid.UUID(value)).replace('-', '') == formatted_value
+    except (TypeError, ValueError, AttributeError):
+        return False
+
+
 class CreateApplicationCredential(command.ShowOne):
     _description = _("Create new application credential")
 
     def get_parser(self, prog_name):
-        parser = super(CreateApplicationCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name',
             metavar='<name>',
@@ -105,19 +130,16 @@ class CreateApplicationCredential(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
 
         role_ids = []
         for role in parsed_args.role:
-            # A user can only create an application credential for themself,
-            # not for another user even as an admin, and only on the project to
-            # which they are currently scoped with a subset of the role
-            # assignments they have on that project. Don't bother trying to
-            # look up roles via keystone, just introspect the token.
-            role_id = common._get_token_resource(
-                identity_client, "roles", role
-            )
-            role_ids.append(role_id)
+            if is_uuid_like(role):
+                role_ids.append({'id': role})
+            else:
+                role_ids.append({'name': role})
 
         expires_at = None
         if parsed_args.expiration:
@@ -137,17 +159,17 @@ class CreateApplicationCredential(command.ShowOne):
                 try:
                     with open(parsed_args.access_rules) as f:
                         access_rules = json.load(f)
-                except IOError:
+                except OSError:
                     msg = _(
                         "Access rules is not valid JSON string or file does"
                         " not exist."
                     )
                     raise exceptions.CommandError(msg)
         else:
-            access_rules = None
+            access_rules = []
 
-        app_cred_manager = identity_client.application_credentials
-        application_credential = app_cred_manager.create(
+        application_credential = identity_client.create_application_credential(
+            user_id,
             parsed_args.name,
             roles=role_ids,
             expires_at=expires_at,
@@ -157,21 +179,39 @@ class CreateApplicationCredential(command.ShowOne):
             access_rules=access_rules,
         )
 
-        application_credential._info.pop('links', None)
-
         # Format roles into something sensible
-        roles = application_credential._info.pop('roles')
-        msg = ' '.join(r['name'] for r in roles)
-        application_credential._info['roles'] = msg
+        if application_credential['roles']:
+            roles = application_credential['roles']
+            msg = ' '.join(r['name'] for r in roles)
+            application_credential['roles'] = msg
 
-        return zip(*sorted(application_credential._info.items()))
+        columns = (
+            'id',
+            'name',
+            'description',
+            'project_id',
+            'roles',
+            'unrestricted',
+            'access_rules',
+            'expires_at',
+            'secret',
+        )
+        return (
+            columns,
+            (
+                utils.get_dict_properties(
+                    application_credential,
+                    columns,
+                )
+            ),
+        )
 
 
 class DeleteApplicationCredential(command.Command):
     _description = _("Delete application credentials(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteApplicationCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'application_credential',
             metavar='<application-credential>',
@@ -181,15 +221,19 @@ class DeleteApplicationCredential(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
 
         errors = 0
         for ac in parsed_args.application_credential:
             try:
-                app_cred = utils.find_resource(
-                    identity_client.application_credentials, ac
+                app_cred = identity_client.find_application_credential(
+                    user_id, ac
+                )
+                identity_client.delete_application_credential(
+                    user_id, app_cred.id
                 )
-                identity_client.application_credentials.delete(app_cred.id)
             except Exception as e:
                 errors += 1
                 LOG.error(
@@ -213,7 +257,7 @@ class ListApplicationCredential(command.Lister):
     _description = _("List application credentials")
 
     def get_parser(self, prog_name):
-        parser = super(ListApplicationCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--user',
             metavar='<user>',
@@ -223,16 +267,36 @@ class ListApplicationCredential(command.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
         if parsed_args.user:
             user_id = common.find_user(
                 identity_client, parsed_args.user, parsed_args.user_domain
             ).id
         else:
-            user_id = None
-
-        columns = ('ID', 'Name', 'Project ID', 'Description', 'Expires At')
-        data = identity_client.application_credentials.list(user=user_id)
+            conn = self.app.client_manager.sdk_connection
+            user_id = conn.config.get_auth().get_user_id(conn.identity)
+
+        data = identity_client.application_credentials(user=user_id)
+
+        data_formatted = []
+        for ac in data:
+            # Format roles into something sensible
+            roles = ac['roles']
+            msg = ' '.join(r['name'] for r in roles)
+            ac['roles'] = msg
+
+            data_formatted.append(ac)
+
+        columns = (
+            'ID',
+            'Name',
+            'Description',
+            'Project ID',
+            'Roles',
+            'Unrestricted',
+            'Access Rules',
+            'Expires At',
+        )
         return (
             columns,
             (
@@ -241,7 +305,7 @@ class ListApplicationCredential(command.Lister):
                     columns,
                     formatters={},
                 )
-                for s in data
+                for s in data_formatted
             ),
         )
 
@@ -250,7 +314,7 @@ class ShowApplicationCredential(command.ShowOne):
     _description = _("Display application credential details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowApplicationCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'application_credential',
             metavar='<application-credential>',
@@ -259,17 +323,35 @@ class ShowApplicationCredential(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        app_cred = utils.find_resource(
-            identity_client.application_credentials,
-            parsed_args.application_credential,
-        )
+        identity_client = self.app.client_manager.sdk_connection.identity
+        conn = self.app.client_manager.sdk_connection
+        user_id = conn.config.get_auth().get_user_id(conn.identity)
 
-        app_cred._info.pop('links', None)
+        app_cred = identity_client.find_application_credential(
+            user_id, parsed_args.application_credential
+        )
 
         # Format roles into something sensible
-        roles = app_cred._info.pop('roles')
+        roles = app_cred['roles']
         msg = ' '.join(r['name'] for r in roles)
-        app_cred._info['roles'] = msg
+        app_cred['roles'] = msg
 
-        return zip(*sorted(app_cred._info.items()))
+        columns = (
+            'id',
+            'name',
+            'description',
+            'project_id',
+            'roles',
+            'unrestricted',
+            'access_rules',
+            'expires_at',
+        )
+        return (
+            columns,
+            (
+                utils.get_dict_properties(
+                    app_cred,
+                    columns,
+                )
+            ),
+        )

openstackclient/identity/v3/catalog.py

@@ -34,7 +34,7 @@ class EndpointsColumn(cliff_columns.FormattableColumn):
         for ep in self._value:
             region = ep.get('region_id') or ep.get('region') or '<none>'
             ret += region + '\n'
-            ret += "  %s: %s\n" % (ep['interface'], ep['url'])
+            ret += "  {}: {}\n".format(ep['interface'], ep['url'])
         return ret
 
 
@@ -70,7 +70,7 @@ class ShowCatalog(command.ShowOne):
     _description = _("Display service catalog details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowCatalog, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'service',
             metavar='<service>',

openstackclient/identity/v3/consumer.py

@@ -31,7 +31,7 @@ class CreateConsumer(command.ShowOne):
     _description = _("Create new consumer")
 
     def get_parser(self, prog_name):
-        parser = super(CreateConsumer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--description',
             metavar='<description>',
@@ -52,7 +52,7 @@ class DeleteConsumer(command.Command):
     _description = _("Delete consumer(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteConsumer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'consumer',
             metavar='<consumer>',
@@ -111,7 +111,7 @@ class SetConsumer(command.Command):
     _description = _("Set consumer properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetConsumer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'consumer',
             metavar='<consumer>',
@@ -142,7 +142,7 @@ class ShowConsumer(command.ShowOne):
     _description = _("Display consumer details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowConsumer, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'consumer',
             metavar='<consumer>',

openstackclient/identity/v3/credential.py

@@ -32,7 +32,7 @@ class CreateCredential(command.ShowOne):
     _description = _("Create new credential")
 
     def get_parser(self, prog_name):
-        parser = super(CreateCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'user',
             metavar='<user>',
@@ -85,7 +85,7 @@ class DeleteCredential(command.Command):
     _description = _("Delete credential(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'credential',
             metavar='<credential-id>',
@@ -122,7 +122,7 @@ class ListCredential(command.Lister):
     _description = _("List credentials")
 
     def get_parser(self, prog_name):
-        parser = super(ListCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--user',
             metavar='<user>',
@@ -171,7 +171,7 @@ class SetCredential(command.Command):
     _description = _("Set credential properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'credential',
             metavar='<credential-id>',
@@ -232,7 +232,7 @@ class ShowCredential(command.ShowOne):
     _description = _("Display credential details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowCredential, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'credential',
             metavar='<credential-id>',

openstackclient/identity/v3/domain.py

@@ -33,7 +33,7 @@ class CreateDomain(command.ShowOne):
     _description = _("Create new domain")
 
     def get_parser(self, prog_name):
-        parser = super(CreateDomain, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name',
             metavar='<domain-name>',
@@ -96,7 +96,7 @@ class DeleteDomain(command.Command):
     _description = _("Delete domain(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteDomain, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'domain',
             metavar='<domain>',
@@ -135,7 +135,7 @@ class ListDomain(command.Lister):
     _description = _("List domains")
 
     def get_parser(self, prog_name):
-        parser = super(ListDomain, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--name',
             metavar='<name>',
@@ -175,7 +175,7 @@ class SetDomain(command.Command):
     _description = _("Set domain properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetDomain, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'domain',
             metavar='<domain>',
@@ -232,7 +232,7 @@ class ShowDomain(command.ShowOne):
     _description = _("Display domain details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowDomain, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'domain',
             metavar='<domain>',

openstackclient/identity/v3/ec2creds.py

@@ -60,7 +60,7 @@ class CreateEC2Creds(command.ShowOne):
     _description = _("Create EC2 credentials")
 
     def get_parser(self, prog_name):
-        parser = super(CreateEC2Creds, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--project',
             metavar='<project>',
@@ -122,7 +122,7 @@ class DeleteEC2Creds(command.Command):
     _description = _("Delete EC2 credentials")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteEC2Creds, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'access_key',
             metavar='<access-key>',
@@ -166,7 +166,7 @@ class ListEC2Creds(command.Lister):
     _description = _("List EC2 credentials")
 
     def get_parser(self, prog_name):
-        parser = super(ListEC2Creds, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--user',
             metavar='<user>',
@@ -200,7 +200,7 @@ class ShowEC2Creds(command.ShowOne):
     _description = _("Display EC2 credentials details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowEC2Creds, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'access_key',
             metavar='<access-key>',

openstackclient/identity/v3/endpoint.py

@@ -39,7 +39,7 @@ class AddProjectToEndpoint(command.Command):
     _description = _("Associate a project to an endpoint")
 
     def get_parser(self, prog_name):
-        parser = super(AddProjectToEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpoint',
             metavar='<endpoint>',
@@ -75,7 +75,7 @@ class CreateEndpoint(command.ShowOne):
     _description = _("Create new endpoint")
 
     def get_parser(self, prog_name):
-        parser = super(CreateEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'service',
             metavar='<service>',
@@ -137,7 +137,7 @@ class DeleteEndpoint(command.Command):
     _description = _("Delete endpoint(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpoint',
             metavar='<endpoint-id>',
@@ -177,7 +177,7 @@ class ListEndpoint(command.Lister):
     _description = _("List endpoints")
 
     def get_parser(self, prog_name):
-        parser = super(ListEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--service',
             metavar='<service>',
@@ -285,7 +285,7 @@ class RemoveProjectFromEndpoint(command.Command):
     _description = _("Dissociate a project from an endpoint")
 
     def get_parser(self, prog_name):
-        parser = super(RemoveProjectFromEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpoint',
             metavar='<endpoint>',
@@ -321,7 +321,7 @@ class SetEndpoint(command.Command):
     _description = _("Set endpoint properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpoint',
             metavar='<endpoint-id>',
@@ -393,7 +393,7 @@ class ShowEndpoint(command.ShowOne):
     _description = _("Display endpoint details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowEndpoint, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpoint',
             metavar='<endpoint>',

openstackclient/identity/v3/endpoint_group.py

@@ -27,7 +27,7 @@ from openstackclient.identity import common
 LOG = logging.getLogger(__name__)
 
 
-class _FiltersReader(object):
+class _FiltersReader:
     _description = _("Helper class capable of reading filters from files")
 
     def _read_filters(self, path):
@@ -63,7 +63,7 @@ class AddProjectToEndpointGroup(command.Command):
     _description = _("Add a project to an endpoint group")
 
     def get_parser(self, prog_name):
-        parser = super(AddProjectToEndpointGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpointgroup',
             metavar='<endpoint-group>',
@@ -97,7 +97,7 @@ class CreateEndpointGroup(command.ShowOne, _FiltersReader):
     _description = _("Create new endpoint group")
 
     def get_parser(self, prog_name):
-        parser = super(CreateEndpointGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'name',
             metavar='<name>',
@@ -137,7 +137,7 @@ class DeleteEndpointGroup(command.Command):
     _description = _("Delete endpoint group(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteEndpointGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpointgroup',
             metavar='<endpoint-group>',
@@ -177,7 +177,7 @@ class ListEndpointGroup(command.Lister):
     _description = _("List endpoint groups")
 
     def get_parser(self, prog_name):
-        parser = super(ListEndpointGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         list_group = parser.add_mutually_exclusive_group()
         list_group.add_argument(
             '--endpointgroup',
@@ -242,9 +242,7 @@ class RemoveProjectFromEndpointGroup(command.Command):
     _description = _("Remove project from endpoint group")
 
     def get_parser(self, prog_name):
-        parser = super(RemoveProjectFromEndpointGroup, self).get_parser(
-            prog_name
-        )
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpointgroup',
             metavar='<endpoint-group>',
@@ -278,7 +276,7 @@ class SetEndpointGroup(command.Command, _FiltersReader):
     _description = _("Set endpoint group properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetEndpointGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpointgroup',
             metavar='<endpoint-group>',
@@ -324,7 +322,7 @@ class ShowEndpointGroup(command.ShowOne):
     _description = _("Display endpoint group details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowEndpointGroup, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'endpointgroup',
             metavar='<endpointgroup>',

openstackclient/identity/v3/federation_protocol.py

@@ -30,7 +30,7 @@ class CreateProtocol(command.ShowOne):
     _description = _("Create new federation protocol")
 
     def get_parser(self, prog_name):
-        parser = super(CreateProtocol, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'federation_protocol',
             metavar='<name>',
@@ -79,7 +79,7 @@ class DeleteProtocol(command.Command):
     _description = _("Delete federation protocol(s)")
 
     def get_parser(self, prog_name):
-        parser = super(DeleteProtocol, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'federation_protocol',
             metavar='<federation-protocol>',
@@ -129,7 +129,7 @@ class ListProtocols(command.Lister):
     _description = _("List federation protocols")
 
     def get_parser(self, prog_name):
-        parser = super(ListProtocols, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--identity-provider',
             metavar='<identity-provider>',
@@ -158,7 +158,7 @@ class SetProtocol(command.Command):
     _description = _("Set federation protocol properties")
 
     def get_parser(self, prog_name):
-        parser = super(SetProtocol, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'federation_protocol',
             metavar='<name>',
@@ -202,7 +202,7 @@ class ShowProtocol(command.ShowOne):
     _description = _("Display federation protocol details")
 
     def get_parser(self, prog_name):
-        parser = super(ShowProtocol, self).get_parser(prog_name)
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             'federation_protocol',
             metavar='<federation-protocol>',