Skip to content

Commit 55a3c18

Browse files
Merge branch 'develop' into feat/preserve-masked-value-for-encrypted-fields
2 parents cbca74a + 04ab842 commit 55a3c18

File tree

103 files changed

+358
-328
lines changed

Some content is hidden

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

103 files changed

+358
-328
lines changed

.github/workflows/automatic_doc_generation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
generate-docs:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-latest
1212
env:
1313
isPR: ${{ github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'main' }}
1414
steps:

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

Lines changed: 28 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@ concurrency:
1515
cancel-in-progress: true
1616
env:
1717
POETRY_VERSION: "2.1.4"
18-
POETRY_EXPORT_PLUGIN_VERSION: "1.9.0"
1918

2019
jobs:
2120
meta:
22-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-latest
2322
outputs:
2423
matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
2524
steps:
2625
- uses: actions/checkout@v5
2726
- id: matrix
28-
uses: splunk/addonfactory-test-matrix-action@v3.0
27+
uses: splunk/addonfactory-test-matrix-action@v3.1
2928

3029
fossa-scan:
3130
continue-on-error: true
32-
runs-on: ubuntu-22.04
31+
runs-on: ubuntu-latest
3332
steps:
3433
- uses: actions/checkout@v5
3534
- run: |
@@ -57,7 +56,7 @@ jobs:
5756
failed: ${{ env.failed }}
5857

5958
pre-commit:
60-
runs-on: ubuntu-22.04
59+
runs-on: ubuntu-latest
6160
steps:
6261
- uses: actions/checkout@v5
6362
- uses: actions/setup-python@v6
@@ -73,10 +72,10 @@ jobs:
7372
block_mode: "policy"
7473

7574
compliance-copyrights:
76-
runs-on: ubuntu-22.04
75+
runs-on: ubuntu-latest
7776
steps:
7877
- uses: actions/checkout@v5
79-
- uses: apache/skywalking-eyes@v0.7.0
78+
- uses: apache/skywalking-eyes@v0.8.0
8079

8180
build-ui:
8281
name: Build UCC UI
@@ -101,7 +100,7 @@ jobs:
101100
needs:
102101
- fossa-scan
103102
- build-ui
104-
runs-on: ubuntu-22.04
103+
runs-on: ubuntu-latest
105104
steps:
106105
- uses: actions/checkout@v5
107106
- uses: actions/setup-python@v6
@@ -118,7 +117,7 @@ jobs:
118117
name: THIRDPARTY
119118
- run: cp -f THIRDPARTY NOTICE
120119
if: "! github.event.pull_request.head.repo.fork "
121-
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
120+
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
122121
- run: poetry install
123122
- name: Build UCC
124123
run: |
@@ -130,7 +129,7 @@ jobs:
130129
path: dist/
131130

132131
test-unit:
133-
runs-on: ubuntu-22.04
132+
runs-on: ubuntu-latest
134133
continue-on-error: true
135134
strategy:
136135
matrix:
@@ -140,12 +139,13 @@ jobs:
140139
- "3.11"
141140
- "3.12"
142141
- "3.13"
142+
- "3.14"
143143
steps:
144144
- uses: actions/checkout@v5
145145
- uses: actions/setup-python@v6
146146
with:
147147
python-version: ${{ matrix.python-version }}
148-
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
148+
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
149149
- run: |
150150
poetry install
151151
poetry run pytest --cov=splunk_add_on_ucc_framework --cov-report=xml tests/unit
@@ -163,7 +163,7 @@ jobs:
163163
name: test-smoke ${{ matrix.python-version }}
164164
needs:
165165
- build-ui
166-
runs-on: ubuntu-22.04
166+
runs-on: ubuntu-latest
167167
continue-on-error: true
168168
strategy:
169169
matrix:
@@ -173,6 +173,7 @@ jobs:
173173
- "3.11"
174174
- "3.12"
175175
- "3.13"
176+
- "3.14"
176177
steps:
177178
- uses: actions/checkout@v5
178179
- uses: actions/download-artifact@v6
@@ -184,7 +185,7 @@ jobs:
184185
python-version: ${{ matrix.python-version }}
185186
- run: |
186187
cp -R built-ui/. splunk_add_on_ucc_framework/package/appserver/static/js/build
187-
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
188+
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
188189
- run: |
189190
poetry install
190191
poetry run pytest tests/smoke
@@ -199,7 +200,7 @@ jobs:
199200
failed: ${{ env.failed }}
200201

