Merging next to main for release 2.2.1 (#15)

* 'create generate-doc.yml file' * 'update generate-doc.yml file' * 'update generate-doc.yml file' * 'update generate-doc.yml file with manual_readme_content.md' * Remove semgrep workflow file * 'convert readme.html to manual_readme_content.md' * PAPP-30822: Updated requests modules (#14) * Updated requests modules * Update README.md * updated copyright year and release notes * Update README.md * pre-commit changes * Update README.md * consistent variable changes --------- Co-authored-by: splunk-soar-connectors-admin <admin@splunksoar> Co-authored-by: aparekh-crest <[email protected]> * Release notes for version 2.2.1 --------- Co-authored-by: splunk-soar-connectors-admin <admin@splunksoar> Co-authored-by: achandya-crest <[email protected]> Co-authored-by: aparekh-crest <[email protected]> Co-authored-by: root <root@splunksoar>
splunk-soar-connectors · Jan 18, 2024 · d34d62f · d34d62f
1 parent 296e0cb
commit d34d62f
Show file tree

Hide file tree

Showing 22 changed files with 1,009 additions and 828 deletions.
diff --git a/.github/workflows/generate-doc.yml b/.github/workflows/generate-doc.yml
@@ -0,0 +1,20 @@
+name: Generate Readme Doc
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - '*.json'
+      - 'readme.html'
+      - 'manual_readme_content.md'
+    tags-ignore:
+      - '**'
+    branches-ignore:
+      - next
+      - main
+jobs:
+  generate-doc:
+    runs-on: ubuntu-latest
+    steps:
+     - uses: 'phantomcyber/dev-cicd-tools/github-actions/generate-doc@main'
+       with:
+         GITHUB_TOKEN: ${{ secrets.SOAR_APPS_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 repos:
 -   repo: https://github.com/phantomcyber/dev-cicd-tools
-    rev: v1.13
+    rev: v1.17
     hooks:
     -   id: org-hook
     -   id: package-app-dependencies
 -   repo: https://github.com/Yelp/detect-secrets
-    rev: v1.3.0
+    rev: v1.4.0
     hooks:
     -   id: detect-secrets
         args: ['--no-verify', '--exclude-files', '^taniumrest.json$', '^README.md$']
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2019-2022 Splunk Inc.
+   Copyright (c) 2019-2024 Splunk Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Splunk SOAR Tanium REST
-Copyright (c) 2019-2022 Splunk Inc.
+Copyright (c) 2019-2024 Splunk Inc.
 
 Third-party Software Attributions:
 
@@ -9,8 +9,3 @@ License: MIT
 Copyright 2004-2017 Leonard Richardson
 Copyright 2004-2019 Leonard Richardson
 Copyright 2018 Isaac Muse
-
-Library: requests
-Version: 2.25.0
-License: Apache 2.0
-Kenneth Reitz
diff --git a/README.md b/README.md
diff --git a/__init__.py b/__init__.py
@@ -1,6 +1,6 @@
 # File: __init__.py
 #
-# Copyright (c) 2019-2022 Splunk Inc.
+# Copyright (c) 2019-2024 Splunk Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/manual_readme_content.md b/manual_readme_content.md
diff --git a/readme.html b/readme.html
diff --git a/release_notes/2.2.1.md b/release_notes/2.2.1.md
@@ -0,0 +1 @@
+* Removed certifi and requests dependencies in order to use platform packages [PAPP-31096, PAPP-30822]
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1 @@
 beautifulsoup4==4.9.1
-requests==2.25.0
diff --git a/taniumrest.json b/taniumrest.json
@@ -11,11 +11,11 @@
     "publisher": "Splunk",
     "python_version": "3",
     "fips_compliant": true,
-    "license": "Copyright (c) 2019-2022 Splunk Inc.",
+    "license": "Copyright (c) 2019-2024 Splunk Inc.",
     "latest_tested_versions": [
         "Build (Windows): 7.5.2.3503 | Console: 3.0.64"
     ],
-    "app_version": "2.2.0",
+    "app_version": "2.2.1",
     "utctime_updated": "2022-01-07T20:22:22.000000Z",
     "package_name": "phantom_taniumrest",
     "main_module": "taniumrest_connector.py",
@@ -2993,29 +2993,21 @@
                 "module": "beautifulsoup4",
                 "input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl"
             },
-            {
-                "module": "certifi",
-                "input_file": "wheels/py3/certifi-2022.9.14-py3-none-any.whl"
-            },
-            {
-                "module": "chardet",
-                "input_file": "wheels/shared/chardet-3.0.4-py2.py3-none-any.whl"
-            },
-            {
-                "module": "idna",
-                "input_file": "wheels/shared/idna-2.10-py2.py3-none-any.whl"
-            },
-            {
-                "module": "requests",
-                "input_file": "wheels/shared/requests-2.25.0-py2.py3-none-any.whl"
-            },
             {
                 "module": "soupsieve",
                 "input_file": "wheels/py3/soupsieve-2.3.2.post1-py3-none-any.whl"
+            }
+        ]
+    },
+    "pip39_dependencies": {
+        "wheel": [
+            {
+                "module": "beautifulsoup4",
+                "input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl"
             },
             {
-                "module": "urllib3",
-                "input_file": "wheels/shared/urllib3-1.26.12-py2.py3-none-any.whl"
+                "module": "soupsieve",
+                "input_file": "wheels/py3/soupsieve-2.5-py3-none-any.whl"
             }
         ]
     }

diff --git a/taniumrest_connector.py b/taniumrest_connector.py
@@ -1,6 +1,6 @@
 # File: taniumrest_connector.py
 #
-# Copyright (c) 2019-2022 Splunk Inc.
+# Copyright (c) 2019-2024 Splunk Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -184,10 +184,10 @@ def _process_json_response(self, r, action_result):
         try:
             resp_json = r.json()
         except Exception as e:
-            error_msg = self._get_error_message_from_exception(e)
+            error_message = self._get_error_message_from_exception(e)
             return RetVal(action_result.set_status(
                 phantom.APP_ERROR,
-                "Unable to parse JSON response. Error: {}".format(error_msg)), None)
+                "Unable to parse JSON response. Error: {}".format(error_message)), None)
 
         # Please specify the status codes here
         if 200 <= r.status_code < 399:
