metron-labs · yash-metron · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -35,6 +35,7 @@
 /Packs/ApiModules/Scripts/MicrosoftGraphMailApiModule @michal-dagan
 /Packs/ApiModules/Scripts/TAXII2ApiModule/* @Ni-Knight
 /Packs/CommonScripts/Scripts/StixCreator/* @Ni-Knight
+/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py @RosenbergYehuda @demisto/content-leaders
 
 # Common Packs
 /Packs/CommonTypes/ @altmannyarden @idovandijk
@@ -58,9 +59,9 @@
 validation_config.toml @YuvHayun
 
 # XDR Related
-/Packs/CortexXDR/Integrations/ @maimorag
-/Packs/Core/Integrations/ @maimorag
-/Packs/ApiModules/Scripts/CoreIRApiModule/* @maimorag
+/Packs/CortexXDR/Integrations/ @tcarmeli1
+/Packs/Core/Integrations/ @tcarmeli1
+/Packs/ApiModules/Scripts/CoreIRApiModule/* @tcarmeli1
 
 # Demisto Class
 Packs/ApiModules/Scripts/DemistoClassApiModule/DemistoClassApiModule.py @dantavori

diff --git a/.github/content_roles.json b/.github/content_roles.json
@@ -7,6 +7,7 @@
     },
     "CONTRIBUTION_REVIEWERS": [
         "mayyagoldman",
+        "ilaredo",
         "talzich"
     ],
     "CONTRIBUTION_TL": "JudahSchwartz",

diff --git a/.guardrails/ignore b/.guardrails/ignore
@@ -1,2 +1,2 @@
-Integrations/Active_Directory_Query/key.pem
+Integrations/Active_Directory_Query/test_data/key.pem
 poetry.lock
diff --git a/.pre-commit-config_template.yaml b/.pre-commit-config_template.yaml
@@ -34,7 +34,7 @@ repos:
     args:
     - --all
 - repo: https://github.com/charliermarsh/ruff-pre-commit
-  rev: v0.0.272
+  rev: v0.8.0
   hooks:
   - id: ruff
     parallel: false
@@ -88,9 +88,8 @@ repos:
   - id: pylint-in-docker
     name: pylint-in-docker
     description: Run pylint on the code in content packs
-    docker_image:nightly: native:ga,native:maintenance,from-yml,native:candidate
-    docker_image:ci: native:ga,from-yml,native:dev,native:maintenance
-    docker_image:native: native:ga,from-yml,native:dev,native:maintenance
+    docker_image:nightly: from-yml
+    docker_image:ci: from-yml
     docker_image: from-yml
     entry: pylint
     files: Packs\/.*\.py$
@@ -115,9 +114,8 @@ repos:
     - Packs/Base/Scripts/CommonServerPython/CommonServerPython.py 
     - Tests/demistomock/demistomock.py
     description: Run mypy on the code in content packs
-    docker_image:nightly: native:ga,native:maintenance,from-yml,native:candidate
-    docker_image:native: native:ga,from-yml,native:dev,native:maintenance
-    docker_image:ci: native:ga,from-yml,native:dev,native:maintenance
+    docker_image:nightly: from-yml
+    docker_image:ci: from-yml
     docker_image: from-yml
     entry: mypy
     files: Packs\/.*\.py$
@@ -131,13 +129,12 @@ repos:
     - --implicit-optional
     pass_docker_extra_args:ci: --rm=false
     pass_docker_extra_args:nightly: --rm=false
-    skip: true  #  skip until the https://github.com/demisto/demisto-sdk/pull/4468 will merge
+
   - id: pytest-in-docker
     name: pytest-in-docker
     description: Run pytest on the code in content packs
-    docker_image:nightly: native:ga,native:maintenance,from-yml,native:candidate
-    docker_image:ci: native:ga,from-yml,native:dev,native:maintenance
-    docker_image:native: native:ga,from-yml,native:dev,native:maintenance
+    docker_image:nightly: from-yml
+    docker_image:ci: from-yml
     docker_image: from-yml
     entry: python
     language: docker
@@ -179,9 +176,8 @@ repos:
   - id: pytest-network-in-docker
     name: pytest-network-in-docker
     description: Run pytest with network enabled on the code in content packs
-    docker_image:nightly: native:ga,native:maintenance,from-yml,native:candidate
-    docker_image:ci: native:ga,from-yml,native:dev,native:maintenance
-    docker_image:native: native:ga,from-yml,native:dev,native:maintenance
+    docker_image:nightly: from-yml
+    docker_image:ci: from-yml
     docker_image: from-yml
     entry: coverage
     language: docker
@@ -225,11 +221,7 @@ repos:
     require_serial: true
     args:
     -  validate
-    -  --skip-depth-one-folder
-    -  --skip-integration-script-file-name
-    -  --skip-markdown
-    -  --skip-suffix
-
+
   - id: validate-conf-json
     name: validate-conf-json
     description: validate conf.json

diff --git a/Packs/AHA/Integrations/AHA/AHA.py b/Packs/AHA/Integrations/AHA/AHA.py
@@ -2,7 +2,6 @@
 from CommonServerUserPython import *  # noqa
 
 import requests
-from typing import Dict
 from enum import Enum
 
 
@@ -71,7 +70,7 @@ def get(self,
             fields: str,
             from_date: str,
             page: str,
-            per_page: str) -> Dict:
+            per_page: str) -> dict:
         """
         Retrieves a list of features/ideas from AHA
         Args:
@@ -93,7 +92,7 @@ def get(self,
                                   url_suffix=f'{self.url}{aha_type.get_url_suffix()}{name}',
                                   headers=headers, params=params, resp_type='json')
 
-    def edit(self, aha_object_name: str, aha_type: AHA_TYPE, fields: Dict) -> Dict:
+    def edit(self, aha_object_name: str, aha_type: AHA_TYPE, fields: dict) -> dict:
         """
         Updates fields in a feature/idea from AHA
         Args:
@@ -111,8 +110,8 @@ def edit(self, aha_object_name: str, aha_type: AHA_TYPE, fields: Dict) -> Dict:
 ''' HELPER FUNCTIONS'''
 
 
-def build_edit_feature_req_payload(fields: Dict):
-    payload: Dict = {'feature': {}}
+def build_edit_feature_req_payload(fields: dict):
+    payload: dict = {'feature': {}}
     for field in fields:
         feature = payload.get('feature', {})
         if field == 'status':
@@ -124,7 +123,7 @@ def build_edit_feature_req_payload(fields: Dict):
 
 
 def build_edit_idea_req_payload():
-    payload: Dict = {'idea': {}}
+    payload: dict = {'idea': {}}
     idea = payload.get('idea', {})
     idea['workflow_status'] = "Shipped"
     return payload
@@ -201,6 +200,9 @@ def get_command(client: Client,
         human_readable = tableToMarkdown(f'Aha! get {aha_type.get_type_plural()}',
                                          message,
                                          removeNull=True)
+    else:
+        human_readable = ''
+        demisto.debug(f"{response=} -> {human_readable=}")
     return CommandResults(
         outputs_prefix=f'AHA.{aha_type.get_type_for_outputs()}',
         outputs_key_field='id',
@@ -222,6 +224,9 @@ def edit_command(client: Client,
         human_readable = tableToMarkdown(f'Aha! edit {aha_type.get_type_singular()}',
                                          message,
                                          removeNull=True)
+    else:
+        human_readable = ''
+        demisto.debug(f"{response=} -> {human_readable=}")
     return CommandResults(
         outputs_prefix=f'AHA.{aha_type.get_type_for_outputs()}',
         outputs_key_field='id',
@@ -245,7 +250,7 @@ def main() -> None:
     verify = not params.get('insecure', False)
     demisto.debug(f'Command being called is {demisto.command()}')
     try:
-        headers: Dict = {'Authorization': f'Bearer {api_key}'}
+        headers: dict = {'Authorization': f'Bearer {api_key}'}
         client = Client(
             headers=headers,
             base_url=base_url,

diff --git a/Packs/AHA/Integrations/AHA/AHA.yml b/Packs/AHA/Integrations/AHA/AHA.yml
@@ -171,7 +171,7 @@ script:
   script: "-"
   type: python
   subtype: python3
-  dockerimage: demisto/python3:3.11.10.115186
+  dockerimage: demisto/python3:3.11.10.116949
 fromversion: 6.5.0
 tests:
 - No tests (auto formatted)
diff --git a/Packs/AHA/Integrations/AHA/AHA_test.py b/Packs/AHA/Integrations/AHA/AHA_test.py
@@ -3,7 +3,6 @@
 from CommonServerPython import *  # noqa: F401
 from AHA import Client, get_command, edit_command
 from AHA import AHA_TYPE
-import io
 
 
 headers = {
@@ -27,7 +26,7 @@ def mock_client(mocker, http_request_result=None, throw_error=False):
 
 
 def util_load_json(path):
-    with io.open(path, mode='r', encoding='utf-8') as f:
+    with open(path, encoding='utf-8') as f:
         return json.loads(f.read())
 
 

diff --git a/Packs/AHA/Integrations/AHA/command_examples → ...AHA/Integrations/AHA/command_examples.txt b/Packs/AHA/Integrations/AHA/command_examples → ...AHA/Integrations/AHA/command_examples.txt
diff --git a/Packs/AHA/ReleaseNotes/1_0_29.md b/Packs/AHA/ReleaseNotes/1_0_29.md
@@ -0,0 +1,5 @@
+#### Integrations
+
+##### Aha
+- Code functionality improvements.
+- Updated the Docker image to: *demisto/python3:3.11.10.116949*.
diff --git a/Packs/AHA/pack_metadata.json b/Packs/AHA/pack_metadata.json
@@ -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.28",
+    "currentVersion": "1.0.29",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",

diff --git a/...s/CiscoAMPEventCollector/command_examples → ...scoAMPEventCollector/command_examples.txt b/...s/CiscoAMPEventCollector/command_examples → ...scoAMPEventCollector/command_examples.txt
diff --git a/Packs/AWS-ACM/ReleaseNotes/1_1_40.md b/Packs/AWS-ACM/ReleaseNotes/1_1_40.md
@@ -0,0 +1,4 @@
+#### Integrations
+
+##### AWS - ACM
+Code functionality improvements.
diff --git a/Packs/AWS-ACM/pack_metadata.json b/Packs/AWS-ACM/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "AWS - ACM",
     "description": "Amazon Web Services Certificate Manager Service (acm)",
     "support": "xsoar",
-    "currentVersion": "1.1.39",
+    "currentVersion": "1.1.40",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",

diff --git a/...ns/AWS-AccessAnalyzer/command_example.txt → ...s/AWS-AccessAnalyzer/command_examples.txt b/...ns/AWS-AccessAnalyzer/command_example.txt → ...s/AWS-AccessAnalyzer/command_examples.txt
diff --git a/Packs/AWS-AccessAnalyzer/ReleaseNotes/1_1_37.md b/Packs/AWS-AccessAnalyzer/ReleaseNotes/1_1_37.md
@@ -0,0 +1,4 @@
+#### Integrations
+
+##### AWS - AccessAnalyzer
+Code functionality improvements.
diff --git a/Packs/AWS-AccessAnalyzer/pack_metadata.json b/Packs/AWS-AccessAnalyzer/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "AWS - AccessAnalyzer",
     "description": "Amazon Web Services IAM Access Analyzer",
     "support": "xsoar",
-    "currentVersion": "1.1.36",
+    "currentVersion": "1.1.37",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",

diff --git a/Packs/AWS-Athena/ReleaseNotes/2_0_5.md b/Packs/AWS-Athena/ReleaseNotes/2_0_5.md
@@ -0,0 +1,4 @@
+#### Integrations
+
+##### AWS - Athena
+Code functionality improvements.
diff --git a/Packs/AWS-Athena/pack_metadata.json b/Packs/AWS-Athena/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "AWS - Athena",
     "description": "Amazon Web Services Athena",
     "support": "xsoar",
-    "currentVersion": "2.0.4",
+    "currentVersion": "2.0.5",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",

diff --git a/Packs/AWS-CloudWatchLogs/Integrations/AWS-CloudWatchLogs/AWS-CloudWatchLogs.py b/Packs/AWS-CloudWatchLogs/Integrations/AWS-CloudWatchLogs/AWS-CloudWatchLogs.py
@@ -144,7 +144,7 @@ def filter_log_events(args, aws_client):
         if args.get('limit') is not None:
             kwargs.update({'limit': int(args.get('limit'))})
         if args.get('interleaved') is not None:
-            kwargs.update({'interleaved': True if args.get('interleaved') == 'True' else False})
+            kwargs.update({'interleaved': args.get('interleaved') == 'True'})
 
         response = client.filter_log_events(**kwargs)
         for event in response['events']:
@@ -435,6 +435,7 @@ def main():
                            retries, sts_endpoint_url=sts_endpoint_url, endpoint_url=endpoint_url)
     command = demisto.command()
     args = demisto.args()
+    result = ""
 
     if command == 'test-module':
         # This is the call made when pressing the integration test button.

diff --git a/Packs/AWS-CloudWatchLogs/Integrations/AWS-CloudWatchLogs/AWS-CloudWatchLogs.yml b/Packs/AWS-CloudWatchLogs/Integrations/AWS-CloudWatchLogs/AWS-CloudWatchLogs.yml
@@ -461,7 +461,7 @@ script:
       description: The name of the log group.
       type: string
     description: Lists the specified metric filters. You can list all the metric filters or filter the results by log name, prefix, metric name, or metric namespace.
-  dockerimage: demisto/boto3py3:1.0.0.115129
+  dockerimage: demisto/boto3py3:1.0.0.1894954
 tests:
 - No Tests
 fromversion: 5.0.0