201202
build-test-addon:
202-
runs-on: ubuntu-22.04
203+
runs-on: ubuntu-latest
203204
needs:
204205
- build-ui
205206
steps:
@@ -211,15 +212,16 @@ jobs:
211212
with:
212213
name: UCC-UI-build
213214
path: built-ui/
214-
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
215+
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
215216
- run: |
216217
cp -R built-ui/. splunk_add_on_ucc_framework/package/appserver/static/js/build
217-
poetry install --only main
218+
poetry install --only main --extras validate
218219
- run: poetry run ucc-gen build --source tests/testdata/test_addons/package_global_config_everything/package
219220
- run: ./scripts/include-rum.sh output/Splunk_TA_UCCExample/appserver/templates/base.html scripts/rum-script.html "$RUM_ACCESS_TOKEN"
220221
env:
221222
RUM_ACCESS_TOKEN: ${{ secrets.RUM_ACCESS_TOKEN}}
222223
- run: poetry run ucc-gen package --path output/Splunk_TA_UCCExample
224+
- run: poetry run ucc-gen validate --addon-path output/Splunk_TA_UCCExample
223225
- uses: actions/upload-artifact@v5
224226
with:
225227
name: Splunk_TA_UCCExample-raw-output
@@ -231,7 +233,7 @@ jobs:
231233

232234
test-ui:
233235
name: test-ui Splunk ${{ matrix.splunk.version }} -group ${{ matrix.test-group }}
234-
runs-on: ubuntu-22.04
236+
runs-on: ubuntu-latest
235237
permissions:
236238
id-token: write
237239
contents: read
@@ -266,7 +268,7 @@ jobs:
266268
name: Splunk_TA_UCCExample-raw-output
267269
path: output/
268270
- run: |
269-
curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
271+
curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
270272
poetry install --only dev
271273
- name: Link chromedriver
272274
# Use installed chromedriver https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
@@ -303,7 +305,7 @@ jobs:
303305

304306
appinspect-for-expected-outputs:
305307
name: splunk-appinspect ${{ matrix.tags }} tests/testdata/expected_addons/expected_output_global_config_everything/Splunk_TA_UCCExample
306-
runs-on: ubuntu-22.04
308+
runs-on: ubuntu-latest
307309
continue-on-error: true
308310
strategy:
309311
matrix:
@@ -320,13 +322,13 @@ jobs:
320322
- uses: actions/setup-python@v6
321323
with:
322324
python-version: "3.9"
323-
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
325+
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
324326
- name: Package tests/expected_output_global_config_everything/Splunk_TA_UCCExample
325327
run: |
326328
poetry install
327329
mkdir tests/packaged
328330
poetry run ucc-gen package --path tests/testdata/expected_addons/expected_output_global_config_everything/Splunk_TA_UCCExample -o tests/packaged
329-
- uses: splunk/appinspect-cli-action@v2.9
331+
- uses: splunk/appinspect-cli-action@v2.11
330332
with:
331333
app_path: tests/packaged
332334
included_tags: ${{ matrix.tags }}
@@ -366,45 +368,9 @@ jobs:
366368
name: appinspect-api-html-report-${{ matrix.tags }}
367369
path: AppInspect_response.html
368370

