Merge branch 'v2'

Author: adorton-adobe

user_sync/config.py

@@ -173,8 +173,10 @@ def load_invocation_options(self):
 
         # --users and --adobe-only-user-list conflict with each other, so we need to disambiguate.
         # Argument specifications override configuration options, so you must have one or the other
-        # either as an argument or as a configured default.
-        if self.args['users'] and self.args['adobe_only_user_list']:
+        # either as an argument or as a configured default.  For a complete check, we need to compare against
+        # BOTH the args values AND the options values (in order to catch the invocation defaults).
+        if (self.args['users'] or (options['users'] and options['users'] != self.invocation_defaults['users'])) \
+                and (self.args['adobe_only_user_list'] or options['adobe_only_user_list']):
             # specifying both --users and --adobe-only-user-list is an error
             raise AssertionException('You cannot specify both a --users arg and an --adobe-only-user-list arg')
         elif self.args['users']:
@@ -188,20 +190,12 @@ def load_invocation_options(self):
                 raise AssertionException('You cannot specify --adobe-only-user-list when using "push" strategy')
             users_spec = None
             stray_list_input_path = self.args['adobe_only_user_list']
-
-        # Check both that options['users'] exists, AND that it is not the default value before checking against
-        # the adobe_only_user_list parameter -  otherwise, defaults cause exception to be thrown unconditionally when
-        # the user list option is specified
-        elif (options['users'] and options['users'] != self.invocation_defaults['users']) and options['adobe_only_user_list']:
-            raise AssertionException('You cannot configure both a default "users" option (%s) '
-                                     'and a default "adobe-only-user-list" option (%s)' %
-                                     (' '.join(options['users']), options['adobe_only_user_list']))
-        elif options['users']:
-            users_spec = options['users']
-            stray_list_input_path = None
         elif options['adobe_only_user_list']:
             users_spec = None
             stray_list_input_path = options['adobe_only_user_list']
+        elif options['users']:
+            users_spec = options['users']
+            stray_list_input_path = None            
         else:
             raise AssertionException('You must specify either a "users" option or an "adobe-only-user-list" option.')
 
@@ -301,7 +295,7 @@ def get_directory_connector_module_name(self):
         """
         :rtype str
         """
-        if self.invocation_options['stray_list_input_path']:
+        if self.invocation_options.get('stray_list_input_path', None):
             return None
         connector_type = self.invocation_options.get('directory_connector_type')
         if connector_type: