summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3/ec2creds.py
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/identity/v3/ec2creds.py')
-rw-r--r--openstackclient/identity/v3/ec2creds.py25
1 files changed, 23 insertions, 2 deletions
diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py
index 835fe96f..7ad01719 100644
--- a/openstackclient/identity/v3/ec2creds.py
+++ b/openstackclient/identity/v3/ec2creds.py
@@ -12,7 +12,10 @@
"""Identity v3 EC2 Credentials action implementations"""
+import logging
+
from osc_lib.command import command
+from osc_lib import exceptions
from osc_lib import utils
import six
@@ -20,6 +23,9 @@ from openstackclient.i18n import _
from openstackclient.identity import common
+LOG = logging.getLogger(__name__)
+
+
def _determine_ec2_user(parsed_args, client_manager):
"""Determine a user several different ways.
@@ -113,7 +119,8 @@ class DeleteEC2Creds(command.Command):
parser.add_argument(
'access_key',
metavar='<access-key>',
- help=_('Credentials access key'),
+ nargs='+',
+ help=_('Credentials access key(s)'),
)
parser.add_argument(
'--user',
@@ -126,7 +133,21 @@ class DeleteEC2Creds(command.Command):
def take_action(self, parsed_args):
client_manager = self.app.client_manager
user = _determine_ec2_user(parsed_args, client_manager)
- client_manager.identity.ec2.delete(user, parsed_args.access_key)
+ result = 0
+ for i in parsed_args.access_key:
+ try:
+ client_manager.identity.ec2.delete(user, i)
+ except Exception as e:
+ result += 1
+ LOG.error(_("Failed to delete EC2 credentials with "
+ "access key '%(access_key)s': %(e)s")
+ % {'access_key': i, 'e': e})
+
+ if result > 0:
+ total = len(parsed_args.access_key)
+ msg = (_("%(result)s of %(total)s EC2 keys failed "
+ "to delete.") % {'result': result, 'total': total})
+ raise exceptions.CommandError(msg)
class ListEC2Creds(command.Lister):