Merge branch 'feature/adobe-only-max-count' into v2

Author: adorton-adobe

examples/config files - basic/user-sync-config.yml

@@ -79,6 +79,7 @@ directory_users:
 # See https://adobe-apiplatform.github.io/user-sync.py/en/user-manual/configuring_user_sync_tool.html#limits-config
 limits:
   max_adobe_only_users: 200
+  # group_removals_only: True
 
 # --- Logging Options ---
 # Options that govern logging to the terminal (console) and/or log file(s)

user_sync/config/user_sync.py

@@ -531,6 +531,9 @@ def get_engine_options(self):
         limits_config = self.main_config.get_dict_config('limits')
         max_missing = limits_config.get_value('max_adobe_only_users', (int, str), False)
         options['max_adobe_only_users'] = validate_max_limit_config(max_missing)
+        group_removals_only = limits_config.get_value('group_removals_only', bool, True)
+        if group_removals_only is not None:
+            options['group_removals_only'] = group_removals_only
 
         # now get the directory extension, if any
         extension_config = self.get_directory_extension_options()

user_sync/engine/umapi.py

@@ -49,6 +49,7 @@ class RuleProcessor(object):
         'exclude_users': [],
         'extended_attributes': set(),
         'extension_enabled': False,
+        'group_removals_only': False,
         'process_groups': False,
         'max_adobe_only_users': 200,
         'new_account_type': user_sync.identity_type.ENTERPRISE_IDENTITY_TYPE,
@@ -611,7 +612,10 @@ def is_selected_user_key(self, user_key):
         return True
 
     def get_stray_keys(self, umapi_name=PRIMARY_TARGET_NAME):
-        return self.stray_key_map.get(umapi_name, {})
+        key_map = self.stray_key_map.get(umapi_name, {})
+        if self.options['group_removals_only']:
+            return {key: groups for key, groups in key_map.items() if groups}
+        return key_map
 
     def add_stray(self, umapi_name, user_key, removed_groups=None):
         """