Define a user payload using the argument bundling code.

Update the createuser command line interface to operate based on these bundles
and add tests covering the bundle packaged by the top-level main method which
is passed into the internal logic of the call.

Author: albu-diku

mig/server/createuser.py

@@ -40,7 +40,8 @@
 import time
 
 from mig.shared.accountstate import default_account_expire
-from mig.shared.arguments import parse_getopt_args, break_apart_legacy_usage
+from mig.shared.arguments import parse_getopt_args, break_apart_legacy_usage, \
+    ArgumentBundleDefinition
 from mig.shared.base import fill_distinguished_name, fill_user, canonical_user
 from mig.shared.conf import get_configuration_object
 from mig.shared.defaults import valid_auth_types, keyword_auto
@@ -107,8 +108,26 @@ def usage(name='createuser.py'):
    -v: Verbose output
 """)
 
+def _is_not_none(value):
+    """value is not None"""
+    return value is not None
 
-def main(args, cwd, db_path=keyword_auto):
+def _is_string_and_non_empty(value):
+    """value is a non-empty string"""
+    return isinstance(value, str) and len(value) > 0
+
+_BUNDLE_DEFINITION = ArgumentBundleDefinition('UserArguments', [
+    (None, 'full_name', _is_string_and_non_empty),
+    (None, 'organization', _is_string_and_non_empty),
+    (None, 'state', _is_string_and_non_empty),
+    (None, 'country', _is_string_and_non_empty),
+    (None, 'email', _is_string_and_non_empty),
+    (None, 'comment', _is_string_and_non_empty),
+    (None, 'password', _is_string_and_non_empty),
+])
+
+
+def main(_main, args, cwd, db_path=keyword_auto):
     conf_path = None
     auth_type = 'custom'
     expire = None
@@ -200,7 +219,9 @@ def main(args, cwd, db_path=keyword_auto):
             if verbose:
                 print('using configuration from MIG_CONF (or default)')
 
-    ret = _main(None, args,
+    bundle = _BUNDLE_DEFINITION(*args)
+
+    ret = _main(None, bundle,
           conf_path=conf_path,
           db_path=db_path,
           expire=expire,
@@ -218,6 +239,9 @@ def main(args, cwd, db_path=keyword_auto):
           hash_password=hash_password
           )
 
+    if ret is None:
+        return
+
     if ret == errno.ENOTSUP:
         usage()
         sys.exit(1)
@@ -397,4 +421,4 @@ def _main(configuration, args,
 
 if __name__ == '__main__':
     (args, cwd, db_path) = init_user_adm()
-    main(args, cwd, db_path=db_path)
+    main(_main, args, cwd, db_path=db_path)

tests/test_mig_server_createuser.py

@@ -36,7 +36,8 @@
 from tests.support import PY2, MIG_BASE, TEST_OUTPUT_DIR, MigTestCase, testmain
 from tests.support.picklesupp import PickleAssertMixin
 
-from mig.server.createuser import _main as createuser
+from mig.shared.arguments import ArgumentBundle
+from mig.server.createuser import _main as createuser, main as createuser_main
 from mig.shared.useradm import _USERADM_CONFIG_DIR_KEYS
 
 
@@ -58,6 +59,30 @@ def before_each(self):
     def _provide_configuration(self):
         return 'testconfig'
 
+    def test_argument_conversion(self):
+        args = [
+            "Test User",
+            "Test Org",
+            "NA",
+            "DK",
+            "user@example.com",
+            "This is the create comment",
+            "password"
+        ]
+        def _instrumented_main(*args, **kwargs):
+            _instrumented_main.calls.append((args, kwargs))
+            return None
+        _instrumented_main.calls = []
+
+        createuser_main(_instrumented_main, args, TEST_OUTPUT_DIR)
+
+        self.assertEqual(len(_instrumented_main.calls), 1)
+        thecall_args = _instrumented_main.calls[0][0]
+        self.assertEqual(len(thecall_args), 2)
+        maybe_argument_bundle = thecall_args[1]
+        self.assertIsInstance(maybe_argument_bundle, ArgumentBundle)
+        self.assertEqual(maybe_argument_bundle.name, 'UserArguments')
+
     def test_user_db_is_created_when_absent(self):
         args = [
             "Test User",