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-31096, PAPP-30822, PAPP-33451: Updated requests, certifi and urllib3 modules #7

Open
wants to merge 3 commits into
base: next
Choose a base branch
from
Open
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
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 .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repos:
- repo: https://github.com/phantomcyber/dev-cicd-tools
rev: v1.16
rev: v1.20
hooks:
- id: org-hook
- id: package-app-dependencies
- repo: https://github.com/Yelp/detect-secrets
rev: v1.4.0
rev: v1.5.0
hooks:
- id: detect-secrets
args: ['--no-verify', '--exclude-files', '^pagerduty.json$']
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) 2016-2020 Splunk Inc.
Copyright (c) 2016-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.
14 changes: 1 addition & 13 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
Splunk SOAR PagerDuty
Copyright (c) 2016-2020 Splunk Inc.
Copyright (c) 2016-2024 Splunk Inc.

Third-party Software Attributions:

Library: beautifulsoup4
Version: 4.9.1
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
768 changes: 384 additions & 384 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) 2016-2020 Splunk Inc.
# Copyright (c) 2016-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
30 changes: 15 additions & 15 deletions display_escalations.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% block widget_content %} <!-- Main Start Block -->

<!-- File: display_escalations.html
Copyright (c) 2016-2020 Splunk Inc.
Copyright (c) 2016-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 @@ -29,47 +29,47 @@
.pagerduty a:hover {
text-decoration:underline;
}

.pagerduty .wf-h4-style {
font-size : 20px;
}

.pagerduty .wf-table-vertical {
width: initial;
font-size: 12px;
}

.pagerduty .wf-table-vertical td{
padding: 5px;
border: 1px solid !important;
}

.pagerduty .wf-table-vertical tr td:first-child {
font-weight: bold;
}

.pagerduty .dataTable th.widget-th {
border-top: 1px solid !important;
border-bottom: 1px solid !important;
}

.pagerduty .dataTable td {
vertical-align: top;
}

.pagerduty .dataTable td.widget-td a{
font-size: 12px;
}

.pagerduty .dataTable {
font-size: 12px;
}

.pagerduty .dataTable .glyphicon.glyphicon-dot:before {
content: "\25cf"; font-size: 10px;
}


</style>


Expand All @@ -96,7 +96,7 @@ <h3 class="wf-h4-style"> List Policies</h3>
<td class="widget-td">
{{ policy.name }}
</td>
{% if policy.teams %}
{% if policy.teams %}
<td class="widget-td">
{% for team in policy.teams %}
<span class="glyphicon glyphicon-dot"></span>&nbsp;
Expand All @@ -112,7 +112,7 @@ <h3 class="wf-h4-style"> List Policies</h3>
<td>None</td>
{% endif %}

{% if policy.escalation_rules %}
{% if policy.escalation_rules %}
<td class="widget-td">
{% for er in policy.escalation_rules %}
{% for target in er.targets %}
Expand Down Expand Up @@ -156,7 +156,7 @@ <h3 class="wf-h4-style"> List Policies</h3>
}
});
$('.dataTable').DataTable();

</script>

{% endblock %} <!-- Main Start Block -->
7 changes: 3 additions & 4 deletions display_oncall_user.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% block widget_content %} <!-- Main Start Block -->

<!-- File: display_oncall_user.html
Copyright (c) 2016-2020 Splunk Inc.
Copyright (c) 2016-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 Expand Up @@ -123,7 +123,6 @@ <h3 class="wf-h3-style">User Info</h3>
}
});
$('.dataTable').DataTable();

</script>
{% endblock %} <!-- Main Start Block -->

</script>
{% endblock %} <!-- Main Start Block -->
30 changes: 15 additions & 15 deletions display_services.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% block widget_content %} <!-- Main Start Block -->

<!-- File: display_services.html
Copyright (c) 2016-2020 Splunk Inc.
Copyright (c) 2016-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 @@ -29,47 +29,47 @@
.pagerduty a:hover {
text-decoration:underline;
}

