PAPP-30822: Updated requests modules (#5)

* Updated requests modules * Update README.md * minor change in release note * update copyright changes * Update README.md * updated docs util library * updated doc util library * removed docutil library * added doc utils library * removed doc utils * updated notice file * update release notes --------- Co-authored-by: splunk-soar-connectors-admin <admin@splunksoar> Co-authored-by: mishalp-crest <[email protected]>
splunk-soar-connectors · Dec 26, 2023 · d574bc6 · d574bc6
1 parent e2e3320
commit d574bc6
Show file tree

Hide file tree

Showing 29 changed files with 177 additions and 206 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -1,7 +1,7 @@
 name: Linting
 on: [push, pull_request]
 jobs:
-  lint: 
+  lint:
     # Run per push for internal contributers. This isn't possible for forked pull requests,
     # so we'll need to run on PR events for external contributers.
     # String comparison below is case insensitive.

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-2023 Splunk Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Splunk SOAR AWS Inspector
-Copyright (c) 2019-2022 Splunk Inc.
+Copyright (c) 2019-2023 Splunk Inc.
 
 Third-party Software Attributions:
 
@@ -16,11 +16,6 @@ Copyright 2012 Kenneth Reitz
 Copyright 2012-2017 Amazon.com, Inc
 Copyright 2013 Kenneth Reitz
 
-Library: docutils
-Version: 0.16
-License: Public Domain
-Copyright 2011 Günter Milde,
-
 Library: python-dateutil
 Version: 2.8.1
 License: Apache 2.0
@@ -32,8 +27,3 @@ Copyright 2015 - Paul Ganssle <[email protected]>
 Copyright 2015 - dateutil contributors (see AUTHORS file)
 Copyright 2017 Paul Ganssle <[email protected]>
 Copyright 2017 dateutil contributors (see AUTHORS file)
-
-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-2023 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/awsinspector.json b/awsinspector.json
@@ -9,8 +9,8 @@
     "product_name": "Inspector",
     "product_version_regex": ".*",
     "publisher": "Splunk",
-    "license": "Copyright (c) 2019-2022 Splunk Inc.",
-    "app_version": "2.2.10",
+    "license": "Copyright (c) 2019-2023 Splunk Inc.",
+    "app_version": "2.2.11",
     "utctime_updated": "2022-01-07T21:56:46.000000Z",
     "package_name": "phantom_awsinspector",
     "main_module": "awsinspector_connector.py",
@@ -25,51 +25,31 @@
         "wheel": [
             {
                 "module": "boto3",
-                "input_file": "wheels/boto3-1.17.30-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/boto3-1.17.30-py2.py3-none-any.whl"
             },
             {
                 "module": "botocore",
-                "input_file": "wheels/botocore-1.20.30-py2.py3-none-any.whl"
-            },
-            {
-                "module": "certifi",
-                "input_file": "wheels/certifi-2021.10.8-py2.py3-none-any.whl"
-            },
-            {
-                "module": "chardet",
-                "input_file": "wheels/chardet-3.0.4-py2.py3-none-any.whl"
-            },
-            {
-                "module": "docutils",
-                "input_file": "wheels/docutils-0.16-py2.py3-none-any.whl"
-            },
-            {
-                "module": "idna",
-                "input_file": "wheels/idna-2.10-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/botocore-1.20.30-py2.py3-none-any.whl"
             },
             {
                 "module": "jmespath",
-                "input_file": "wheels/jmespath-0.10.0-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/jmespath-0.10.0-py2.py3-none-any.whl"
             },
             {
                 "module": "python_dateutil",
-                "input_file": "wheels/python_dateutil-2.8.1-py2.py3-none-any.whl"
-            },
-            {
-                "module": "requests",
-                "input_file": "wheels/requests-2.25.0-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/python_dateutil-2.8.1-py2.py3-none-any.whl"
             },
             {
                 "module": "s3transfer",
-                "input_file": "wheels/s3transfer-0.3.7-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/s3transfer-0.3.7-py2.py3-none-any.whl"
             },
             {
                 "module": "six",
-                "input_file": "wheels/six-1.16.0-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/six-1.16.0-py2.py3-none-any.whl"
             },
             {
                 "module": "urllib3",
-                "input_file": "wheels/urllib3-1.26.7-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl"
             }
         ]
     },

diff --git a/awsinspector_connector.py b/awsinspector_connector.py
@@ -1,6 +1,6 @@
 # File: awsinspector_connector.py
 #
-# Copyright (c) 2019-2022 Splunk Inc.
+# Copyright (c) 2019-2023 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/awsinspector_consts.py b/awsinspector_consts.py
@@ -1,6 +1,6 @@
 # File: awsinspector_consts.py
 #
-# Copyright (c) 2019-2022 Splunk Inc.
+# Copyright (c) 2019-2023 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/awsinspector_get_findings.html b/awsinspector_get_findings.html
@@ -10,7 +10,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: awsinspector_get_findings.html
-  Copyright (c) 2019-2022 Splunk Inc.
+  Copyright (c) 2019-2023 Splunk Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ <h4 class="wf-h4-style">Info</h4>
                     {% endif %}
                 </table>
             </div>
-            
+
             <div class="data">
                 <h4 class="wf-h4-style">Data</h4>
                 <table class="phantom-table dataTable">
@@ -140,7 +140,7 @@ <h4 class="wf-h4-style">Data</h4>
                                         {% if not forloop.last %}<br/> {% endif %}
                                     {% endfor %}
                                     &nbsp;
-                                    {% if not forloop.last %}<br/> 
+                                    {% if not forloop.last %}<br/>
                                     {% endif %}
                                 {% endfor %}
                             </td>