@@ -276,11 +276,11 @@ def _make_rest_call(self, endpoint, action_result, verify=True, headers=None,
             error_message = 'Error connecting to server. Connection Refused from the Server for %s' % endpoint
             return RetVal(action_result.set_status(phantom.APP_ERROR, error_message), resp_json)
         except Exception as e:
-            error_msg = self._get_error_message_from_exception(e)
+            error_message = self._get_error_message_from_exception(e)
             return RetVal(action_result.set_status(
                 phantom.APP_ERROR,
                 "Error occurred while making the REST call to the Tanium server. Error: {}"
-                .format(error_msg)), None)
+                .format(error_message)), None)
 
         return self._process_response(r, action_result)
 
@@ -513,10 +513,10 @@ def _execute_action_support(self, param, action_result): # noqa: 901
             if parameter_definition and not isinstance(parameter_definition, dict):
                 parameter_definition = json.loads(parameter_definition)
         except Exception as e:
-            error_msg = self._get_error_message_from_exception(e)
+            error_message = self._get_error_message_from_exception(e)
             action_result.set_status(
                 phantom.APP_ERROR,
-                "Error while fetching package details. Error: {}".format(error_msg))
+                "Error while fetching package details. Error: {}".format(error_message))
 
         if parameter_definition and len(parameter_definition.get("parameters")) != 0:
             self.debug_print("Provided package is a parameterized package")
@@ -529,11 +529,11 @@ def _execute_action_support(self, param, action_result): # noqa: 901
             try:
                 package_parameter = json.loads(package_parameter)
             except Exception as e:
