From aa01c58b5746166e278457b6db60b40fe79ca026 Mon Sep 17 00:00:00 2001
From: Nicolas Simonds <nic@submedia.net>
Date: Tue, 27 Mar 2012 21:37:00 -0700
Subject: [PATCH] make "salt-key --list" friendlier to scripts/pipes

This alters the behaviour of the --list flag to take arguments,
e.g., "pre", "accept", "rej", etc.  The default behaviour (--list-all)
is unmodified, although it is properly spelled "--list all" now.

This will allow administrators to see the subset of keys they care
about, and get key counts without getting awk involved (unless they
want to)
---
 salt/cli/__init__.py | 11 +++++++----
 salt/cli/key.py      | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/salt/cli/__init__.py b/salt/cli/__init__.py
index 3dde5c4ae1..b44a8109c6 100644
--- a/salt/cli/__init__.py
+++ b/salt/cli/__init__.py
@@ -495,16 +495,19 @@ class SaltKey(object):
         parser.add_option('-l',
                 '--list',
                 dest='list',
-                default=False,
-                action='store_true',
-                help='List the unaccepted public keys')
+                default='',
+                help=('List the public keys. Takes the args: '
+                      '"pre", "un", "unaccepted": Unaccepted/unsigned keys '
+                      '"acc", "accepted": Accepted/signed keys '
+                      '"rej", "rejected": Rejected keys '
+                      '"all": all keys'))
 
         parser.add_option('-L',
                 '--list-all',
                 dest='list_all',
                 default=False,
                 action='store_true',
-                help='List all public keys')
+                help='List all public keys.  Deprecated: use "--list all"')
 
         parser.add_option('-a',
                 '--accept',
diff --git a/salt/cli/key.py b/salt/cli/key.py
index 230df0de34..5ef208caca 100644
--- a/salt/cli/key.py
+++ b/salt/cli/key.py
@@ -54,38 +54,51 @@ class Key(object):
         if not self.opts['quiet']:
             print message
 
-    def _list_pre(self):
+    def _list_pre(self, header=True):
         '''
         List the unaccepted keys
         '''
-        self._log(utils.LIGHT_RED + 'Unaccepted Keys:' + utils.ENDC)
+        if header == True:
+            self._log(utils.LIGHT_RED + 'Unaccepted Keys:' + utils.ENDC)
         for key in sorted(self._keys('pre')):
             output = utils.RED + key + utils.ENDC
             self._log(output)
 
-    def _list_accepted(self):
+    def _list_accepted(self, header=True):
         '''
         List the accepted public keys
         '''
-        self._log(utils.LIGHT_GREEN + 'Accepted Keys:' + utils.ENDC)
+        if header == True:
+            self._log(utils.LIGHT_GREEN + 'Accepted Keys:' + utils.ENDC)
         for key in sorted(self._keys('acc')):
             self._log(utils.GREEN + key + utils.ENDC)
 
-    def _list_rejected(self):
+    def _list_rejected(self, header=True):
         '''
         List the unaccepted keys
         '''
-        self._log(utils.LIGHT_BLUE + 'Rejected:' + utils.ENDC)
+        if header == True:
+            self._log(utils.LIGHT_BLUE + 'Rejected:' + utils.ENDC)
         for key in sorted(self._keys('rej')):
             self._log(utils.BLUE + key + utils.ENDC)
 
-    def _list_all(self):
+    def _list(self, name):
         '''
-        List all keys
+        List keys
         '''
-        self._list_pre()
-        self._list_accepted()
-        self._list_rejected()
+        if name in ('pre', 'un', 'unaccept', 'unaccepted'):
+            self._list_pre(False)
+        elif name in ('acc', 'accept', 'accepted'):
+            self._list_accepted(False)
+        elif name in ('rej', 'reject', 'rejected'):
+            self._list_rejected(False)
+        elif name in ('all',):
+            self._list_pre()
+            self._list_accepted()
+            self._list_rejected()
+        else:
+            err = 'Unrecognized key type "%s".  Run with -h for options.' % name
+            self._log(err, level='error')
 
     def _print_key(self, name):
         '''
@@ -227,9 +240,9 @@ class Key(object):
                     self.opts['keysize'])
             return
         if self.opts['list']:
-            self._list_pre()
+            self._list(self.opts['list'])
         elif self.opts['list_all']:
-            self._list_all()
+            self._list('all')
         elif self.opts['print']:
             self._print_key(self.opts['print'])
         elif self.opts['print_all']:
@@ -247,4 +260,4 @@ class Key(object):
         elif self.opts['delete_all']:
             self._delete_all()
         else:
-            self._list_all()
\ No newline at end of file
+            self._list('all')