Skip to content

Commit 352ee12

Browse files
szymonjasszymonjas
authored
Merge pull request #653 from splunk/release/2.1.1
Release/2.1.1
2 parents ab51ffc + f0d1627 commit 352ee12

File tree

145 files changed

+5641
-4147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+5641
-4147
lines changed

‎.github/dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ version: 2
22
updates:
33
- package-ecosystem: "github-actions"
44
directory: "/"
5-
target-branch: "master"
5+
target-branch: "develop"
66
schedule:
77
interval: "weekly"

‎.github/workflows/fossa.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: Fossa OSS Scan
2+
on: [push]
3+
jobs:
4+
fossa-scan:
5+
uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main
6+
secrets: inherit

‎.github/workflows/release.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@ on:
66
jobs:
77
publish:
88
name: Deploy Release to PyPI
9-
runs-on: ubuntu-latest
9+
# Last version with Python 3.7 binaries available
10+
runs-on: ubuntu-22.04
1011
steps:
1112
- name: Checkout source
12-
uses: actions/checkout@v3
13+
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
1314
- name: Set up Python
14-
uses: actions/setup-python@v4
15+
uses: actions/setup-python@9322b3ca74000aeb2c01eb777b646334015ddd72
1516
with:
1617
python-version: 3.7
1718
- name: Install dependencies
1819
run: pip install twine
1920
- name: Build package
2021
run: python setup.py sdist
2122
- name: Publish package to PyPI
22-
uses: pypa/gh-action-pypi-publish@v1.8.10
23+
uses: pypa/gh-action-pypi-publish@d417ba7e7683fa9104c42abe611c1f2c93c0727d
2324
with:
2425
user: __token__
2526
password: ${{ secrets.pypi_password }}
@@ -29,14 +30,14 @@ jobs:
2930
run: |
3031
rm -rf ./docs/_build
3132
tox -e docs
32-
- name : Docs Upload
33-
uses: actions/upload-artifact@v3
33+
- name: Docs Upload
34+
uses: actions/upload-artifact@de65e23aa2b7e23d713bb51fbfcb6d502f8667d8
3435
with:
3536
name: python_sdk_docs
3637
path: docs/_build/html
3738
# Test upload
3839
# - name: Publish package to TestPyPI
39-
# uses: pypa/gh-action-pypi-publish@master
40+
# uses: pypa/gh-action-pypi-publish@d417ba7e7683fa9104c42abe611c1f2c93c0727d
4041
# with:
4142
# user: __token__
4243
# password: ${{ secrets.test_pypi_password }}

‎.github/workflows/test.yml

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,35 @@
11
name: Python CI
2-
3-
on:
4-
[ push, pull_request, workflow_dispatch ]
2+
on: [push, workflow_dispatch]
53

64
jobs:
75
build:
8-
96
runs-on: ${{ matrix.os }}
107
strategy:
11-
matrix:
12-
os:
13-
- ubuntu-latest
14-
python: [ 3.7, 3.9, 3.13]
15-
splunk-version:
16-
- "8.1"
17-
- "8.2"
18-
- "latest"
198
fail-fast: false
20-
9+
matrix:
10+
os: [ubuntu-latest]
11+
python-version: [3.9]
12+
splunk-version: [9.4, latest]
13+
include:
14+
# Oldest possible configuration
15+
# Last Ubuntu version with Python 3.7 binaries available
16+
- os: ubuntu-22.04
17+
python-version: 3.7
18+
splunk-version: 9.1
19+
# Latest possible configuration
20+
- os: ubuntu-latest
21+
python-version: 3.13
22+
splunk-version: latest
2123
steps:
2224
- name: Checkout code
23-
uses: actions/checkout@v3
24-
25+
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
2526
- name: Run docker compose
26-
run: SPLUNK_VERSION=${{matrix.splunk-version}} docker compose up -d
27-
27+
run: SPLUNK_VERSION=${{ matrix.splunk-version }} docker compose up -d
2828
- name: Setup Python
29-
uses: actions/setup-python@v4
29+
uses: actions/setup-python@9322b3ca74000aeb2c01eb777b646334015ddd72
3030
with:
31-
python-version: ${{ matrix.python }}
32-
31+
python-version: ${{ matrix.python-version }}
3332
- name: Install tox
3433
run: pip install tox
35-
3634
- name: Test Execution
3735
run: tox -e py
38-
fossa-scan:
39-
uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main
40-
secrets: inherit

