Skip to content

Commit af6c8dd

Browse files
ensembledeanwadobeDan
authored andcommitted
Issue-46: print English description instead of variable name for action summary
1 parent 20c6737 commit af6c8dd

File tree

1 file changed

+23
-5
lines changed

1 file changed

+23
-5
lines changed

user_sync/rules.py

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,26 @@ def __init__(self, caller_options):
7575
'number_of_users_created': 0,
7676
'number_of_users_updated': 0,
7777
'number_of_users_with_updated_groups': 0,
78-
'number_of_users_removed_from_mapped_group': 0,
78+
'number_of_users_removed_from_mapped_groups': 0,
7979
'number_of_users_removed': 0,
8080
'number_of_users_deleted': 0,
8181
'number_of_users_with_no_changes': 0,
8282
}
83+
# English text description for action summary log.
84+
# The action summary will be shown the same order as they are defined in the list
85+
self.action_summary_descriptions = [
86+
['total_number_of_adobe_users', 'Total number of Adobe users'],
87+
['number_of_adobe_users_excluded', 'Number of Adobe users excluded'],
88+
['total_number_of_directory_users', 'Total number of directory users'],
89+
['number_of_directory_users_selected', 'Number of directory users selected'],
90+
['number_of_users_created', 'Number of users created'],
91+
['number_of_users_updated', 'Number of users updated'],
92+
['number_of_users_removed', 'Number of users removed'],
93+
['number_of_users_deleted', 'Number of users deleted'],
94+
['number_of_users_with_updated_groups', 'Number of users with updated groups'],
95+
['number_of_users_removed_from_mapped_groups', 'Number of users removed from mapped groups'],
96+
['number_of_users_with_no_changes', 'Number of users with no changes'],
97+
]
8398

8499
# save away the exclude options for use in filtering
85100
self.exclude_groups = self.normalize_groups(options['exclude_groups'])
@@ -174,8 +189,11 @@ def log_action_summary(self):
174189
# find out the number of users that have no changes
175190
self.action_summary['number_of_users_with_no_changes'] = self.action_summary['total_number_of_adobe_users'] - self.action_summary['number_of_users_updated'] - self.action_summary['number_of_users_removed'] - self.action_summary['number_of_users_deleted']
176191
logger.info('------------- Action Summary -------------')
177-
for action_name, action_count in self.action_summary.iteritems():
178-
logger.info(' %s: %s', action_name, action_count)
192+
for action_description in self.action_summary_descriptions:
193+
action = action_description[0]
194+
description = action_description[1]
195+
action_count = self.action_summary[action]
196+
logger.info(' %s: %s', description, action_count)
179197
logger.info('------------------------------------------')
180198

181199
def will_manage_groups(self):
@@ -343,7 +361,7 @@ def is_selected_user_key(self, user_key):
343361
if (search_result == None):
344362
return False
345363
return True
346-
364+
347365
def process_orphaned_dashboard_users(self):
348366
orphan_user_key_list = self.orphan_user_key_list
349367

@@ -591,7 +609,7 @@ def update_dashboard_user(self, organization_info, user_key, dashboard_connector
591609
if groups_to_add and len(groups_to_add) > 0:
592610
self.action_summary['number_of_users_with_updated_groups'] += 1
593611
if groups_to_remove and len(groups_to_remove) > 0:
594-
self.action_summary['number_of_users_removed_from_mapped_group'] += 1
612+
self.action_summary['number_of_users_removed_from_mapped_groups'] += 1
595613

596614
def try_and_update_dashboard_user(self, organization_info, user_key, dashboard_connector, attributes_to_update = None, groups_to_add = None, groups_to_remove = None, dashboard_user = None):
597615
'''

0 commit comments

Comments
 (0)