resolve merge conflicts

Author: adorton-adobe

.changelog/changelog.md

@@ -1,3 +1,20 @@
+| tag | date | title |
+|---|---|---|
+| v2.7.2 | 2022-03-21 | User Sync Tool v2.7.2 |
+
+\#763 Fix CentOS build
+\#759 Resolve Windows keyring error
+
+---
+
+| tag | date | title |
+|---|---|---|
+| v2.7.1 | 2022-03-14 | User Sync Tool v2.7.1 |
+
+* \#773 Sync signal logic tweaks
+
+---
+
 | tag | date | title |
 |---|---|---|
 | v2.7.0 | 2021-12-02 | User Sync Tool v2.7.0 |

.changelog/latest.md

@@ -1,40 +1,2 @@
-# New Features
-
-**Revamped Sign Sync**
-
-Sign Sync has been overhauled. It is now implemented as a separate workflow with an alternate entrypoint command (`sign-sync`).
-
-Feature summary
-
-- Primary config for Sign Sync is `sign-sync-config.yml`
-- Sign connector config - `connector-sign.yml`
-- All identity sources are supported
-- Sync supports multiple Sign targets
-- Full user lifecycle management for standalone Sign environments
-- Mapping structure to manage Sign group assignments and admin privileges
-- Same logging options as UMAPI sync
-- Sign API data is cached
-- Tool to migrate post-sync config
-
-Architecture changes
-
-- New `engine` module
-- `rules.py` refactored to `engine.umapi`
-- `config.py` refctored to multi-file module
-- Sign API client is top-level (parallel to `user_sync` module)
-- `post_sync` has been removed
-
-Notes:
-
-- User multi-group (UMG) is not supported at this time
-- The Sign client uses Sign API v6
-
-Documentation here - https://adobe-apiplatform.github.io/user-sync.py/en/user-manual/sign_sync.html
-
-**Enhanced ESM Support**
-
-Fixed an issue when syncing to trustee consoles that use Enterprise Storage Model (ESM).
-New config option `uses_business_id` in UMAPI connector config ensures that users are
-handled correctly.
-
-See https://adobe-apiplatform.github.io/user-sync.py/en/user-manual/advanced_configuration.html#esm-secondary-targets
+\#763 Fix CentOS build
+\#759 Resolve Windows keyring error

.github/workflows/package.yml

@@ -53,9 +53,10 @@ jobs:
     - name: Make artifacts
       uses: actions/upload-artifact@v2
       with:
-          name: user-sync-artifact
+          name: ubuntu-bionic
           path: dist/*.tar.gz
-          retention-days: 5
+          retention-days: 30
+
   ubuntu-focal:
     runs-on: ubuntu-latest
     strategy:
@@ -103,10 +104,9 @@ jobs:
     - name: Make artifacts
       uses: actions/upload-artifact@v2
       with:
-          name: user-sync-artifact
+          name: ubuntu-focal
           path: dist/*.tar.gz
-          retention-days: 5
-
+          retention-days: 30
 
   windows:
     runs-on: windows-latest
@@ -143,10 +143,9 @@ jobs:
     - name: Make artifact
       uses: actions/upload-artifact@v2
       with:
-        name: user-sync-artifact
+        name: windows
         path: dist/*.zip
-        retention-days: 5
-
+        retention-days: 30
 
   centos:
     runs-on: ubuntu-latest
@@ -174,7 +173,7 @@ jobs:
           wget https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tgz
           tar xzf Python-3.9.7.tgz
           cd Python-3.9.7
-          ./configure --enable-optimizations --enable-shared
+          ./configure --enable-optimizations --enable-shared --enable-loadable-sqlite-extensions
           make altinstall
           cd ../..
       - name: Build executable
@@ -206,10 +205,9 @@ jobs:
       - name: Make artifact
         uses: actions/upload-artifact@v2
         with:
-          name: user-sync-artifact
+          name: centos
           path: dist/*.tar.gz
-          retention-days: 5
-
+          retention-days: 30
 
   examples:
     runs-on: ubuntu-latest
@@ -221,46 +219,45 @@ jobs:
          zip -r user-sync-examples.zip .
     - uses: actions/upload-artifact@v2
       with:
-        name: user-sync-artifact
+        name: examples
         path: examples/*.zip
-        retention-days: 5
+        retention-days: 30
     - name: user-sync.tar.gz
       run: |
          tar -czvf "user-sync-examples.tar.gz" examples
     - uses: actions/upload-artifact@v2
       with:
-        name: user-sync-artifact
+        name: examples
         path: user-sync-examples.tar.gz
-        retention-days: 5
+        retention-days: 30
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [centos, ubuntu-bionic, ubuntu-focal, examples, windows]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: User Sync Tool ${{ github.ref }}
+        body_path: .changelog/latest.md
+        draft: false
+        prerelease: false
 
-#  release:
-#    runs-on: ubuntu-latest
-#    needs: [ubuntu,windows, centos, examples]
-#    steps:
-#    - uses: actions/checkout@v2
-#    - name: Create Release
-#      id: create_release
-#      uses: actions/create-release@v1
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        tag_name: ${{ github.ref }}
-#        release_name: user-sync ${{ github.ref }}
-#        body_path: .changelog/latest.md
-#        draft: true
-#        prerelease: false
-#
-#  upload-assets:
-#    needs: release
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/download-artifact@v2
-#    - name: Get version tag
-#      id: get_version
-#      uses: battila7/get-version-action@v2
-#    - run: ls -R
-#    - uses: fnkr/github-action-ghr@v1
-#      if: startsWith(github.ref, 'refs/tags/')
-#      env:
-#        GHR_PATH: user-sync-artifact/
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  upload-assets:
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/download-artifact@v2
+    - name: Get version tag
+      id: get_version
+      uses: battila7/get-version-action@v2
+    - uses: AButler/[email protected]
+      with:
+        files: 'examples/*;ubuntu-bionic/*;ubuntu-focal/*;centos/*'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        release-tag: ${{ steps.get_version.outputs.version }}

README.md

@@ -8,7 +8,7 @@ Tool are to streamline the process of named user deployment and automate user ma
 This application is open source, maintained by Adobe, and distributed under the terms
 of the OSI-approved MIT license.  See the LICENSE file for details.
 
-Copyright (c) 2016-2020 Adobe Inc.
+Copyright (c) 2016-2022 Adobe Inc.
 
 ## Documentation