‎.gitignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,14 @@ __stdout__
1111
docs/_build
1212
build/
1313
proxypid
14-
proxy.log
1514
MANIFEST
1615
coverage_report
17-
test.log
18-
tests/searchcommands_data/log/
19-
tests/searchcommands_data/output/
2016
Test Results*.html
21-
tests/searchcommands/data/app/app.log
17+
*.log
2218
splunk_sdk.egg-info/
2319
dist/
24-
tests/searchcommands/apps/app_with_logging_configuration/*.log
2520
*.observed
2621
venv/
22+
.venv/
2723
.tox
2824
test-reports/

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Splunk Enterprise SDK for Python Changelog
22

3+
## Version 2.1.1
4+
5+
### Changes
6+
* [#623](https://github.com/splunk/splunk-sdk-python/pull/623/) Additional logging in custom search commands
7+
* [#622](https://github.com/splunk/splunk-sdk-python/pull/622/) Check if developer added custom map method in reporting command
8+
* Code reformatting and linting, improvements to github acitons
9+
310
## Version 2.1.0
411

512
### Changes

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# The Splunk Enterprise Software Development Kit for Python
66

7-
#### Version 2.1.0
7+
#### Version 2.1.1
88

99
The Splunk Enterprise Software Development Kit (SDK) for Python contains library code designed to enable developers to build applications using the Splunk platform.
1010

‎docker-compose.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
version: '3.6'
2-
31
services:
42
splunk:
53
image: "splunk/splunk:${SPLUNK_VERSION}"
64
container_name: splunk
75
environment:
86
- SPLUNK_START_ARGS=--accept-license
7+
- SPLUNK_GENERAL_TERMS=--accept-sgt-current-at-splunk-com
98
- SPLUNK_HEC_TOKEN=11111111-1111-1111-1111-1111111111113
109
- SPLUNK_PASSWORD=changed!
1110
- SPLUNK_APPS_URL=https://github.com/splunk/sdk-app-collection/releases/download/v1.1.0/sdkappcollection.tgz
1211
ports:
13-
- 8000:8000
14-
- 8088:8088
15-
- 8089:8089
12+
- "8000:8000"
13+
- "8088:8088"
14+
- "8089:8089"
1615
healthcheck:
1716
test: ['CMD', 'curl', '-f', 'http://localhost:8000']
1817
interval: 5s
1918
timeout: 5s
2019
retries: 20
2120
volumes:
22-
- "./tests/searchcommands/test_apps/eventing_app:/opt/splunk/etc/apps/eventing_app"
23-
- "./tests/searchcommands/test_apps/generating_app:/opt/splunk/etc/apps/generating_app"
24-
- "./tests/searchcommands/test_apps/reporting_app:/opt/splunk/etc/apps/reporting_app"
25-
- "./tests/searchcommands/test_apps/streaming_app:/opt/splunk/etc/apps/streaming_app"
21+
- "./tests/system/test_apps/eventing_app:/opt/splunk/etc/apps/eventing_app"
22+
- "./tests/system/test_apps/generating_app:/opt/splunk/etc/apps/generating_app"
23+
- "./tests/system/test_apps/reporting_app:/opt/splunk/etc/apps/reporting_app"
24+
- "./tests/system/test_apps/streaming_app:/opt/splunk/etc/apps/streaming_app"
25+
- "./tests/system/test_apps/modularinput_app:/opt/splunk/etc/apps/modularinput_app"
2626
- "./splunklib:/opt/splunk/etc/apps/eventing_app/lib/splunklib"
2727
- "./splunklib:/opt/splunk/etc/apps/generating_app/lib/splunklib"
2828
- "./splunklib:/opt/splunk/etc/apps/reporting_app/lib/splunklib"
2929
- "./splunklib:/opt/splunk/etc/apps/streaming_app/lib/splunklib"
30+
- "./splunklib:/opt/splunk/etc/apps/modularinput_app/lib/splunklib"

0 commit comments

Comments
 (0)