Skip to content

Commit

Permalink
Merge branch 'master' into falcon_true_positive_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ssokolovich committed Apr 9, 2024
2 parents 804f43e + 46202b0 commit 441e919
Show file tree
Hide file tree
Showing 570 changed files with 11,124 additions and 2,492 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/autobump_rn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
fetch-depth: 0
token: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }}
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: "3.10"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- name: Install python dependencies
run: |
poetry install --with ci
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check-contribution-form-filled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: "3.10"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- name: Install Python Dependencies
run: |
poetry install --with ci
poetry install --with ci
- name: Check if contribution form needs to be filled
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-contributor-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: "3.8"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- name: Install python dependencies
run: |
poetry install --with ci
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-partner-approved-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: "3.10"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- name: Install python dependencies
run: |
poetry install --with ci
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/close_jira_issue_by_pr_merge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Close Jira Issue Related To PR
on:
pull_request:
types: [ closed ]
types: [closed]

permissions:
pull-requests: read
Expand All @@ -14,11 +14,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: "3.10"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- uses: actions/cache@v2
with:
path: .venv
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/link_edited_pr_to_jira_issue.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Add PR link to Related Jira Issue
on:
pull_request:
types: [ opened, edited ]
types: [opened, edited]

permissions:
pull-requests: read
Expand All @@ -14,11 +14,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: "3.10"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- uses: actions/cache@v2
with:
path: .venv
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit-reuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
contents: write
steps:
- name: Install poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9

- name: Checkout
uses: actions/checkout@v4
Expand All @@ -23,7 +23,7 @@ jobs:
run: echo "PYTHONPATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV

- name: Setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'poetry'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/project_manager_daily.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Manage Contribution Board - Daily
on:
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"
permissions:
contents: read

Expand All @@ -12,9 +12,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.7
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: "3.7"
- name: Get project manager
run: |
pip install --upgrade pip
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/project_manager_hourly.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Manage Contribution Board - Hourly
on:
schedule:
- cron: '0 * * * *'
- cron: "0 * * * *"
permissions:
contents: read