369-
init-build-run-appinspect-cli:
370-
runs-on: ubuntu-22.04
371-
needs:
372-
- build
373-
steps:
374-
- uses: actions/checkout@v5
375-
- uses: actions/setup-python@v6
376-
with:
377-
python-version: "3.9"
378-
- uses: actions/download-artifact@v6
379-
with:
380-
name: UCC-UI-build
381-
path: built-ui/
382-
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
383-
- run: |
384-
cp -R built-ui/. splunk_add_on_ucc_framework/package/appserver/static/js/build
385-
poetry install --only main
386-
- run: |
387-
poetry run ucc-gen init \
388-
--addon-name "demo_addon_for_splunk" \
389-
--addon-display-name "Demo Add-on for Splunk" \
390-
--addon-input-name demo_input \
391-
--add-license "Apache License 2.0" \
392-
--include-author Splunk
393-
- run: |
394-
echo "# Binary File Declaration\n\nIgnoring lib/charset_normalizer/md.cpython-37m-x86_64-linux-gnu.so" > demo_addon_for_splunk/package/README.txt
395-
- run: |
396-
poetry run ucc-gen build --source demo_addon_for_splunk/package --ta-version 0.0.1
397-
- run: |
398-
mkdir packaged
399-
poetry run ucc-gen package --path output/demo_addon_for_splunk -o packaged
400-
- run: |
401-
python3 -m pip install splunk-appinspect
402-
- run: |
403-
splunk-appinspect inspect packaged/demo_addon_for_splunk-0.0.1.tar.gz --mode test --included-tags cloud
404-
405371
build-test-addon-openapi-client:
406372
name: build-test-addon-openapi-client Splunk ${{ matrix.splunk.version }}
407-
runs-on: ubuntu-22.04
373+
runs-on: ubuntu-latest
408374
needs:
409375
- meta
410376
- build-test-addon
@@ -423,7 +389,7 @@ jobs:
423389
with:
424390
name: UCC-UI-build
425391
path: built-ui/
426-
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
392+
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
427393
- run: |
428394
cp -R built-ui/. splunk_add_on_ucc_framework/package/appserver/static/js/build
429395
poetry install --only main
@@ -450,7 +416,7 @@ jobs:
450416
- build-test-addon-openapi-client
451417
- storybook-screenshots
452418
- bot-updates
453-
runs-on: ubuntu-22.04
419+
runs-on: ubuntu-latest
454420
env:
455421
NEEDS: ${{ toJson(needs) }}
456422
steps:
@@ -483,7 +449,7 @@ jobs:
483449
- semgrep
484450
- pre-commit
485451
- all-checks
486-
runs-on: ubuntu-22.04
452+
runs-on: ubuntu-latest
487453
permissions:
488454
id-token: write
489455
contents: read
@@ -499,7 +465,7 @@ jobs:
499465
python-version: "3.9"
500466
- name: install UI deps
501467
uses: ./.github/actions/cached-ui-deps
502-
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
468+
- run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
503469
- uses: actions/download-artifact@v6
504470
with:
505471
name: UCC-UI-build

.github/workflows/build-ui.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44

55
jobs:
66
ui-code-check:
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-latest
88
defaults:
99
run:
1010
working-directory: ui
@@ -28,7 +28,7 @@ jobs:
2828
path: "ui/*.tgz"
2929

3030
build-ui:
31-
runs-on: ubuntu-22.04
31+
runs-on: ubuntu-latest
3232
defaults:
3333
run:
3434
working-directory: ui

.github/workflows/code-cov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
compare-coverage:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-latest
1515
permissions:
1616
pull-requests: write
1717
contents: read
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Install Poetry
2525
run: |
26-
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4 && poetry self add [email protected]
26+
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4
2727
2828
- name: Checkout develop branch
2929
uses: actions/checkout@v5

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- "release/**"
1313
jobs:
1414
deploy:
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1616
permissions:
1717
contents: write
1818
pages: write
@@ -29,7 +29,7 @@ jobs:
2929
yarn run build-storybook --quiet --output-dir ../docs/storybook/
3030
cd ../
3131
- run: |
32-
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4 && poetry self add [email protected]
32+
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4
3333
poetry install
3434
- name: Deploy to GitHub Pages
3535
if: github.ref_name == 'main'

.github/workflows/storybook-visual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
run:
99
working-directory: ui
1010
shell: bash
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-latest
1212
env:
1313
isPR: ${{ github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'main' }}
1414
steps:

.github/workflows/ta-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131
POETRY_EXPORT_PLUGIN_VERSION: "1.9.0"
3232
jobs:
3333
build-ucc:
34-
runs-on: ubuntu-22.04
34+
runs-on: ubuntu-latest
3535
steps:
3636
- name: Checkout UCC Framework Repository
3737
uses: actions/checkout@v5
@@ -62,7 +62,7 @@ jobs:
6262

6363
determine-repos:
6464
# This job determines the repositories to run tests on based on the event type and inputs
65-
runs-on: ubuntu-22.04
65+
runs-on: ubuntu-latest
6666
outputs:
6767
repos: ${{ steps.set-repos.outputs.repos }}
6868
steps:
@@ -93,7 +93,7 @@ jobs:
9393
matrix:
9494
target_repo: ${{ fromJSON(needs.determine-repos.outputs.repos) }}
9595
continue-on-error: true
96-
runs-on: ubuntu-22.04
96+
runs-on: ubuntu-latest
9797
steps:
9898
- name: Checkout Target Add-on Repository
9999
uses: actions/checkout@v5

0 commit comments

Comments
 (0)