.pagerduty .wf-h4-style {
font-size : 20px;
}

.pagerduty .wf-table-vertical {
width: initial;
font-size: 12px;
}

.pagerduty .wf-table-vertical td{
padding: 5px;
border: 1px solid !important;
}

.pagerduty .wf-table-vertical tr td:first-child {
font-weight: bold;
}

.pagerduty .dataTable th.widget-th {
border-top: 1px solid !important;
border-bottom: 1px solid !important;
}

.pagerduty .dataTable td {
vertical-align: top;
}

.pagerduty .dataTable td.widget-td a{
font-size: 12px;
}

.pagerduty .dataTable {
font-size: 12px;
}

.pagerduty .dataTable .glyphicon.glyphicon-dot:before {
content: "\25cf"; font-size: 10px;
}


</style>


Expand All @@ -95,7 +95,7 @@ <h3 class="wf-h4-style"> List Services</h3>
<td class="widget-td">
{{ policy.name }}
</td>
{% if policy.teams %}
{% if policy.teams %}
<td class="widget-td">
{% for team in policy.teams %}
<span class="glyphicon glyphicon-dot"></span>&nbsp;
Expand Down Expand Up @@ -136,6 +136,6 @@ <h3 class="wf-h4-style"> List Services</h3>
}
});
$('.dataTable').DataTable();
</script>

</script>
{% endblock %} <!-- Main Start Block -->
7 changes: 3 additions & 4 deletions display_user_info.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% block widget_content %} <!-- Main Start Block -->

<!-- File: display_user_info.html
Copyright (c) 2016-2020 Splunk Inc.
Copyright (c) 2016-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 Expand Up @@ -124,9 +124,8 @@ <h3 class="wf-h3-style">User Info</h3>
}
});
$('.dataTable').DataTable();

</script>


{% endblock %} <!-- Main Start Block -->

{% endblock %} <!-- Main Start Block -->
32 changes: 16 additions & 16 deletions display_users.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% block widget_content %} <!-- Main Start Block -->

<!-- File: display_users.html
Copyright (c) 2016-2020 Splunk Inc.
Copyright (c) 2016-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 @@ -29,47 +29,47 @@
.pagerduty a:hover {
text-decoration:underline;
}

.pagerduty .wf-h4-style {
font-size : 20px;
}

.pagerduty .wf-table-vertical {
width: initial;
font-size: 12px;
}

.pagerduty .wf-table-vertical td{
padding: 5px;
border: 1px solid !important;
}

.pagerduty .wf-table-vertical tr td:first-child {
font-weight: bold;
}

.pagerduty .dataTable th.widget-th {
border-top: 1px solid !important;
border-bottom: 1px solid !important;
}

.pagerduty .dataTable td {
vertical-align: top;
}

.pagerduty .dataTable td.widget-td a{
font-size: 12px;
}

.pagerduty .dataTable {
font-size: 12px;
}

.pagerduty .dataTable .glyphicon.glyphicon-dot:before {
content: "\25cf"; font-size: 10px;
}


</style>


Expand Down Expand Up @@ -106,7 +106,7 @@ <h3 class="wf-h4-style"> List Users</h3>
{% else %}
<td>None</td>
{% endif %}
{% if policy.teams %}
{% if policy.teams %}
<td class="widget-td">
{% for team in policy.teams %}
<span class="glyphicon glyphicon-dot"></span>&nbsp;
Expand Down Expand Up @@ -147,8 +147,8 @@ <h3 class="wf-h4-style"> List Users</h3>
}
});
$('.dataTable').DataTable();

</script>


{% endblock %} <!-- Main Start Block -->
2 changes: 1 addition & 1 deletion exclude_files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ docker-compose.yml
Makefile
.git*
.gitlab-ci.yml
whitesource-results
whitesource-results
Loading
Loading