Skip to content

Commit 2fa201b

Browse files
feat: add support of python3.13 with CIM v5 (#912)
- Added compatibility with python3.13 for PSA with CIM v5. Ref: https://splunk.atlassian.net/browse/ADDON-82835
1 parent 5e1a803 commit 2fa201b

File tree

79 files changed

+114
-118
lines changed

Some content is hidden

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

79 files changed

+114
-118
lines changed

.github/workflows/build-test-release.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@ concurrency:
1515

1616
jobs:
1717
meta:
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-22.04
1919
outputs:
20-
matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
20+
matrix_supportedSplunk: ${{ steps.matrix.outputs.latestSplunk }}
2121
steps:
2222
- uses: actions/checkout@v4
2323
- id: matrix
24-
uses: splunk/addonfactory-test-matrix-action@v1
24+
uses: splunk/addonfactory-test-matrix-action@v3
25+
with:
26+
features: PYTHON39
2527

2628
fossa-scan:
2729
continue-on-error: true
28-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-22.04
2931
steps:
3032
- uses: actions/checkout@v4
3133
- name: run fossa anlyze and create report
@@ -47,18 +49,18 @@ jobs:
4749
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
4850

4951
compliance-copyrights:
50-
runs-on: ubuntu-latest
52+
runs-on: ubuntu-22.04
5153
steps:
5254
- uses: actions/checkout@v4
5355
- uses: apache/[email protected]
5456

5557
pre-commit:
56-
runs-on: ubuntu-latest
58+
runs-on: ubuntu-22.04
5759
steps:
5860
- uses: actions/checkout@v4
5961
- uses: actions/setup-python@v5
6062
with:
61-
python-version: "3.7"
63+
python-version: "3.13"
6264
- uses: pre-commit/[email protected]
6365

6466
semgrep:
@@ -67,11 +69,14 @@ jobs:
6769
SEMGREP_KEY: ${{ secrets.SEMGREP_PUBLISH_TOKEN }}
6870

6971
test-splunk-unit:
70-
runs-on: ubuntu-latest
72+
runs-on: ubuntu-22.04
7173
steps:
7274
- uses: actions/checkout@v4
7375
with:
7476
submodules: true
77+
- uses: actions/setup-python@v5
78+
with:
79+
python-version: "3.13"
7580
- name: Install dependencies
7681
run: |
7782
curl -sSL https://install.python-poetry.org | python3 - --version 1.5.1
@@ -80,7 +85,7 @@ jobs:
8085
8186
8287
test-splunk-external:
83-
runs-on: ubuntu-latest
88+
runs-on: ubuntu-22.04
8489
needs:
8590
- meta
8691
- pre-commit
@@ -132,7 +137,7 @@ jobs:
132137
- fossa-scan
133138
- compliance-copyrights
134139
- test-splunk-unit
135-
runs-on: ubuntu-latest
140+
runs-on: ubuntu-22.04
136141
strategy:
137142
fail-fast: false
138143
matrix:
@@ -156,7 +161,7 @@ jobs:
156161
submodules: true
157162
- uses: actions/setup-python@v5
158163
with:
159-
python-version: 3.7
164+
python-version: 3.13
160165
- run: |
161166
curl -sSL https://install.python-poetry.org | python3 - --version 1.5.1
162167
poetry install
@@ -166,7 +171,7 @@ jobs:
166171
needs:
167172
- test-splunk-external
168173
- test-splunk-matrix
169-
runs-on: ubuntu-latest
174+
runs-on: ubuntu-22.04
170175
steps:
171176
- uses: actions/checkout@v4
172177
with:

.licenserc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

.releaserc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

Dockerfile.splunk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

Dockerfile.tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

Dockerfile.uf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

docker-compose-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -87,6 +87,7 @@ services:
8787
- SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
8888
- SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
8989
- SPLUNK_START_ARGS=--accept-license
90+
- SPLUNK_GENERAL_TERMS=--accept-sgt-current-at-splunk-com
9091
- TEST_SC4S_ACTIVATE_EXAMPLES=yes
9192
volumes:
9293
results:

docker-compose.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -38,8 +38,9 @@ services:
3838
- "6514"
3939
stdin_open: true
4040
tty: true
41-
links:
42-
- splunk
41+
depends_on:
42+
splunk:
43+
condition: service_healthy
4344
environment:
4445
- SPLUNK_HEC_URL=https://splunk:8088
4546
- SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
@@ -77,6 +78,7 @@ services:
7778
environment:
7879
- SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
7980
- SPLUNK_START_ARGS=--accept-license
81+
- SPLUNK_GENERAL_TERMS=--accept-sgt-current-at-splunk-com
8082
- SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
8183
- TEST_SC4S_ACTIVATE_EXAMPLES=yes
8284

@@ -92,11 +94,13 @@ services:
9294
ports:
9395
- "9997"
9496
- "8089"
95-
links:
96-
- splunk
97+
depends_on:
98+
splunk:
99+
condition: service_healthy
97100
environment:
98101
- SPLUNK_PASSWORD=Chang3d!
99102
- SPLUNK_START_ARGS=--accept-license
103+
- SPLUNK_GENERAL_TERMS=--accept-sgt-current-at-splunk-com
100104
volumes:
101105
- ${CURRENT_DIR}/uf_files:${CURRENT_DIR}/uf_files
102106

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2024 Splunk Inc.
2+
# Copyright 2025 Splunk Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)