chore: small refactor of the pipeline, change dependabot target branch (#416)

* chore: update dependabot to send PRs to develop (#412)

* ci: small updates to the pipeline (#414)

* ci: update the script that installs poetry in CI

The old way is deprecated and this is the preferred way to install poetry.

* ci: use reusable workflow for agreements and release-notes

* build(pip): (deps): bump requests-cache from 0.9.1 to 0.9.3 (#415)

Bumps [requests-cache](https://github.com/reclosedev/requests-cache) from 0.9.1 to 0.9.3.
- [Release notes](https://github.com/reclosedev/requests-cache/releases)
- [Changelog](https://github.com/reclosedev/requests-cache/blob/master/HISTORY.md)
- [Commits](requests-cache/requests-cache@v0.9.1...v0.9.3)

[run-int-tests]
---
updated-dependencies:
- dependency-name: requests-cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* refactor: small changes after running flake8 (#413)

Co-authored-by: Artem Rys <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: 3 people

.github/dependabot.yml

@@ -1,21 +1,15 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
 updates:
-  # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     commit-message:
       prefix: "ci(actions): "
     directory: "/.github/workflows"
-    target-branch: "main"
+    target-branch: "develop"
     schedule:
       interval: "daily"
   - package-ecosystem: "pip"
     directory: ""
-    target-branch: "main"
+    target-branch: "develop"
     schedule:
       interval: "daily"
     commit-message:

.github/workflows/agreements.yaml

@@ -6,53 +6,8 @@ on:
     types: [opened, closed, synchronize]
 
 jobs:
-  ContributorLicenseAgreement:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        # Alpha Release
-        uses: cla-assistant/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # the below token should have repo scope and must be manually added by you in the repository's secret
-          PERSONAL_ACCESS_TOKEN: ${{ secrets.PAT_CLATOOL }}
-        with:
-          path-to-signatures: "signatures/version1/cla.json"
-          path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CLA.md" # e.g. a CLA or a DCO document
-          # branch should not be protected
-          branch: "main"
-          allowlist: dependabot,semantic-release-bot
-          #below are the optional inputs - If the optional inputs are not given, then default values will be taken
-          remote-organization-name: splunk
-          remote-repository-name: cla-agreement
-          #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
-          #signed-commit-messag e: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
-          #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
-          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
-          #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
-  CodeOfConduct:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "COC Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the Code of Conduct and I hereby accept the Terms') || github.event_name == 'pull_request_target'
-        # Alpha Release
-        uses: cla-assistant/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # the below token should have repo scope and must be manually added by you in the repository's secret
-          PERSONAL_ACCESS_TOKEN: ${{ secrets.PAT_CLATOOL }}
-        with:
-          path-to-signatures: "signatures/version1/coc.json"
-          path-to-document: "https://github.com/splunk/cla-agreement/blob/main/CODE_OF_CONDUCT.md" # e.g. a COC or a DCO document
-          # branch should not be protected
-          branch: "main"
-          allowlist: dependabot,semantic-release-bot
-          #below are the optional inputs - If the optional inputs are not given, then default values will be taken
-          remote-organization-name: splunk
-          remote-repository-name: cla-agreement
-          custom-pr-sign-comment: "I have read the Code of Conduct and I hereby accept the Terms"
-          create-file-commit-message: "For example: Creating file for storing COC Signatures"
-          signed-commit-message: "$contributorName has signed the COC in #$pullRequestNo"
-          custom-notsigned-prcomment: "All contributors have NOT signed the COC Document"
-          custom-allsigned-prcomment: "****CLA Assistant Lite bot**** All contributors have signed the COC  ✍️ ✅"
+  call-workflow-agreements:
+    uses: splunk/addonfactory-github-workflows/.github/workflows/[email protected]
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      PERSONAL_ACCESS_TOKEN: ${{ secrets.PAT_CLATOOL }}

.github/workflows/ci-main.yaml

@@ -58,16 +58,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Poetry
-        run: curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 -
-      - name: Install Code
         run: |
-          # shellcheck disable=SC1090
-          source "$HOME/.poetry/env"
+          curl -sSL https://install.python-poetry.org | python3 -
           poetry install
       - name: Run Pytest with coverage
         run: |
-          # shellcheck disable=SC1090
-          source "$HOME/.poetry/env"
           poetry run pytest --cov=./splunk_connect_for_snmp --cov-report=xml --junitxml=test-results/junit.xml
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2

.github/workflows/release-notes.yaml

@@ -2,20 +2,11 @@ name: Release-Notes-Preview
 
 on:
   pull_request:
-  #    branches: [main, develop]
   issue_comment:
-    types: [edited]
+    types: [ edited ]
 
 jobs:
-  preview:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: |
-          git fetch --prune --unshallow --tags
-      - uses: snyk/[email protected]
-        with:
-          releaseBranch: main
-        env:
-          GITHUB_PR_USERNAME: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  call-workflow-preview:
+    uses: splunk/addonfactory-github-workflows/.github/workflows/[email protected]
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

integration_tests/README_WALK

@@ -1,8 +1,7 @@
 git clone https://github.com/splunk/splunk-connect-for-snmp.git
 cd splunk-connect-for-snmp
 git checkout <target_branch>
-curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-source "$HOME"/.poetry/env
+curl -sSL https://install.python-poetry.org | python -
 poetry install
 <create inventory.csv file>
 

integration_tests/automatic_setup.sh

@@ -37,8 +37,7 @@ function define_python() {
 }
 
 deploy_poetry() {
-  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | $PYTHON -
-  source "$HOME"/.poetry/env
+  curl -sSL https://install.python-poetry.org | $PYTHON -
   poetry install
   poetry add -D splunk-sdk
   poetry add -D splunklib

integration_tests/deploy_and_test.sh

@@ -87,8 +87,7 @@ stop_simulator() {
 }
 
 deploy_poetry() {
-  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-  source "$HOME"/.poetry/env
+  curl -sSL https://install.python-poetry.org | python -
   poetry install
   poetry add -D splunk-sdk
   poetry add -D splunklib