-                error_msg = self._get_error_message_from_exception(e)
+                error_message = self._get_error_message_from_exception(e)
                 return action_result.set_status(
                     phantom.APP_ERROR,
                     "Error while parsing the 'package_parameter' field. Error: {}"
-                    .format(error_msg))
+                    .format(error_message))
 
             if len(package_parameter) != len(parameter_definition.get("parameters")):
                 return action_result.set_status(
@@ -1048,9 +1048,9 @@ def _parameterize_query(self, query, action_result):
         try:
             question_data = self._load_full_sensors_to_obj(action_result, question_data, param_list)
         except Exception as e:
-            error_msg = self._get_error_message_from_exception(e)
+            error_message = self._get_error_message_from_exception(e)
             self.debug_print(
-                "Error occurred while converting the sensors. Error: {}".format(error_msg))
+                "Error occurred while converting the sensors. Error: {}".format(error_message))
             return
 
         if self._param_idx and self._param_idx != len(param_list):
@@ -1097,10 +1097,10 @@ def _create_sensor_dict(self, action_result, sensor, param_list):
                 # Regular Sensor, can use as-is
                 return phantom.APP_SUCCESS, sensor
         except Exception as e:
-            error_msg = self._get_error_message_from_exception(e)
-            error_msg = "Error while parsing the 'parameter_definition'. Error: {}".format(
-                error_msg)
-            return action_result.set_status(phantom.APP_ERROR, error_msg), {}
+            error_message = self._get_error_message_from_exception(e)
+            error_message = "Error while parsing the 'parameter_definition'. Error: {}".format(
+                error_message)
+            return action_result.set_status(phantom.APP_ERROR, error_message), {}
 
         # Parameterized Sensor
         parameter_keys = [parameter["key"] for parameter in parameter_definition["parameters"]]

diff --git a/taniumrest_consts.py b/taniumrest_consts.py
@@ -1,6 +1,6 @@
 # File: taniumrest_consts.py
 #
-# Copyright (c) 2019-2022 Splunk Inc.
+# Copyright (c) 2019-2024 Splunk Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/taniumrest_get_question_results.html b/taniumrest_get_question_results.html
@@ -10,7 +10,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: taniumrest_get_question_results.html
-  Copyright (c) 2019-2022 Splunk Inc.
+  Copyright (c) 2019-2024 Splunk Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

diff --git a/taniumrest_run_query.html b/taniumrest_run_query.html
@@ -10,7 +10,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: taniumrest_run_query.html
-  Copyright (c) 2019-2022 Splunk Inc.
+  Copyright (c) 2019-2024 Splunk Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

diff --git a/taniumrest_view.py b/taniumrest_view.py
@@ -1,6 +1,6 @@
 # File: taniumrest_view.py
 #
-# Copyright (c) 2019-2022 Splunk Inc.
+# Copyright (c) 2019-2024 Splunk Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/wheels/py3/certifi-2022.9.14-py3-none-any.whl b/wheels/py3/certifi-2022.9.14-py3-none-any.whl
diff --git a/wheels/py3/soupsieve-2.5-py3-none-any.whl b/wheels/py3/soupsieve-2.5-py3-none-any.whl
diff --git a/wheels/shared/chardet-3.0.4-py2.py3-none-any.whl b/wheels/shared/chardet-3.0.4-py2.py3-none-any.whl
diff --git a/wheels/shared/idna-2.10-py2.py3-none-any.whl b/wheels/shared/idna-2.10-py2.py3-none-any.whl
diff --git a/wheels/shared/requests-2.25.0-py2.py3-none-any.whl b/wheels/shared/requests-2.25.0-py2.py3-none-any.whl
diff --git a/wheels/shared/urllib3-1.26.12-py2.py3-none-any.whl b/wheels/shared/urllib3-1.26.12-py2.py3-none-any.whl
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Removed certifi and requests dependencies in order to use platform packages [PAPP-31096, PAPP-30822]