Expand All @@ -12,9 +12,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.7
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: "3.7"
- name: Get project manager
run: |
pip install --upgrade pip
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/review-release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
since_last_remote_commit: false
- name: Setup Python
if: ${{ steps.changed-files.outputs.all_changed_files }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: "3.10"
- name: Setup Poetry
if: ${{ steps.changed-files.outputs.all_changed_files }}
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- name: Install python dependencies
if: ${{ steps.changed-files.outputs.all_changed_files }}
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run-secrets-detection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: "3.8"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- name: Install Python Dependencies
run: |
poetry install --with ci
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sync-contribution-base-branch-on-change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- edited
- synchronize
branches:
- 'contrib/**'
- "contrib/**"

permissions:
contents: read
Expand All @@ -18,11 +18,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: "3.9"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- name: Install Python Dependencies
run: |
poetry install --with ci
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sync-contribution-base-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Sync contributor base branch
on:
schedule:
# runs at minute 0 of the 0th hour every day.
- cron: '0 0 * * *'
- cron: "0 0 * * *"

permissions:
contents: read
Expand All @@ -15,11 +15,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: "3.9"
- name: Setup Poetry
uses: Gr1N/setup-poetry@v8
uses: Gr1N/setup-poetry@v9
- name: Install Python Dependencies
run: |
poetry install --with ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-demisto-sdk-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
token: ${{ secrets.CONTENTBOT_GH_ADMIN_TOKEN }}

- name: Setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'poetry'
Expand Down
1 change: 0 additions & 1 deletion .gitlab/ci/.gitlab-ci.bucket-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ run-validations-upload-flow-new-validate-flow:
extends:
- .run-validations-new-validate-flow
- .bucket-upload-rule
allow_failure: true

run-unittests-and-lint-upload-flow:
cache:
Expand Down
1 change: 1 addition & 0 deletions .gitlab/ci/.gitlab-ci.global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@
echo "Pre Commit all files"
# if we need to pre-commit all anyway we need the graph, and it's better (resource-wise) to create it here.
demisto-sdk graph update
unset DEMISTO_SDK_GRAPH_FORCE_CREATE # The graph is already up, no need to force create it
demisto-sdk pre-commit -a --mode=nightly || PRE_COMMIT_SUCCESS=1
else
echo "Pre Commit only changed files"
Expand Down
1 change: 0 additions & 1 deletion .gitlab/ci/.gitlab-ci.on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ run-validations-new-validate-flow:
rules:
- if: '$NIGHTLY'
- if: '$CI_PIPELINE_SOURCE =~ /^(push|contrib)$/'
allow_failure: true


# runs in gitlab for the on-push flow, on every new commit pushed to the branch.
Expand Down
1 change: 0 additions & 1 deletion .gitlab/ci/.gitlab-ci.sdk-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ demisto-sdk-nightly:run-validations-new-validate-flow:
extends:
- .run-validations-new-validate-flow
- .sdk-nightly-schedule-rule
allow_failure: true

demisto_sdk_nightly:check_idset_dependent_commands:
tags:
Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ repos:
rev: v0.0.272
hooks:
- id: ruff
parallel: false
min_py_version: '3.7'
args:
- --fix
Expand Down
2 changes: 1 addition & 1 deletion Packs/AHA/Integrations/AHA/AHA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ script:
script: "-"
type: python
subtype: python3
dockerimage: demisto/python3:3.10.13.88772
dockerimage: demisto/python3:3.10.14.91134
fromversion: 6.5.0
tests:
- No tests (auto formatted)
3 changes: 3 additions & 0 deletions Packs/AHA/ReleaseNotes/1_0_27.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#### Integrations
##### Aha
- Updated the Docker image to: *demisto/python3:3.10.14.91134*.
2 changes: 1 addition & 1 deletion Packs/AHA/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "AHA",
"description": "Use the Aha! integration to edit name/title description and status of features in Aha! according to their status in Jira",
"support": "xsoar",
"currentVersion": "1.0.26",
"currentVersion": "1.0.27",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down
2 changes: 1 addition & 1 deletion Packs/AMP/Integrations/AMPv2/AMPv2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1753,7 +1753,7 @@ script:
- contextPath: DBotScore.Score
description: The actual score.
type: Number
dockerimage: demisto/python3:3.10.13.88772
dockerimage: demisto/python3:3.10.14.91134
isfetch: true
runonce: false
script: '-'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ script:
description: Gets events from Cisco AMP.
execution: false
name: cisco-amp-get-events
dockerimage: demisto/python3:3.10.13.88772
dockerimage: demisto/python3:3.10.14.91134
isfetchevents: true
runonce: false
script: '-'
Expand Down
5 changes: 5 additions & 0 deletions Packs/AMP/ReleaseNotes/2_1_3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#### Integrations
##### Cisco AMP v2
- Updated the Docker image to: *demisto/python3:3.10.14.91134*.
##### Cisco AMP Event Collector
- Updated the Docker image to: *demisto/python3:3.10.14.91134*.
2 changes: 1 addition & 1 deletion Packs/AMP/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Cisco AMP",
"description": "Uses CISCO AMP Endpoint",
"support": "xsoar",
"currentVersion": "2.1.2",
"currentVersion": "2.1.3",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ script:
description: 'Endpoint information, such as the IP address, about the SIAs that were modified based on the rule change.'
type: string
description: Removes a named rule from the source subnet logic block, disabling the alerts.
dockerimage: demisto/python3:3.10.12.63474
dockerimage: demisto/python3:3.10.14.90585
runonce: false
tests:
- No test
Expand Down
6 changes: 6 additions & 0 deletions Packs/ARIAPacketIntelligence/ReleaseNotes/2_0_15.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

#### Integrations

##### ARIA Packet Intelligence

- Updated the Docker image to: *demisto/python3:3.10.14.90585*.
2 changes: 1 addition & 1 deletion Packs/ARIAPacketIntelligence/pack_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ARIAPacketIntelligence",
"description": "Manage Packet Intelligence rules in response to incidents. Instantly block conversations, redirect packets, generate alerts, or perform other actions.",
"support": "partner",
"currentVersion": "2.0.14",
"currentVersion": "2.0.15",
"author": "ARIA Cybersecurity Solutions",
"url": "https://www.ariacybersecurity.com/cybersecurity-products/aria-packet-intelligence",
"email": "ARIA_support@ariacybersecurity.com",
Expand Down
6 changes: 4 additions & 2 deletions Packs/AWS-Lambda/Integrations/AWS_Lambda/AWS_Lambda.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,8 @@ def publish_layer_version_command(args: dict[str, str], aws_client) -> CommandRe
Returns:
CommandResults: An object containing the result of the deletion operation as a readable output in Markdown format.
"""
output_headers = ['LayerVersionArn', 'LayerArn', 'Description', 'CreatedDate', 'Version', 'CompatibleRuntimes']
output_headers = ['LayerVersionArn', 'LayerArn', 'Description', 'CreatedDate', 'Version',
'CompatibleRuntimes', 'CompatibleArchitectures']

content = {}
s3_bucket = args.get('s3-bucket')
Expand All @@ -646,7 +647,8 @@ def publish_layer_version_command(args: dict[str, str], aws_client) -> CommandRe
'LayerName': args.get('layer-name'),
'Description': args.get('description', ""),
'Content': content,
'CompatibleRuntimes': argToList(args.get('compatible-runtimes'))
'CompatibleRuntimes': argToList(args.get('compatible-runtimes')),
'CompatibleArchitectures': argToList(args.get('compatible-architectures'))
}

res = aws_client.publish_layer_version(**kwargs)
Expand Down
Loading

0 comments on commit 441e919

Please sign in to comment.