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.

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

PAPP-30822: Updated requests modules #20

Merged
merged 14 commits into from
Jan 4, 2024
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright (c) 2019-2023 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.
Expand All @@ -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.
16 changes: 1 addition & 15 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Splunk SOAR AWS Lambda
Copyright (c) 2019-2023 Splunk Inc.
Copyright (c) 2019-2024 Splunk Inc.

Third-party Software Attributions:

Expand All @@ -8,20 +8,6 @@ Version: 1.17.30
License: Apache 2.0
Copyright 2013-2017 Amazon.com, Inc

Library: docutils
Version: 0.18
License: BSD 2
License: GPL 3.0
License: Public Domain
License: Python 2.0
Copyright 2004-2007 Chad Miller
Copyright 2011 Günter Milde,

Library: requests
Version: 2.25.0
License: Apache 2.0
Kenneth Reitz

Library: six
Version: 1.15.0
License: MIT
Expand Down
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: __init__.py
#
# Copyright (c) 2019-2023 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.
Expand Down
68 changes: 34 additions & 34 deletions awslambda.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"product_name": "Lambda",
"product_version_regex": ".*",
"publisher": "Splunk",
"license": "Copyright (c) 2019-2023 Splunk Inc.",
"license": "Copyright (c) 2019-2024 Splunk Inc.",
"app_version": "2.2.9",
"utctime_updated": "2022-02-04T17:14:48.000000Z",
"package_name": "phantom_awslambda",
Expand All @@ -21,38 +21,6 @@
"Cloud API, September 13, 2021"
],
"app_wizard_version": "1.0.0",
"pip3_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.112-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"
}
]
},
"configuration": {
"access_key": {
"description": "Access Key",
Expand Down Expand Up @@ -1142,5 +1110,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.112-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"
}
]
}
}
5 changes: 3 additions & 2 deletions awslambda_connector.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: awslambda_connector.py
#
# Copyright (c) 2019-2023 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.
Expand All @@ -24,6 +24,7 @@
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 @@ -62,7 +63,7 @@ def _sanitize_data(self, cur_obj):

if isinstance(cur_obj, dict):
new_dict = {}
for k, v in cur_obj.items():
for k, v in six.iteritems(cur_obj):
if isinstance(v, br.StreamingBody):
content = v.read()
new_dict[k] = json.loads(content)
Expand Down
2 changes: 1 addition & 1 deletion awslambda_consts.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: awslambda_consts.py
#
# Copyright (c) 2019-2023 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.
Expand Down
2 changes: 1 addition & 1 deletion awslambda_invoke.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Main Start Block -->

<!-- File: awslambda_invoke.html
Copyright (c) 2019-2023 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.
Expand Down
2 changes: 1 addition & 1 deletion awslambda_view.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: awslambda_view.py
#
# Copyright (c) 2019-2023 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.
Expand Down
3 changes: 1 addition & 2 deletions release_notes/2.2.9.md
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
* Updated dependencies
* Minimum SOAR version is now 6.1.1
* Updated requests and certifi dependencies in order to use platform packages [PAPP-30822, PAPP-31096]
2 changes: 1 addition & 1 deletion release_notes/unreleased.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
**Unreleased**
**Unreleased**
Loading