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 #11

Merged
merged 3 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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) 2017-2022 Splunk Inc.
Copyright (c) 2017-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.
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.
7 changes: 1 addition & 6 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
Splunk SOAR Microsoft SQL Server
Copyright (c) 2017-2022 Splunk Inc.
Copyright (c) 2017-2023 Splunk Inc.

Third-party Software Attributions:

Library: requests
Version: 2.25.0
License: Apache 2.0
Kenneth Reitz
222 changes: 112 additions & 110 deletions README.md

Large diffs are not rendered by default.

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) 2017-2022 Splunk Inc.
# Copyright (c) 2017-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.
Expand Down
7 changes: 0 additions & 7 deletions exclude_files.txt

This file was deleted.

2 changes: 1 addition & 1 deletion manual_readme_content.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[comment]: # " File: README.md"
[comment]: # " Copyright (c) 2017-2022 Splunk Inc."
[comment]: # " Copyright (c) 2017-2023 Splunk Inc."
[comment]: # ""
[comment]: # "Licensed under the Apache License, Version 2.0 (the 'License');"
[comment]: # "you may not use this file except in compliance with the License."
Expand Down
44 changes: 2 additions & 42 deletions microsoftsqlserver.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"product_name": "Microsoft SQL Server",
"product_version_regex": ".*",
"publisher": "Splunk",
"license": "Copyright (c) 2017-2022 Splunk Inc.",
"app_version": "2.3.0",
"license": "Copyright (c) 2017-2023 Splunk Inc.",
"app_version": "2.3.1",
"utctime_updated": "2022-02-03T21:25:38.000000Z",
"package_name": "phantom_microsoftsqlserver",
"main_module": "microsoftsqlserver_connector.py",
Expand Down Expand Up @@ -892,57 +892,17 @@
],
"pip_dependencies": {
"wheel": [
{
"module": "certifi",
"input_file": "wheels/py3/certifi-2022.9.24-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": "pymssql",
"input_file": "wheels/py36/pymssql-2.2.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"module": "requests",
"input_file": "wheels/shared/requests-2.25.0-py2.py3-none-any.whl"
},
{
"module": "urllib3",
"input_file": "wheels/shared/urllib3-1.26.13-py2.py3-none-any.whl"
}
]
},
"pip39_dependencies": {
"wheel": [
{
"module": "certifi",
"input_file": "wheels/py3/certifi-2022.9.24-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": "pymssql",
"input_file": "wheels/py39/pymssql-2.2.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"module": "requests",
"input_file": "wheels/shared/requests-2.25.0-py2.py3-none-any.whl"
},
{
"module": "urllib3",
"input_file": "wheels/shared/urllib3-1.26.13-py2.py3-none-any.whl"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions microsoftsqlserver_connector.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: microsoftsqlserver_connector.py
#
# Copyright (c) 2017-2022 Splunk Inc.
# Copyright (c) 2017-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.
Expand Down Expand Up @@ -510,7 +510,7 @@ def finalize(self):
r2 = requests.post(login_url, verify=verify, data=data, headers=headers, timeout=DEFAULT_TIMEOUT)
session_id = r2.cookies['sessionid']
except Exception as e:
print("Unable to get session id from the platfrom. Error: " + str(e))
print("Unable to get session id from the platform. Error: " + str(e))
sys.exit(1)

if len(sys.argv) < 2:
Expand Down
2 changes: 1 addition & 1 deletion microsoftsqlserver_consts.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: microsoftsqlserver_consts.py
#
# Copyright (c) 2017-2022 Splunk Inc.
# Copyright (c) 2017-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.
Expand Down
2 changes: 1 addition & 1 deletion microsoftsqlserver_view.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: microsoftsqlserver_view.py
#
# Copyright (c) 2017-2022 Splunk Inc.
# Copyright (c) 2017-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.
Expand Down
1 change: 1 addition & 0 deletions release_notes/unreleased.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
**Unreleased**
* Removed certifi and requests dependencies in order to use platform packages [PAPP-31096, PAPP-30822]
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
pymssql==2.2.5
requests==2.25.0
2 changes: 1 addition & 1 deletion run_query.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% block widget_content %} <!-- Main Start Block -->

<!-- File: run_query.html
Copyright (c) 2017-2022 Splunk Inc.
Copyright (c) 2017-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.
Expand Down
Binary file removed wheels/py3/certifi-2022.9.24-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/chardet-3.0.4-py2.py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/idna-2.10-py2.py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/requests-2.25.0-py2.py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/urllib3-1.26.13-py2.py3-none-any.whl
Binary file not shown.
Loading