Password prompt if key is not specified.

bin/swauth-add-account

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from getpass import getpass
 import gettext
 from optparse import OptionParser
 from os.path import basename
@@ -46,6 +47,8 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args(args)
     if len(args) != 1:
         parser.parse_args(['-h'])
+    if not options.admin_key:
+        options.admin_key = getpass()
     account = args[0]
     parsed = urlparse(options.admin_url)
     if parsed.scheme not in ('http', 'https'):

bin/swauth-add-user

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from getpass import getpass
 import gettext
 from optparse import OptionParser
 from os.path import basename
@@ -56,6 +57,8 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args(args)
     if len(args) != 3:
         parser.parse_args(['-h'])
+    if not options.admin_key:
+        options.admin_key = getpass()
     account, user, password = args
     parsed = urlparse(options.admin_url)
     if parsed.scheme not in ('http', 'https'):

bin/swauth-cleanup-tokens

@@ -18,6 +18,7 @@ try:
     import simplejson as json
 except ImportError:
     import json
+from getpass import getpass
 import gettext
 import re
 from datetime import datetime, timedelta
@@ -56,6 +57,8 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args(args)
     if len(args) != 0:
         parser.parse_args(['-h'])
+    if not options.admin_key:
+        options.admin_key = getpass()
     options.admin_url = options.admin_url.rstrip('/')
     if not options.admin_url.endswith('/v1.0'):
         options.admin_url += '/v1.0'

bin/swauth-delete-account

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from getpass import getpass
 import gettext
 from optparse import OptionParser
 from os.path import basename
@@ -40,6 +41,8 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args(args)
     if len(args) != 1:
         parser.parse_args(['-h'])
+    if not options.admin_key:
+        options.admin_key = getpass()
     account = args[0]
     parsed = urlparse(options.admin_url)
     if parsed.scheme not in ('http', 'https'):

bin/swauth-delete-user

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from getpass import getpass
 import gettext
 from optparse import OptionParser
 from os.path import basename
@@ -40,6 +41,8 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args(args)
     if len(args) != 2:
         parser.parse_args(['-h'])
+    if not options.admin_key:
+        options.admin_key = getpass()
     account, user = args
     parsed = urlparse(options.admin_url)
     if parsed.scheme not in ('http', 'https'):

bin/swauth-list

@@ -18,6 +18,7 @@ try:
     import simplejson as json
 except ImportError:
     import json
+from getpass import getpass
 import gettext
 from optparse import OptionParser
 from os.path import basename
@@ -60,6 +61,8 @@ If the [user] is '.groups', the active groups for the account will be listed.
     (options, args) = parser.parse_args(args)
     if len(args) > 2:
         parser.parse_args(['-h'])
+    if not options.admin_key:
+        options.admin_key = getpass()
     parsed = urlparse(options.admin_url)
     if parsed.scheme not in ('http', 'https'):
         raise Exception('Cannot handle protocol scheme %s for url %s' %

bin/swauth-prep

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from getpass import getpass
 import gettext
 from optparse import OptionParser
 from os.path import basename
@@ -40,6 +41,8 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args(args)
     if args:
         parser.parse_args(['-h'])
+    if not options.admin_key:
+        options.admin_key = getpass()
     parsed = urlparse(options.admin_url)
     if parsed.scheme not in ('http', 'https'):
         raise Exception('Cannot handle protocol scheme %s for url %s' %

bin/swauth-set-account-service

@@ -18,6 +18,7 @@ try:
     import simplejson as json
 except ImportError:
     import json
+from getpass import getpass
 import gettext
 from optparse import OptionParser
 from os.path import basename
@@ -50,6 +51,8 @@ Example: %prog -K swauthkey test storage local http://127.0.0.1:8080/v1/AUTH_018
     (options, args) = parser.parse_args(args)
     if len(args) != 4:
         parser.parse_args(['-h'])
+    if not options.admin_key:
+        options.admin_key = getpass()
     account, service, name, url = args
     parsed = urlparse(options.admin_url)
     if parsed.scheme not in ('http', 'https'):