Fix #325. Prepare for 2.3rc4

The Okta directory connector tests are broken.  I'm raising an issue for @bhunut-adobe to fix them.

Author: adobeDan

RELEASE_NOTES.md

@@ -1,6 +1,6 @@
 # Release Notes for User Sync Tool Version 2.3
 
-These notes apply to v2.3rc3 of 2017-12-10.
+These notes apply to v2.3rc4 of 2018-01-14.
 
 ## New Features
 
@@ -12,16 +12,24 @@ There is a new command-line argument `--connector` for specifying whether to get
 
 [#299](https://github.com/adobe-apiplatform/user-sync.py/issues/299) You can now use an `invocation_defaults` section to specify desired values for command-line arguments in the main configuration file.  This can make it a lot easier to repeat runs with a stable set of arguments, even when running interactively rather than from a script.  The sample main configuration file specifies the configuration parameters to use as well as the syntax for specifying values.  See [the docs](https://adobe-apiplatform.github.io/user-sync.py/en/user-manual/command_parameters.html) for full details.
 
+[#322](https://github.com/adobe-apiplatform/user-sync.py/issues/322), [#319](https://github.com/adobe-apiplatform/user-sync.py/issues/319) As it has been with email, you can now use formatted combinations of ldap/okta attributes for the Adobe-side first name, last name, and country.  (See the sample configuration files for details.)  You can also specify the country code in lower case.
+
 ## Bug Fixes
 
 [#305](https://github.com/adobe-apiplatform/user-sync.py/issues/305) General issues with Okta connector.
 
 [#306](https://github.com/adobe-apiplatform/user-sync.py/issues/306) v2.2.2 crashes if country code not specified.
 
+[#308](https://github.com/adobe-apiplatform/user-sync.py/issues/308) docs are unclear about how to set PEX_ROOT.
+
 [#314](https://github.com/adobe-apiplatform/user-sync.py/issues/314) invocation_defaults section should be optional.
 
 [#315](https://github.com/adobe-apiplatform/user-sync.py/issues/315) Can't specify --user-filter or other string-valued args.
 
+[#324](https://github.com/adobe-apiplatform/user-sync.py/issues/324) Handle LDAP servers with no support for PagedResults.
+
+[#325](https://github.com/adobe-apiplatform/user-sync.py/issues/325) Adding '--process-groups' doesn't override the default.
+
 ## Compatibility with Prior Versions
 
 All configuration and command-line arguments accepted in prior releases work in this release.  The `--users file` argument is still accepted, and is equivalent to (although more limited than) specifying `--connector csv`.

user_sync/config.py

@@ -128,6 +128,10 @@ def load_invocation_options(self):
         else:
             raise AssertionException('Unknown connector type: %s' % connector_type)
 
+        # --process-groups
+        if self.args['process_groups'] is not None:
+            options['process_groups'] = self.args['process_groups']
+
         # --strategy
         if user_sync.helper.normalize_string(self.args['strategy'] or options['strategy']) == 'push':
             options['strategy'] = 'push'
@@ -136,6 +140,10 @@ def load_invocation_options(self):
         if self.args['test_mode'] is not None:
             options['test_mode'] = self.args['test_mode']
 
+        # --update-user-info
+        if self.args['update_user_info'] is not None:
+            options['update_user_info'] = self.args['update_user_info']
+
         # --adobe-only-user-action
         if options['strategy'] == 'push':
             if self.args['adobe_only_user_action']:

user_sync/version.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = '2.3rc3'
+__version__ = '2.3rc4'