From a5187f262d9a7a96da541c1d995938c7d432075b Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:30:55 +0600 Subject: [PATCH 01/13] Update autobump_rn.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/autobump_rn.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/autobump_rn.yml b/.github/workflows/autobump_rn.yml index c122964dd16b..214a9cab98dd 100644 --- a/.github/workflows/autobump_rn.yml +++ b/.github/workflows/autobump_rn.yml @@ -12,7 +12,7 @@ jobs: autobump_rn_version: runs-on: ubuntu-latest concurrency: autobump-version - if: github.repository == 'demisto/content' && startsWith(github.head_ref, 'contrib/') == false + if: github.repository == 'khulnasoft/content' && startsWith(github.head_ref, 'contrib/') == false steps: - name: Print out context run: | @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - token: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + token: ${{ secrets.ORG_REPO_TOKEN }} - name: Setup Python uses: actions/setup-python@v5 with: @@ -38,11 +38,11 @@ jobs: echo "PYTHONPATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV - name: Check conflicts and add release notes env: - CONTENTBOT_GH_ADMIN_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + ORG_REPO_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} XSOAR_BOT_TEST_CONTENT: ${{ secrets.XSOAR_BOT_TEST_CONTENT }} RUN_ID: ${{github.run_id}} run: | - git config --global user.email "bot@demisto.com" - git config --global user.name "Content Bot" + git config --global user.email "bot@khulnasoft.com" + git config --global user.name "KhulnaSoft Bot" echo "Someone merged to master. Starting to check if conflicts in release notes created." - poetry run python .github/github_workflow_scripts/autobump_rn.py -g $CONTENTBOT_GH_ADMIN_TOKEN -r $RUN_ID + poetry run python .github/github_workflow_scripts/autobump_rn.py -g $ORG_REPO_TOKEN -r $RUN_ID From 63d53c2f1246b474e128e91f5c47766f2821a535 Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:37:30 +0600 Subject: [PATCH 02/13] Update auto-merge-dockers.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/auto-merge-dockers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-merge-dockers.yml b/.github/workflows/auto-merge-dockers.yml index 6a2b170450a7..bbed69a9d2eb 100644 --- a/.github/workflows/auto-merge-dockers.yml +++ b/.github/workflows/auto-merge-dockers.yml @@ -11,7 +11,7 @@ permissions: jobs: auto_approve_and_merge: runs-on: ubuntu-latest - if: startsWith(github.head_ref, 'demisto/') && github.repository == 'demisto/content' && contains(github.event.pull_request.labels.*.name, 'docker-image-auto-update') + if: startsWith(github.head_ref, 'demisto/') && github.repository == 'khulnasoft/content' && contains(github.event.pull_request.labels.*.name, 'docker-image-auto-update') steps: - name: Print out context run: | @@ -41,4 +41,4 @@ jobs: slack-message: "GitHub build result: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}" env: SLACK_BOT_TOKEN: ${{ secrets.CORTEX_XSOAR_SLACK_TOKEN }} - CONTENTBOT_GH_ADMIN_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + ORG_REPO_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} From 058d2ea6ea1bf46099e8f48c4b20af3c7b750c1e Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:38:31 +0600 Subject: [PATCH 03/13] Update check-contributor-pack.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/check-contributor-pack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-contributor-pack.yml b/.github/workflows/check-contributor-pack.yml index c4f1e34f7245..15c720148c98 100644 --- a/.github/workflows/check-contributor-pack.yml +++ b/.github/workflows/check-contributor-pack.yml @@ -10,7 +10,7 @@ permissions: jobs: check_contributor_pack: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' && startsWith(github.head_ref, 'contrib/') == false && startsWith(github.head_ref, 'to-merge/') == false && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false && github.event.pull_request.head.repo.fork == false + if: github.repository == 'khulnasoft/content' && startsWith(github.head_ref, 'contrib/') == false && startsWith(github.head_ref, 'to-merge/') == false && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false && github.event.pull_request.head.repo.fork == false steps: - name: Checkout uses: actions/checkout@v4 From 9e3110365b6c673fdbd8a1572ed7571243c0aa9e Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:39:09 +0600 Subject: [PATCH 04/13] Update check-partner-approved-label.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/check-partner-approved-label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-partner-approved-label.yml b/.github/workflows/check-partner-approved-label.yml index c99d49e48b47..aadd48accf97 100644 --- a/.github/workflows/check-partner-approved-label.yml +++ b/.github/workflows/check-partner-approved-label.yml @@ -9,7 +9,7 @@ permissions: jobs: check_label_job: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == true && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false + if: github.repository == 'khulnasoft/content' && github.event.pull_request.head.repo.fork == true && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false steps: - name: Checkout uses: actions/checkout@v4 From 8bfecc5ede85bdfd37a30e8eace4b78c561b4e92 Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:39:56 +0600 Subject: [PATCH 05/13] Update clean_stale_branches.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/clean_stale_branches.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clean_stale_branches.yml b/.github/workflows/clean_stale_branches.yml index c49ee1c948be..110cf4e1b57f 100644 --- a/.github/workflows/clean_stale_branches.yml +++ b/.github/workflows/clean_stale_branches.yml @@ -12,14 +12,14 @@ env: jobs: stale: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == false + if: github.repository == 'khulnasoft/content' && github.event.pull_request.head.repo.fork == false steps: - name: Checkout uses: actions/checkout@v4 - name: Stale uses: actions/stale@v8 with: - repo-token: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + repo-token: ${{ secrets.ORG_REPO_TOKEN }} days-before-issue-stale: -1 days-before-issue-close: -1 days-before-pr-stale: ${{env.DAY_BEFORE_STALE}} From b68ab337590a24f7656ddd4b5d7e06ba3e8aafc6 Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:40:22 +0600 Subject: [PATCH 06/13] Update close_jira_issue_by_pr_merge.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/close_jira_issue_by_pr_merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/close_jira_issue_by_pr_merge.yml b/.github/workflows/close_jira_issue_by_pr_merge.yml index b0697c5ae84b..9523d6daa71b 100644 --- a/.github/workflows/close_jira_issue_by_pr_merge.yml +++ b/.github/workflows/close_jira_issue_by_pr_merge.yml @@ -9,7 +9,7 @@ permissions: jobs: add_pr_link_to_related_jira_issue: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' && github.event.action == 'closed' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'contrib/') == false + if: github.repository == 'khulnasoft/content' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' && github.event.action == 'closed' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'contrib/') == false steps: - name: Checkout uses: actions/checkout@v4 From 4ec4c5f50bd7a1dcbc8a396e85701d3774649dc7 Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:41:09 +0600 Subject: [PATCH 07/13] Update handle-new-external-pr.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/handle-new-external-pr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/handle-new-external-pr.yml b/.github/workflows/handle-new-external-pr.yml index 76a8b42c29b4..68c59a00e895 100644 --- a/.github/workflows/handle-new-external-pr.yml +++ b/.github/workflows/handle-new-external-pr.yml @@ -9,7 +9,7 @@ permissions: jobs: handle_new_external_pr: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' && github.event.action == 'opened' && github.event.pull_request.head.repo.fork == true && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false + if: github.repository == 'khulnasoft/content' && github.event.action == 'opened' && github.event.pull_request.head.repo.fork == true && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false steps: - name: Checkout uses: actions/checkout@v4 @@ -36,7 +36,7 @@ jobs: echo "PYTHONPATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV - name: Update External PR env: - CONTENTBOT_GH_ADMIN_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + ORG_REPO_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} EVENT_PAYLOAD: ${{ toJson(github.event) }} run: | echo "Updating External PR ${{ github.event.pull_request.html_url }}" @@ -48,7 +48,7 @@ jobs: if: contains(github.event.pull_request.title, '[Marketplace Contribution]') run: gh pr edit "$PR_NUMBER" --add-label "$LABEL" env: - GH_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + GH_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} GH_REPO: ${{ github.repository }} PR_NUMBER: ${{ github.event.pull_request.number }} LABEL: "Contribution Form Filled" @@ -56,7 +56,7 @@ jobs: - name: Send Notification if: startsWith(github.event.pull_request.title, 'test') != true env: - CONTENTBOT_GH_ADMIN_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + ORG_REPO_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} EVENT_PAYLOAD: ${{ toJson(github.event) }} CORTEX_XSOAR_SLACK_TOKEN: ${{ secrets.CORTEX_XSOAR_SLACK_TOKEN }} run: | From 449cb26ff577be5742a61b2f18f16d2632fd44d7 Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:41:39 +0600 Subject: [PATCH 08/13] Update create-internal-pr-from-external.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/create-internal-pr-from-external.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-internal-pr-from-external.yml b/.github/workflows/create-internal-pr-from-external.yml index 0e35f5d0006a..bcecd2a26927 100644 --- a/.github/workflows/create-internal-pr-from-external.yml +++ b/.github/workflows/create-internal-pr-from-external.yml @@ -11,7 +11,7 @@ permissions: jobs: create_internal_pr: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' && github.event.action == 'closed' && github.event.pull_request.merged == true && github.event.pull_request.head.repo.fork == true + if: github.repository == 'khulnasoft/content' && github.event.action == 'closed' && github.event.pull_request.merged == true && github.event.pull_request.head.repo.fork == true steps: - name: set pythonpath run: | @@ -35,7 +35,7 @@ jobs: poetry install --with github-actions - name: Create Internal PR env: - CONTENTBOT_GH_ADMIN_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + ORG_REPO_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} EVENT_PAYLOAD: ${{ toJson(github.event) }} run: | echo "Creating an internal PR from original merged external PR ${{ github.event.pull_request.html_url }}" From 19419b2c622ebc8855589308f3791817e37a726d Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:42:10 +0600 Subject: [PATCH 09/13] Update sync-contribution-base-branch.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/sync-contribution-base-branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-contribution-base-branch.yml b/.github/workflows/sync-contribution-base-branch.yml index 0a631c338ba1..9f390aceeaa8 100644 --- a/.github/workflows/sync-contribution-base-branch.yml +++ b/.github/workflows/sync-contribution-base-branch.yml @@ -10,7 +10,7 @@ permissions: jobs: sync_contributor_base_branch: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' + if: github.repository == 'khulnasoft/content' steps: - name: Checkout uses: actions/checkout@v4 @@ -25,7 +25,7 @@ jobs: poetry install --with github-actions - name: Sync Base Branch to Master env: - CONTENTBOT_GH_ADMIN_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + ORG_REPO_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} run: | echo "Updating contribution base branches (contrib/*)" cd .github/github_workflow_scripts From da2f867edfdc0e40228c957bbe021961c2101cac Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:42:39 +0600 Subject: [PATCH 10/13] Update sync-contribution-base-branch-on-change.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/sync-contribution-base-branch-on-change.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-contribution-base-branch-on-change.yml b/.github/workflows/sync-contribution-base-branch-on-change.yml index ed33bf00e8d8..6678498f22d8 100644 --- a/.github/workflows/sync-contribution-base-branch-on-change.yml +++ b/.github/workflows/sync-contribution-base-branch-on-change.yml @@ -13,7 +13,7 @@ permissions: jobs: sync_contributor_base_branch: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == true && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false + if: github.repository == 'khulnasoft/content' && github.event.pull_request.head.repo.fork == true && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false steps: - name: Checkout uses: actions/checkout@v4 @@ -28,7 +28,7 @@ jobs: poetry install --with github-actions - name: Sync Base Branch to Master env: - CONTENTBOT_GH_ADMIN_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + ORG_REPO_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} run: | echo "Updating contribution base branch (contrib/*)" cd .github/github_workflow_scripts From 8d41287da183d8705337255c1ba86787013f3c7a Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:43:04 +0600 Subject: [PATCH 11/13] Update security-label-check.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/security-label-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/security-label-check.yml b/.github/workflows/security-label-check.yml index cd669c90d134..71e7566e708c 100644 --- a/.github/workflows/security-label-check.yml +++ b/.github/workflows/security-label-check.yml @@ -5,7 +5,7 @@ on: jobs: security-check: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == true && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false + if: github.repository == 'khulnasoft/content' && github.event.pull_request.head.repo.fork == true && contains(github.head_ref, 'xsoar-bot-contrib-ContributionTestPack') == false steps: - name: Checkout code uses: actions/checkout@v3 From 02d105c1cb8f53c7baf538e5a9192c4213f4738a Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:43:56 +0600 Subject: [PATCH 12/13] Update review-release-notes.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/review-release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/review-release-notes.yml b/.github/workflows/review-release-notes.yml index 0b91a9ca171f..9b733a2e7884 100644 --- a/.github/workflows/review-release-notes.yml +++ b/.github/workflows/review-release-notes.yml @@ -7,7 +7,7 @@ env: jobs: release_notes_review: runs-on: ubuntu-latest - if: github.repository == 'demisto/content' + if: github.repository == 'khulnasoft/content' steps: - name: Checkout uses: actions/checkout@v4 From ca37bc329b3777abb288286cb77fa07451dbfc1a Mon Sep 17 00:00:00 2001 From: fortishield <161459699+FortiShield@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:44:29 +0600 Subject: [PATCH 13/13] Update purge_branch_protection_rules.yml Signed-off-by: fortishield <161459699+FortiShield@users.noreply.github.com> --- .github/workflows/purge_branch_protection_rules.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/purge_branch_protection_rules.yml b/.github/workflows/purge_branch_protection_rules.yml index 37759ec49db8..a9a13b9c94fc 100644 --- a/.github/workflows/purge_branch_protection_rules.yml +++ b/.github/workflows/purge_branch_protection_rules.yml @@ -32,7 +32,7 @@ jobs: - name: Purge Protection Rules env: - GITHUB_TOKEN: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }} + GITHUB_TOKEN: ${{ secrets.ORG_REPO_TOKEN }} run: | echo Purging branch protection rules poetry run python .github/github_workflow_scripts/purge_branch_protection_rules.py @@ -41,4 +41,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: purge_branch_protection_rules_${{ github.run_id }} - path: "${{ github.workspace }}/purge_branch_protection_rules.log" \ No newline at end of file + path: "${{ github.workspace }}/purge_branch_protection_rules.log"