Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed requests, six and indirect requirements from requirements.txt #10

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Removed requests, six and indirect requirements from requirements.txt #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aac485a
Removed requests, six and indirect requirements from requirements.txt
bb-splunk Oct 19, 2023
ec6b61f
Added tox.ini, cleaned up the awswafv2.json
bb-splunk Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
216 changes: 108 additions & 108 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 41 additions & 61 deletions awswafv2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,70 +9,18 @@
"product_name": "WAF V2",
"product_version_regex": ".*",
"publisher": "Splunk",
"license": "Copyright (c) 2021 Splunk Inc.",
"license": "Copyright (c) 2021-2023 Splunk Inc.",
"app_version": "2.1.8",
"utctime_updated": "2022-01-07T20:07:08.000000Z",
"package_name": "phantom_awswafv2",
"main_module": "awswafv2_connector.py",
"min_phantom_version": "4.10.0.40961",
"min_phantom_version": "5.5.0",
"fips_compliant": true,
"app_wizard_version": "1.0.0",
"python_version": "3",
"latest_tested_versions": [
"Cloud, API WAFv2 tested on 12-03-2021"
],
"pip_dependencies": {
"wheel": [
{
"module": "boto3",
"input_file": "wheels/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"
},
{
"module": "jmespath",
"input_file": "wheels/jmespath-0.10.0-py2.py3-none-any.whl"
},
{
"module": "python_dateutil",
"input_file": "wheels/python_dateutil-2.8.2-py2.py3-none-any.whl"
},
{
"module": "requests",
"input_file": "wheels/requests-2.25.0-py2.py3-none-any.whl"
},
{
"module": "s3transfer",
"input_file": "wheels/s3transfer-0.3.4-py2.py3-none-any.whl"
},
{
"module": "six",
"input_file": "wheels/six-1.15.0-py2.py3-none-any.whl"
},
{
"module": "urllib3",
"input_file": "wheels/urllib3-1.26.7-py2.py3-none-any.whl"
}
]
},
"configuration": {
"access_key_id": {
"description": "Access Key ID",
Expand Down Expand Up @@ -338,7 +286,7 @@
"data_path": "action_result.parameter.credentials",
"data_type": "string",
"example_values": [
"{'AccessKeyId': 'ASIASJL6ZZZZZ3M7QC2J', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': 'ZZZZZAmvLPictcVBPvjJx0d7MRezOuxiLCMZZZZZ', 'SessionToken': 'ZZZZZXIvYXdzEN///////////wEaDFRU0s4AVrw0k0oYICK4ATAzOqzAkg9bHY29lYmP59UvVOHjLufOy4s7SnAzOxGqGIXnukLis4TWNhrJl5R5nYyimrm6K/9d0Cw2SW9gO0ZRjEJHWJ+yY5Qk2QpWctS2BGn4n+G8cD6zEweCCMj+ScI5p8n7YI4wOdvXvOsVMmjV6F09Ujqr1w+NwoKXlglznXGs/7Q1kNZOMiioEhGUyoiHbQb37GCKslDK+oqe0KNaUKQ96YCepaLgMbMquDgdAM8I0TTxUO0o5ILF/gUyLT04R7QlOfktkdh6Qt0atTS+xeKi1hirKRizpJ8jjnxGQIikPRToL2v3ZZZZZZ=='}"
"{'AccessKeyId': '*REDACTED*', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': '*REDACTED*', 'SessionToken': '*REDACTED*'}"
],
"contains": [
"aws credentials"
Expand Down Expand Up @@ -531,7 +479,7 @@
"data_path": "action_result.parameter.credentials",
"data_type": "string",
"example_values": [
"{'AccessKeyId': 'ASIASJL6ZZZZZ3M7QC2J', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': 'ZZZZZAmvLPictcVBPvjJx0d7MRezOuxiLCMZZZZZ', 'SessionToken': 'ZZZZZXIvYXdzEN///////////wEaDFRU0s4AVrw0k0oYICK4ATAzOqzAkg9bHY29lYmP59UvVOHjLufOy4s7SnAzOxGqGIXnukLis4TWNhrJl5R5nYyimrm6K/9d0Cw2SW9gO0ZRjEJHWJ+yY5Qk2QpWctS2BGn4n+G8cD6zEweCCMj+ScI5p8n7YI4wOdvXvOsVMmjV6F09Ujqr1w+NwoKXlglznXGs/7Q1kNZOMiioEhGUyoiHbQb37GCKslDK+oqe0KNaUKQ96YCepaLgMbMquDgdAM8I0TTxUO0o5ILF/gUyLT04R7QlOfktkdh6Qt0atTS+xeKi1hirKRizpJ8jjnxGQIikPRToL2v3ZZZZZZ=='}"
"{'AccessKeyId': '*REDACTED*', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': '*REDACTED*', 'SessionToken': '*REDACTED*'}"
],
"contains": [
"aws credentials"
Expand Down Expand Up @@ -678,7 +626,7 @@
"data_path": "action_result.parameter.credentials",
"data_type": "string",
"example_values": [
"{'AccessKeyId': 'ASIASJL6ZZZZZ3M7QC2J', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': 'ZZZZZAmvLPictcVBPvjJx0d7MRezOuxiLCMZZZZZ', 'SessionToken': 'ZZZZZXIvYXdzEN///////////wEaDFRU0s4AVrw0k0oYICK4ATAzOqzAkg9bHY29lYmP59UvVOHjLufOy4s7SnAzOxGqGIXnukLis4TWNhrJl5R5nYyimrm6K/9d0Cw2SW9gO0ZRjEJHWJ+yY5Qk2QpWctS2BGn4n+G8cD6zEweCCMj+ScI5p8n7YI4wOdvXvOsVMmjV6F09Ujqr1w+NwoKXlglznXGs/7Q1kNZOMiioEhGUyoiHbQb37GCKslDK+oqe0KNaUKQ96YCepaLgMbMquDgdAM8I0TTxUO0o5ILF/gUyLT04R7QlOfktkdh6Qt0atTS+xeKi1hirKRizpJ8jjnxGQIikPRToL2v3ZZZZZZ=='}"
"{'AccessKeyId': '*REDACTED*', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': '*REDACTED*', 'SessionToken': '*REDACTED*'}"
],
"contains": [
"aws credentials"
Expand Down Expand Up @@ -815,7 +763,7 @@
"data_path": "action_result.parameter.credentials",
"data_type": "string",
"example_values": [
"{'AccessKeyId': 'ASIASJL6ZZZZZ3M7QC2J', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': 'ZZZZZAmvLPictcVBPvjJx0d7MRezOuxiLCMZZZZZ', 'SessionToken': 'ZZZZZXIvYXdzEN///////////wEaDFRU0s4AVrw0k0oYICK4ATAzOqzAkg9bHY29lYmP59UvVOHjLufOy4s7SnAzOxGqGIXnukLis4TWNhrJl5R5nYyimrm6K/9d0Cw2SW9gO0ZRjEJHWJ+yY5Qk2QpWctS2BGn4n+G8cD6zEweCCMj+ScI5p8n7YI4wOdvXvOsVMmjV6F09Ujqr1w+NwoKXlglznXGs/7Q1kNZOMiioEhGUyoiHbQb37GCKslDK+oqe0KNaUKQ96YCepaLgMbMquDgdAM8I0TTxUO0o5ILF/gUyLT04R7QlOfktkdh6Qt0atTS+xeKi1hirKRizpJ8jjnxGQIikPRToL2v3ZZZZZZ=='}"
"{'AccessKeyId': '*REDACTED*', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': '*REDACTED*', 'SessionToken': '*REDACTED*'}"
],
"contains": [
"aws credentials"
Expand Down Expand Up @@ -943,7 +891,7 @@
"data_path": "action_result.parameter.credentials",
"data_type": "string",
"example_values": [
"{'AccessKeyId': 'ASIASJL6ZZZZZ3M7QC2J', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': 'ZZZZZAmvLPictcVBPvjJx0d7MRezOuxiLCMZZZZZ', 'SessionToken': 'ZZZZZXIvYXdzEN///////////wEaDFRU0s4AVrw0k0oYICK4ATAzOqzAkg9bHY29lYmP59UvVOHjLufOy4s7SnAzOxGqGIXnukLis4TWNhrJl5R5nYyimrm6K/9d0Cw2SW9gO0ZRjEJHWJ+yY5Qk2QpWctS2BGn4n+G8cD6zEweCCMj+ScI5p8n7YI4wOdvXvOsVMmjV6F09Ujqr1w+NwoKXlglznXGs/7Q1kNZOMiioEhGUyoiHbQb37GCKslDK+oqe0KNaUKQ96YCepaLgMbMquDgdAM8I0TTxUO0o5ILF/gUyLT04R7QlOfktkdh6Qt0atTS+xeKi1hirKRizpJ8jjnxGQIikPRToL2v3ZZZZZZ=='}"
"{'AccessKeyId': '*REDACTED*', 'Expiration': '2021-06-07 22:28:04', 'SecretAccessKey': '*REDACTED*', 'SessionToken': '*REDACTED*'}"
],
"contains": [
"aws credentials"
Expand All @@ -955,5 +903,37 @@
},
"versions": "EQ(*)"
}
]
}
],
"pip_dependencies": {
"wheel": [
{
"module": "boto3",
"input_file": "wheels/shared/boto3-1.17.30-py2.py3-none-any.whl"
},
{
"module": "botocore",
"input_file": "wheels/shared/botocore-1.20.30-py2.py3-none-any.whl"
},
{
"module": "jmespath",
"input_file": "wheels/shared/jmespath-0.10.0-py2.py3-none-any.whl"
},
{
"module": "python_dateutil",
"input_file": "wheels/shared/python_dateutil-2.8.2-py2.py3-none-any.whl"
},
{
"module": "s3transfer",
"input_file": "wheels/shared/s3transfer-0.3.7-py2.py3-none-any.whl"
},
{
"module": "six",
"input_file": "wheels/shared/six-1.16.0-py2.py3-none-any.whl"
},
{
"module": "urllib3",
"input_file": "wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl"
}
]
}
}
3 changes: 1 addition & 2 deletions awswafv2_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import botocore.response as br
import phantom.app as phantom
import requests
import six
from boto3 import Session, client
from botocore.config import Config
from phantom.action_result import ActionResult
Expand Down Expand Up @@ -64,7 +63,7 @@ def _sanitize_data(self, cur_obj):

if isinstance(cur_obj, dict):
new_dict = {}
for k, v in six.iteritems(cur_obj):
for k, v in cur_obj.items():
if isinstance(v, br.StreamingBody):
content = v.read()
new_dict[k] = json.loads(content)
Expand Down
1 change: 1 addition & 0 deletions release_notes/unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
**Unreleased**
* Removed requests, six and indirect dependencies from requirements [PAPP-30763]
5 changes: 0 additions & 5 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
boto3==1.17.30
botocore==1.20.30
docutils==0.16
jmespath==0.10.0
requests==2.25.0
s3transfer==0.3.4
six==1.15.0
7 changes: 7 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file removed wheels/certifi-2021.10.8-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file removed wheels/chardet-3.0.4-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file removed wheels/docutils-0.16-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file removed wheels/idna-2.10-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file removed wheels/requests-2.25.0-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file removed wheels/s3transfer-0.3.4-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
0 wheels/boto3-1.17.30-py2.py3-none-any.whl → ...shared/boto3-1.17.30-py2.py3-none-any.whl
View file
Open in desktop
File renamed without changes.
0 wheels/botocore-1.20.30-py2.py3-none-any.whl → ...red/botocore-1.20.30-py2.py3-none-any.whl
View file
Open in desktop
File renamed without changes.
0 wheels/jmespath-0.10.0-py2.py3-none-any.whl → ...ared/jmespath-0.10.0-py2.py3-none-any.whl
View file
Open in desktop
File renamed without changes.
0 ...ython_dateutil-2.8.2-py2.py3-none-any.whl → ...ython_dateutil-2.8.2-py2.py3-none-any.whl
View file
Open in desktop
File renamed without changes.
Binary file added wheels/shared/s3transfer-0.3.7-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file added wheels/shared/six-1.16.0-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file added wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file removed wheels/six-1.15.0-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Binary file removed wheels/urllib3-1.26.7-py2.py3-none-any.whl
View file
Open in desktop
Binary file not shown.
Loading