Merge branch 'v2'

Author: adorton-adobe

.changelog/changelog.md

@@ -1,14 +1,15 @@
 | tag | date | title |
 |---|---|---|
-| v2.6.5 | 2021-09-14 | User Sync Tool v2.6.5 |
-
-# Bug Fixes
+| v2.6.5 | 2021-09-16 | User Sync Tool v2.6.5 |
 
 \#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
+* Builds are now made with Python 3.9 on all platforms
+* Separate build for Ubuntu Bionic (18.04)
 
 ---
 

.changelog/latest.md

@@ -1,7 +1,10 @@
 # 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
+* Builds are now made with Python 3.9 on all platforms
+* Separate build for Ubuntu Bionic (18.04)

.github/workflows/package-release.yml

@@ -6,7 +6,56 @@ on:
     - 'v*'
 
 jobs:
-  ubuntu:
+  ubuntu-bionic:
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        include:
+          - extension_support: 0
+            variant_tag: "-noext"
+          - extension_support: 1
+            variant_tag: ""
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
+    - name: Get version tag
+      id: get_version
+      uses: battila7/get-version-action@v2
+    - name: Ubuntu-Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y software-properties-common
+        sudo apt-get install -y build-essential
+        sudo apt-get install -y python3-dev python3-pip python3-virtualenv
+        sudo apt-get install -y pkg-config libssl-dev libdbus-1-dev libdbus-glib-1-dev python-dbus libffi-dev libkrb5-dev
+    - run: |
+        pip install external/okta-0.0.3.1-py2.py3-none-any.whl
+        pip install -e .
+        pip install -e .[test]
+        pip install -e .[setup]
+    - name: Build executable
+      run: make
+      env:
+        UST_EXTENSION: ${{matrix.extension_support}}
+    - name: Test with pytest
+      run: pytest
+    - name: Get build
+      run: |
+        cd dist
+        tar czf "user-sync-${UST_VERSION}${UST_VARIANT_TAG}-ubuntu_bionic.tar.gz" user-sync
+      env:
+        UST_VARIANT_TAG: ${{matrix.variant_tag}}
+        UST_VERSION: ${{ steps.get_version.outputs.version }}
+    - name: Make artifacts
+      uses: actions/upload-artifact@v2
+      with:
+          name: user-sync-artifact
+          path: dist/*.tar.gz
+          retention-days: 5
+  ubuntu-focal:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -36,16 +85,16 @@ jobs:
         pip install -e .
         pip install -e .[test]
         pip install -e .[setup]
-    - name: Make standalone
-      run: make standalone
+    - name: Build executable
+      run: make
       env:
         UST_EXTENSION: ${{matrix.extension_support}}
     - name: Test with pytest
       run: pytest
     - name: Get build
       run: |
         cd dist
-        tar czf "user-sync-${UST_VERSION}${UST_VARIANT_TAG}-ubuntu.tar.gz" user-sync
+        tar czf "user-sync-${UST_VERSION}${UST_VARIANT_TAG}-ubuntu_focal.tar.gz" user-sync
       env:
         UST_VARIANT_TAG: ${{matrix.variant_tag}}
         UST_VERSION: ${{ steps.get_version.outputs.version }}

docs/en/success-guide/index.md

@@ -8,7 +8,7 @@ nav_level: 1
 nav_order: 100
 ---
 
-Version 2.6.5, released 2021-09-14
+Version 2.6.5, released 2021-09-16
 
 This document walks you through the steps needed to understand
 and setup the User Sync Tool.

docs/en/user-manual/index.md

@@ -8,7 +8,7 @@ nav_level: 1
 nav_order: 10
 ---
 
-Version 2.6.5, released 2021-09-14
+Version 2.6.5, released 2021-09-16
 
 This document has all the information you need to get up and
 running with User Sync. It presumes familiarity with the use of

user_sync/rules.py

@@ -535,9 +535,14 @@ def execute_commands(self, command_list, connector):
         # do nothing if we have no commands for this connector
         if not command_list:
             return
+        
+        # Instead of a Commands object, some items in the list might be None
+        # this can happen if country code is invalid, for instance
+        command_list = [c for c in command_list if c is not None]
 
         total_users = len(command_list)
 
+        # split off the last command if we have more than 10, so we can send the signals
         if len(command_list) > 10:
             command_list, last_command = command_list[0:-1], command_list[-1]
             connector.start_sync()
@@ -642,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 [], {}
             self.logger.debug("Processing Adobe-only users...")
             return self.manage_strays(primary_commands, secondary_command_lists, umapi_connectors)
 
@@ -676,7 +681,7 @@ def get_commands(key):
             return user_sync.connector.umapi.Commands(identity_type=id_type, username=username, domain=domain)
 
         # do the secondary umapis first, in case we are deleting user accounts from the primary umapi at the end
-        for umapi_name, umapi_connector in umapi_connectors.get_secondary_connectors().items():
+        for umapi_name in umapi_connectors.get_secondary_connectors():
             secondary_strays = self.get_stray_keys(umapi_name)
             for user_key in primary_strays:
                 if user_key in secondary_strays:
@@ -708,7 +713,6 @@ def get_commands(key):
                         continue
 
         # finish with the primary umapi
-        primary_connector = umapi_connectors.get_primary_connector()
         for user_key in primary_strays:
             commands = get_commands(user_key)
             if disentitle_strays: