Merge branch 'v2'

Author: adorton-adobe

.changelog/changelog.md

@@ -1,3 +1,13 @@
+| tag | date | title |
+|---|---|---|
+| v2.6.6 | 2021-11-04 | User Sync Tool v2.6.6 |
+
+# Bug Fixes
+
+\#745 - Management actions halted when max Adobe-only limit exceeded
+
+---
+
 | tag | date | title |
 |---|---|---|
 | v2.6.5 | 2021-09-16 | User Sync Tool v2.6.5 |

.changelog/latest.md

@@ -1,10 +1,3 @@
 # Bug Fixes
 
-\#728 - Fix keyring misidentification issue
-\#731 - None-type issue with user commands
-\#732 - Executable fails on Ubuntu 18.04 (bionic)
-
-# Build Information
-
-* Builds are now made with Python 3.9 on all platforms
-* Separate build for Ubuntu Bionic (18.04)
+\#745 - Management actions halted when max Adobe-only limit exceeded

README.md

@@ -22,7 +22,7 @@ The [User Sync Documentation](https://adobe-apiplatform.github.io/user-sync.py/)
 
 * Windows, Ubuntu or CentOS server/VM (if using a [pre-built release](https://github.com/adobe-apiplatform/user-sync.py/releases/latest))
 * At least 4GB of available RAM
-* Service account for the User Management API (see the [official docs](https://www.adobe.io/apis/experienceplatform/console/docs.html#!AdobeDocs/adobeio-console/master/integrations.md))
+* Service account for the User Management API (see the [official docs](https://www.adobe.io/authentication/auth-methods.html#!AdobeDocs/adobeio-auth/master/AuthenticationOverview/ServiceAccountIntegration.md))
 * Public/private keys for service account (see the [official docs](https://www.adobe.io/authentication/auth-methods.html#!AdobeDocs/adobeio-auth/master/JWT/JWTCertificate.md))
 
 ## Installation and Use
@@ -54,7 +54,7 @@ The general procedure to build the User Sync Tool is the same across platforms.
 prerequisites that must be met before following these instructions. Refer to the notes for your platform and return here
 to learn how to build the Sync Tool from source.
 
-**NOTE:** Python 3.6 is required on all platforms.
+**NOTE:** Python 3.9 is required on all platforms.
 
 1. Clone this repository `git clone https://github.com/adobe-apiplatform/user-sync.py.git`
 2. Create a new Python 3.6 virtual environment `python -m venv /path/to/venv` (note: your system may prompt you to install
@@ -79,12 +79,12 @@ On Linux, many of the Sync Tool's dependencies are built from source and contain
 languages. For this reason, it is necessary to install some system packages and libraries.
 
 ```bash
-sudo apt-get update
-sudo apt-get install -y software-properties-common
-sudo apt-get install -y build-essential
-sudo apt-get install -y python-dev python-pip python-virtualenv
-sudo apt-get install -y pkg-config libssl-dev libdbus-1-dev libdbus-glib-1-dev python-dbus libffi-dev libkrb5-dev
-sudo apt-get install -y python3-dev python3-venv
+sudo apt-get update && \
+sudo apt-get install -y \
+        software-properties-common build-essential \
+        pkg-config libssl-dev libdbus-1-dev \
+        libdbus-glib-1-dev python-dbus \
+        libffi-dev libkrb5-dev python3.9-dev python3-venv
 ```
 
 ### CentOS and other RedHat variants

docs/Gemfile.lock

@@ -204,17 +204,17 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.6.1)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.11.4)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.11.4-x64-mingw32)
+    nokogiri (1.12.5-x64-mingw32)
       racc (~> 1.4)
     octokit (4.20.0)
       faraday (>= 0.9)

tests/conftest.py

@@ -33,14 +33,14 @@ def _cli_args(args_in):
 
 @pytest.fixture
 def private_key(fixture_dir, tmpdir):
-    shutil.copy(os.path.join(fixture_dir, 'test_private.key'), tmpdir.dirname)
-    return os.path.join(tmpdir.dirname, 'test_private.key')
+    shutil.copy(os.path.join(fixture_dir, 'test_private.key'), tmpdir)
+    return os.path.join(tmpdir, 'test_private.key')
 
 
 @pytest.fixture
 def public_cert(fixture_dir, tmpdir):
-    shutil.copy(os.path.join(fixture_dir, 'test_cert.crt'), tmpdir.dirname)
-    return os.path.join(tmpdir.dirname, 'test_cert.crt')
+    shutil.copy(os.path.join(fixture_dir, 'test_cert.crt'), tmpdir)
+    return os.path.join(tmpdir, 'test_cert.crt')
 
 @pytest.fixture
 def root_config_file(fixture_dir):
@@ -80,4 +80,4 @@ def _resource_file(dirname, filename):
         filepath = os.path.join(dirname, filename)
         open(filepath, 'a').close()
         return filepath
-    return _resource_file
+    return _resource_file

tests/test_encryption.py

@@ -9,8 +9,8 @@
 
 @pytest.fixture
 def encrypted_key(fixture_dir, tmpdir):
-    shutil.copy(os.path.join(fixture_dir, 'encrypted.key'), tmpdir.dirname)
-    return os.path.join(tmpdir.dirname, 'encrypted.key')
+    shutil.copy(os.path.join(fixture_dir, 'encrypted.key'), tmpdir)
+    return os.path.join(tmpdir, 'encrypted.key')
 
 
 def test_encrypt_file(private_key, encrypted_key):

user_sync/config.py

@@ -978,7 +978,7 @@ def load_from_yaml(cls, filename, path_keys):
         cls.filename = os.path.split(cls.filepath)[1]
         cls.dirpath = os.path.dirname(cls.filepath)
         try:
-            with open(filename, 'rb', 1) as input_file:
+            with open(filename, 'rb', 0) as input_file:
                 byte_string = input_file.read()
                 yml = yaml.safe_load(byte_string.decode(cls.config_encoding, 'strict'))
         except IOError as e:

user_sync/rules.py

@@ -647,7 +647,7 @@ def process_strays(self, primary_commands, secondary_command_lists, umapi_connec
                 self.logger.critical('Unable to process Adobe-only users, as their count (%s) is larger '
                                      'than the max_adobe_only_users setting (%s)', stray_count, max_missing_option)
                 self.action_summary['primary_strays_processed'] = 0
-                return [], {}
+                return primary_commands, secondary_command_lists
             self.logger.debug("Processing Adobe-only users...")
             return self.manage_strays(primary_commands, secondary_command_lists, umapi_connectors)
 

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.6.5'
+__version__ = '2.6.6'