Merge branch 'v2'

Author: adorton-adobe

.build/.appveyor/build.ps1

@@ -23,7 +23,7 @@ cp dist\user-sync.exe release\
 cd release
 7z a "user-sync-${env:APPVEYOR_REPO_TAG_NAME}${env:BUILD_EDITION}-win64.zip" user-sync.exe
 cd ..
-7z a -ttar -r release\examples.tar examples
+7z a -ttar release\examples.tar examples
 7z a -tgzip release\examples.tar.gz release\examples.tar
-7z a -r release\examples.zip examples\
+7z a release\examples.zip examples\
 dir release

.build/.travis/build-py36-centos.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-virtualenv venv -p /usr/bin/python3.6
+python3 -m venv venv
 source venv/bin/activate
 python -m pip install --upgrade pip
 pip install external/okta-0.0.3.1-py2.py3-none-any.whl

.build/.travis/install-centos.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
+yum update -y
 yum groupinstall -y "Development Tools"
-yum install -y epel-release
-yum install -y https://centos7.iuscommunity.org/ius-release.rpm
-yum install -y python36u-devel python36u-pip python36u-virtualenv
-yum install -y python-devel python-pip python-virtualenv
+yum install -y python3 python3-devel
 yum install -y pkgconfig openssl-devel dbus-glib-devel dbus-python libffi-devel

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Description**
+A clear and concise description of the issue.
+
+**Steps to reproduce**
+* Relevant config options
+* Command-line options used
+* Specific details around identity source, group mapping, etc.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment**
+ - UST version:
+ - OS type and version:
+ - Any other relevant info:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+Link to any relevant bugs (e.g. "Relates to bug #xxx")
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/general-question.md

@@ -0,0 +1,10 @@
+---
+name: General question
+about: Issues that are neither bugs nor feature requests
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+<!-- Don't forget to update the PR title to concisely describe the proposed changes -->
+
+## Summary
+* 
+
+## Testing Steps
+* 
+
+<!-- Link to all bugs that this PR fixes, one link per line -->
+<!-- If there is no related issue, please create one and link it here before submitting the PR -->
+
+Fixes #xxx

.gitignore

@@ -105,6 +105,7 @@ user_sync/resources/*
 !user_sync/resources/__init__.py
 !user_sync/resources/README.md
 !user_sync/resources/manual_url
+!user_sync/resources/shell_scripts
 .DS_Store
 !user_sync/resources/default_flags.cfg
 test_config/

README.md

@@ -27,7 +27,7 @@ The [User Sync Documentation](https://adobe-apiplatform.github.io/user-sync.py/)
 
 ## Installation and Use
 
-The connector is packaged as a self-contained executable.  See the [latest release page](https://github.com/adobe-apiplatform/user-sync.py/releases/latest)
+The tool is packaged as a self-contained executable.  See the [latest release page](https://github.com/adobe-apiplatform/user-sync.py/releases/latest)
 to get the latest build for your platform. Releases are distributed as archives (`.zip` or `.tar.gz`). Each release file
 contains the UST executable.
 

docs/en/user-manual/configuring_user_sync_tool.md

@@ -124,9 +124,9 @@ editor, and enter these values in the “enterprise” section:
 ```YAML
 enterprise:
   org_id: "Organization ID goes here"
-  api_key: "API key goes here"
+  client_id: "Client ID goes here"
   client_secret: "Client Secret goes here"
-  tech_acct: "Tech Account ID goes here"
+  tech_acct_id: "Tech Account ID goes here"
   priv_key_path: "Path to Private Certificate goes here"
 ```
 
@@ -506,9 +506,9 @@ server:
 
 enterprise:
   org_id: "Org ID goes here"
-  api_key: "API key goes here"
+  client_id: "Client ID goes here"
   client_secret: "Client secret goes here"
-  tech_acct: "Tech account ID goes here"
+  tech_acct_id: "Tech account ID goes here"
   priv_key_path: "Path to private.key goes here"
   # priv_key_data: "actual key data goes here" # This is an alternative to priv_key_path
 ```