Fix merge conflicts

Author: jdrew82

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,43 +1,26 @@
 ---
 name: 🐛 Bug Report
-<<<<<<< HEAD
-about: Report a reproducible bug in the current release of DiffSync
----
-
-### Environment
-* DiffSync version:  <!-- Example: 1.0.0 -->
-* Python version  <!-- Example: 3.7.7 -->
-
-<!-- What happened instead? -->
-### Observed Behavior
-=======
 about: Report a reproducible bug in the current release of diffsync
 ---
 
 ### Environment
 * Python version:  <!-- Example: 3.10 -->
-* diffsync version:  <!-- Example: 1.0.0 -->
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
+* DiffSync version:  <!-- Example: 1.0.0 -->
 
 <!-- What did you expect to happen? -->
-### Expected Behavior
 
-<<<<<<< HEAD
-=======
+### Expected Behavior
 
 <!-- What happened instead? -->
+
 ### Observed Behavior
 
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 <!--
     Describe in detail the exact steps that someone else can take to reproduce
     this bug using the current release.
 -->
+
 ### Steps to Reproduce
 1.
 2.
-<<<<<<< HEAD
-3.
-=======
 3.
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,36 +1,22 @@
 ---
 name: ✨ Feature Request
 about: Propose a new feature or enhancement
-<<<<<<< HEAD
 ---
 
 ### Environment
-* DiffSync version:  <!-- Example: 1.0.0 -->
-=======
-
----
 
-### Environment
-* diffsync version:  <!-- Example: 1.0.0 -->
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
+* DiffSync version:  <!-- Example: 1.0.0 -->
 
 <!--
     Describe in detail the new functionality you are proposing.
 -->
-### Proposed Functionality
 
-<<<<<<< HEAD
+### Proposed Functionality
 
-=======
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 <!--
     Convey an example use case for your proposed feature. Write from the
     perspective of a user who would benefit from the proposed
     functionality and describe how.
-<<<<<<< HEAD
 -->
-=======
---->
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
-### Use Case
 
+### Use Case

.github/workflows/ci.yml

@@ -1,270 +1,13 @@
 ---
 name: "CI"
-concurrency:  # Cancel any existing runs of this workflow for this same PR
+concurrency: # Cancel any existing runs of this workflow for this same PR
   group: "${{ github.workflow }}-${{ github.ref }}"
   cancel-in-progress: true
-<<<<<<< HEAD
-on:  # yamllint disable
-=======
-on:  # yamllint disable-line rule:truthy rule:comments
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
+on: # yamllint disable-line rule:truthy rule:comments
   push:
     branches:
       - "main"
       - "develop"
