Skip to content

Commit df6d2d8

Browse files
committed
Fix #175: users doesn't default to all, instead no users are read
* This was introduced when we first "defaulted" the `--users` argument (a long time ago). * The fix is to act as if *no* `--users` argument is `--users` by itself, because what the defaulting code really did was to default the argument to `all`.
1 parent c127325 commit df6d2d8

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

user_sync/app.py

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -233,25 +233,24 @@ def create_config_loader_options(args):
233233

234234
# --users
235235
users_args = args.users
236-
if users_args is not None:
237-
users_action = None if len(users_args) == 0 else user_sync.helper.normalize_string(users_args.pop(0))
238-
if (users_action == None or users_action == 'all'):
239-
config_options['directory_connector_module_name'] = 'user_sync.connector.directory_ldap'
240-
elif (users_action == 'file'):
241-
if len(users_args) == 0:
242-
raise AssertionException('Missing file path for --users %s [file_path]' % users_action)
243-
config_options['directory_connector_module_name'] = 'user_sync.connector.directory_csv'
244-
config_options['directory_connector_overridden_options'] = {'file_path': users_args.pop(0)}
245-
elif (users_action == 'mapped'):
246-
config_options['directory_connector_module_name'] = 'user_sync.connector.directory_ldap'
247-
config_options['directory_group_mapped'] = True
248-
elif (users_action == 'group'):
249-
if len(users_args) == 0:
250-
raise AssertionException('Missing groups for --users %s [groups]' % users_action)
251-
config_options['directory_connector_module_name'] = 'user_sync.connector.directory_ldap'
252-
config_options['directory_group_filter'] = users_args.pop(0).split(',')
253-
else:
254-
raise AssertionException('Unknown argument --users %s' % users_action)
236+
users_action = None if not users_args else user_sync.helper.normalize_string(users_args.pop(0))
237+
if (users_action == None or users_action == 'all'):
238+
config_options['directory_connector_module_name'] = 'user_sync.connector.directory_ldap'
239+
elif (users_action == 'file'):
240+
if len(users_args) == 0:
241+
raise AssertionException('Missing file path for --users %s [file_path]' % users_action)
242+
config_options['directory_connector_module_name'] = 'user_sync.connector.directory_csv'
243+
config_options['directory_connector_overridden_options'] = {'file_path': users_args.pop(0)}
244+
elif (users_action == 'mapped'):
245+
config_options['directory_connector_module_name'] = 'user_sync.connector.directory_ldap'
246+
config_options['directory_group_mapped'] = True
247+
elif (users_action == 'group'):
248+
if len(users_args) == 0:
249+
raise AssertionException('Missing groups for --users %s [groups]' % users_action)
250+
config_options['directory_connector_module_name'] = 'user_sync.connector.directory_ldap'
251+
config_options['directory_group_filter'] = users_args.pop(0).split(',')
252+
else:
253+
raise AssertionException('Unknown argument --users %s' % users_action)
255254

256255
username_filter_pattern = args.username_filter_pattern
257256
if (username_filter_pattern):

0 commit comments

Comments
 (0)