diff --git a/awsinspector_list_templates.html b/awsinspector_list_templates.html
@@ -10,7 +10,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: awsinspector_list_templates.html
-  Copyright (c) 2019-2022 Splunk Inc.
+  Copyright (c) 2019-2023 Splunk Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -117,7 +117,7 @@ <h4 class="wf-h4-style">Info</h4>
                     {% endif %}
                 </table>
             </div>
-            
+
             <div class="data">
                 <h4 class="wf-h4-style">Data</h4>
                 <table class="phantom-table dataTable">
@@ -155,7 +155,7 @@ <h4 class="wf-h4-style">Data</h4>
                                     <span class="glyphicon glyphicon-dot"></span>&nbsp;
                                     {{ rule }}
                                     &nbsp;
-                                    {% if not forloop.last %}<br/> 
+                                    {% if not forloop.last %}<br/>
                                     {% endif %}
                                 {% endfor %}
                             </td>

diff --git a/awsinspector_run_assessment.html b/awsinspector_run_assessment.html
@@ -10,7 +10,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: awsinspector_run_assessment.html
-  Copyright (c) 2019-2022 Splunk Inc.
+  Copyright (c) 2019-2023 Splunk Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -103,7 +103,7 @@ <h4 class="wf-h4-style">Info</h4>
                     {% endif %}
                 </table>
             </div>
-            
+
             <div class="data">
                 <h4 class="wf-h4-style">Data</h4>
                 <table class="phantom-table dataTable">
@@ -144,7 +144,7 @@ <h4 class="wf-h4-style">Data</h4>
                                     <span class="glyphicon glyphicon-dot"></span>&nbsp;
                                     {{ rule }}
                                     &nbsp;
-                                    {% if not forloop.last %}<br/> 
+                                    {% if not forloop.last %}<br/>
                                     {% endif %}
                                 {% endfor %}
                             </td>

diff --git a/awsinspector_view.py b/awsinspector_view.py
@@ -1,6 +1,6 @@
 # File: awsinspector_view.py
 #
-# Copyright (c) 2019-2022 Splunk Inc.
+# Copyright (c) 2019-2023 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/exclude_files.txt b/exclude_files.txt
diff --git a/release_notes/unreleased.md b/release_notes/unreleased.md
@@ -1 +1,2 @@
 **Unreleased**
+* Updated requests and certifi dependencies in order to use platform packages [PAPP-30822, PAPP-31096]
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,3 @@
 boto3==1.17.30
 botocore==1.20.30
-docutils==0.16
 python-dateutil==2.8.1
-requests==2.25.0
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,7 @@
+[flake8]
+max-line-length = 145
+max-complexity = 28
+extend-ignore = F403,E128,E126,E111,E121,E127,E731,E201,E202,F405,E722,D,W292
+
+[isort]
+line_length = 145
diff --git a/wheels/certifi-2021.10.8-py2.py3-none-any.whl b/wheels/certifi-2021.10.8-py2.py3-none-any.whl
diff --git a/wheels/chardet-3.0.4-py2.py3-none-any.whl b/wheels/chardet-3.0.4-py2.py3-none-any.whl
diff --git a/wheels/docutils-0.16-py2.py3-none-any.whl b/wheels/docutils-0.16-py2.py3-none-any.whl
diff --git a/wheels/idna-2.10-py2.py3-none-any.whl b/wheels/idna-2.10-py2.py3-none-any.whl
diff --git a/wheels/requests-2.25.0-py2.py3-none-any.whl b/wheels/requests-2.25.0-py2.py3-none-any.whl
diff --git a/wheels/boto3-1.17.30-py2.py3-none-any.whl → ...shared/boto3-1.17.30-py2.py3-none-any.whl b/wheels/boto3-1.17.30-py2.py3-none-any.whl → ...shared/boto3-1.17.30-py2.py3-none-any.whl
diff --git a/wheels/botocore-1.20.30-py2.py3-none-any.whl → ...red/botocore-1.20.30-py2.py3-none-any.whl b/wheels/botocore-1.20.30-py2.py3-none-any.whl → ...red/botocore-1.20.30-py2.py3-none-any.whl
diff --git a/wheels/jmespath-0.10.0-py2.py3-none-any.whl → ...ared/jmespath-0.10.0-py2.py3-none-any.whl b/wheels/jmespath-0.10.0-py2.py3-none-any.whl → ...ared/jmespath-0.10.0-py2.py3-none-any.whl
diff --git a/...ython_dateutil-2.8.1-py2.py3-none-any.whl → ...ython_dateutil-2.8.1-py2.py3-none-any.whl b/...ython_dateutil-2.8.1-py2.py3-none-any.whl → ...ython_dateutil-2.8.1-py2.py3-none-any.whl
diff --git a/wheels/s3transfer-0.3.7-py2.py3-none-any.whl → ...red/s3transfer-0.3.7-py2.py3-none-any.whl b/wheels/s3transfer-0.3.7-py2.py3-none-any.whl → ...red/s3transfer-0.3.7-py2.py3-none-any.whl
diff --git a/wheels/six-1.16.0-py2.py3-none-any.whl → ...ls/shared/six-1.16.0-py2.py3-none-any.whl b/wheels/six-1.16.0-py2.py3-none-any.whl → ...ls/shared/six-1.16.0-py2.py3-none-any.whl
diff --git a/wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl b/wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl
diff --git a/wheels/urllib3-1.26.7-py2.py3-none-any.whl b/wheels/urllib3-1.26.7-py2.py3-none-any.whl
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		Unreleased
		* Updated requests and certifi dependencies in order to use platform packages [PAPP-30822, PAPP-31096]