-<<<<<<< HEAD
-    tags:
-      - "v*"
-  pull_request: ~
-jobs:
-  validate_renovate:
-    runs-on: "ubuntu-24.04"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Validate renovate configuration"
-        uses: "rinchsan/[email protected]"
-        with:
-          pattern: "renovate.json"
-  black:
-    runs-on: "ubuntu-24.04"
-    env:
-      INVOKE_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v6"
-        with:
-          poetry-version: "1.8.5"
-      - name: "Linting: black"
-        run: "poetry run invoke black"
-  bandit:
-    runs-on: "ubuntu-24.04"
-    env:
-      INVOKE_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v6"
-        with:
-          poetry-version: "1.8.5"
-      - name: "Linting: bandit"
-        run: "poetry run invoke bandit"
-    needs:
-      - "black"
-  pydocstyle:
-    runs-on: "ubuntu-24.04"
-    env:
-      INVOKE_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v6"
-        with:
-          poetry-version: "1.8.5"
-      - name: "Linting: pydocstyle"
-        run: "poetry run invoke pydocstyle"
-    needs:
-      - "black"
-  flake8:
-    runs-on: "ubuntu-24.04"
-    env:
-      INVOKE_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v6"
-        with:
-          poetry-version: "1.8.5"
-      - name: "Linting: flake8"
-        run: "poetry run invoke flake8"
-    needs:
-      - "black"
-  mypy:
-    runs-on: "ubuntu-24.04"
-    env:
-      INVOKE_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v6"
-        with:
-          poetry-version: "1.8.5"
-      - name: "Linting: mypy"
-        run: "poetry run invoke mypy"
-    needs:
-      - "black"
-  yamllint:
-    runs-on: "ubuntu-24.04"
-    env:
-      INVOKE_LOCAL: "True"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v6"
-        with:
-          poetry-version: "1.8.5"
-      - name: "Linting: yamllint"
-        run: "poetry run invoke yamllint"
-    needs:
-      - "black"
-  build:
-    runs-on: "ubuntu-24.04"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v6"
-        with:
-          poetry-version: "1.8.5"
-      - name: "Build Container"
-        run: "poetry run invoke build"
-    needs:
-      - "bandit"
-      - "pydocstyle"
-      - "flake8"
-      - "yamllint"
-      - "mypy"
-  pylint:
-    runs-on: "ubuntu-24.04"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@v6"
-        with:
-          poetry-version: "1.8.5"
-      - name: "Build Container"
-        run: "poetry run invoke build"
-      - name: "Linting: Pylint"
-        run: "poetry run invoke pylint"
-    needs:
-      - "build"
-  unittest:
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-        poetry-version: ["1.8.5"]
-    runs-on: "ubuntu-24.04"
-    env:
-      PYTHON_VER: "${{ matrix.python-version }}"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Setup environment"
-        uses: "networktocode/gh-action-setup-poetry-environment@3ea5d3ecf382cdcb0c74d4c0ff0629d95fce63c7"
-        env:
-          POETRY_VERSION: 1.8.5
-        with:
-          python-version: "${{ matrix.python-version }}"
-          poetry-version: "${{ matrix.poetry-version }}"
-      - name: "Install redis"
-        run: "sudo apt-get install -y redis"
-      - name: "Run poetry Install"
-        run: "poetry install"
-      - name: "Run Tests"
-        run: "poetry run invoke pytest --local"
-    needs:
-      - "pylint"
-  publish_gh:
-    name: "Publish to GitHub"
-    runs-on: "ubuntu-24.04"
-    if: "startsWith(github.ref, 'refs/tags/v')"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Set up Python"
-        uses: "actions/setup-python@v2"
-        with:
-          python-version: "3.9"
-      - name: "Install Python Packages"
-        run: "pip install poetry"
-      - name: "Set env"
-        run: "echo RELEASE_VERSION=${GITHUB_REF:10} >> $GITHUB_ENV"
-      - name: "Run Poetry Version"
-        run: "poetry version $RELEASE_VERSION"
-      - name: "Run Poetry Build"
-        run: "poetry build"
-      - name: "Upload binaries to release"
-        uses: "svenstaro/upload-release-action@v2"
-        with:
-          repo_token: "${{ secrets.NTC_GITHUB_TOKEN }}"
-          file: "dist/*"
-          tag: "${{ github.ref }}"
-          overwrite: true
-          file_glob: true
-    needs:
-      - "unittest"
-  publish_pypi:
-    name: "Push Package to PyPI"
-    runs-on: "ubuntu-24.04"
-    if: "startsWith(github.ref, 'refs/tags/v')"
-    steps:
-      - name: "Check out repository code"
-        uses: "actions/checkout@v2"
-      - name: "Set up Python"
-        uses: "actions/setup-python@v2"
-        with:
-          python-version: "3.9"
-      - name: "Install Python Packages"
-        run: "pip install poetry"
-      - name: "Set env"
-        run: "echo RELEASE_VERSION=${GITHUB_REF:10} >> $GITHUB_ENV"
-      - name: "Run Poetry Version"
-        run: "poetry version $RELEASE_VERSION"
-      - name: "Run Poetry Build"
-        run: "poetry build"
-      - name: "Push to PyPI"
-        uses: "pypa/gh-action-pypi-publish@release/v1"
-        with:
-          user: "__token__"
-          password: "${{ secrets.PYPI_API_TOKEN }}"
-    needs:
-      - "unittest"
-  slack-notify:
-    needs:
-      - "publish_gh"
-      - "publish_pypi"
-    name: "Send notification to the Slack"
-    runs-on: "ubuntu-24.04"
-    env:
-      SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
-      SLACK_MESSAGE: >-
-        *NOTIFICATION: NEW-RELEASE-PUBLISHED*\n
-        Repository: <${{ github.server_url }}/${{ github.repository }}|${{ github.repository }}>\n
-        Release: <${{ github.server_url }}/${{ github.repository }}/releases/tag/${{ github.ref_name }}|${{ github.ref_name }}>\n
-        Published by: <${{ github.server_url }}/${{ github.actor }}|${{ github.actor }}>
-    steps:
-      - name: "Send a notification to Slack"
-        # ENVs cannot be used directly in job.if. This is a workaround to check
-        # if SLACK_WEBHOOK_URL is present.
-        if: "${{ env.SLACK_WEBHOOK_URL != '' }}"
-        uses: "slackapi/[email protected]"
-        with:
-          payload: |
-            {
-              "text": "${{ env.SLACK_MESSAGE }}",
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "${{ env.SLACK_MESSAGE }}"
-                  }
-                }
-              ]
-            }
-        env:
-          SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
-          SLACK_WEBHOOK_TYPE: "INCOMING_WEBHOOK"
-=======
   pull_request: ~
 
 env:
@@ -362,9 +105,9 @@ jobs:
         run: "echo INVOKE_DIFFSYNC_IMAGE_VER=`poetry version -s`-py$${{ matrix.python-version }} >> $GITHUB_ENV"
       - name: "Set up Docker Buildx"
         id: "buildx"
-        uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2"  # v3.10.0
+        uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
       - name: "Build"
-        uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25"  # v5.4.0
+        uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25" # v5.4.0
         with:
           builder: "${{ steps.buildx.outputs.name }}"
           context: "./"
@@ -399,9 +142,9 @@ jobs:
         run: "echo INVOKE_DIFFSYNC_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
       - name: "Set up Docker Buildx"
         id: "buildx"
-        uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2"  # v3.10.0
+        uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
       - name: "Build"
-        uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25"  # v5.4.0
+        uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25" # v5.4.0
         with:
           builder: "${{ steps.buildx.outputs.name }}"
           context: "./"
@@ -433,4 +176,3 @@ jobs:
         run: |
           git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
           poetry run towncrier check --compare-with origin/${{ github.base_ref }}
->>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)