Rework the createuser cli using the new arguments parsing module.

Author: albu-diku

mig/server/createuser.py

@@ -44,6 +44,7 @@
 from mig.shared.conf import get_configuration_object
 from mig.shared.defaults import valid_auth_types, keyword_auto
 from mig.shared.gdp.all import ensure_gdp_user
+from mig.shared.minimist import parse_getopt_args, break_apart_legacy_usage
 from mig.shared.pwcrypto import unscramble_password, scramble_password, \
     make_hash
 from mig.shared.serial import load
@@ -75,21 +76,36 @@ def usage(name='createuser.py'):
 or
 %(name)s [OPTIONS] -i CERT_DN
 Where OPTIONS may be one or more of:
-   -a AUTH_TYPE        Prepare account for AUTH_TYPE login (expire, password)
-   -c CONF_FILE        Use CONF_FILE as server configuration
-   -d DB_FILE          Use DB_FILE as user data base file
-   -e EXPIRE           Set user account expiration to EXPIRE (epoch)
-   -f                  Force operations to continue past errors
-   -h                  Show this help
-   -i CERT_DN          Use CERT_DN as user ID despite what other fields suggest
-   -o SHORT_ID         Add SHORT_ID as OpenID alias for user
-   -p PEER_PATTERN     Verify in Peers of existing account matching PEER_PATTERN
-   -r                  Renew user account with existing values
-   -R ROLES            Set user affiliation to ROLES
-   -s SLACK_DAYS       Allow peers even with account expired within SLACK_DAYS
-   -u USER_FILE        Read user information from pickle file
-   -v                  Verbose output
-""" % {'name': name, 'cert_warn': cert_warn})
+""")
+
+name_by_argument = break_apart_legacy_usage("""
+   -a: AUTH_TYPE
+   -c: CONF_FILE
+   -d: DB_FILE
+   -e: EXPIRE
+   -i: CERT_DN
+   -o: SHORT_ID
+   -p: PEER_PATTERN
+   -R: ROLES
+   -s: SLACK_DAYS
+   -u: USER_FILE
+""")
+
+help_by_argument = break_apart_legacy_usage("""
+   -a: Prepare account for AUTH_TYPE login (expire, password)
+   -c: Use CONF_FILE as server configuration
+   -d: Use DB_FILE as user data base file
+   -e: Set user account expiration to EXPIRE (epoch)
+   -f: Force operations to continue past errors
+   -i: Use CERT_DN as user ID despite what other fields suggest
+   -o: Add SHORT_ID as OpenID alias for user
+   -p: Verify in Peers of existing account matching PEER_PATTERN
+   -r: Renew user account with existing values
+   -R: Set user affiliation to ROLES
+   -s: Allow peers even with account expired within SLACK_DAYS
+   -u: Read user information from pickle file
+   -v: Verbose output
+""")
 
 
 def main(args, cwd, db_path=keyword_auto):
@@ -113,7 +129,8 @@ def main(args, cwd, db_path=keyword_auto):
     opt_args = 'a:c:d:e:fhi:o:p:rR:s:u:v'
 
     try:
-        (opts, args) = getopt.getopt(args, opt_args)
+        (opts, args) = parse_getopt_args(args, opt_args,
+        help_by_argument=help_by_argument, name_by_argument=name_by_argument)
     except getopt.GetoptError as err:
         print('Error: ', err.msg)
         usage()
@@ -138,7 +155,7 @@ def main(args, cwd, db_path=keyword_auto):
                     expire = int(raw)
                     parsed = True
                     break
-                except ValueError:
+                except (TypeError, ValueError):
                     print('Failed to parse expire value: %s' % val)
                     sys.exit(1)
         elif opt == '-f':
@@ -170,6 +187,9 @@ def main(args, cwd, db_path=keyword_auto):
             print('Error: %s not supported!' % opt)
             sys.exit(1)
 
+    print("HURRAH")
+    exit(1)
+
     if conf_path and not os.path.isfile(conf_path):
         print('Failed to read configuration file: %s' % conf_path)
         sys.exit(1)