Skip to content

Commit f21aa03

Browse files
Merge branch 'develop' into feat/preserve-masked-value-for-encrypted-fields
2 parents 071a7e5 + 60e127e commit f21aa03

File tree

11 files changed

+155
-60
lines changed

11 files changed

+155
-60
lines changed

.github/workflows/automatic_doc_generation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
env:
1313
isPR: ${{ github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'main' }}
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
with:
1717
lfs: true
1818
ref: ${{ github.event.pull_request.head.ref }}

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
outputs:
2323
matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
- id: matrix
2727
uses: splunk/[email protected]
2828

2929
fossa-scan:
3030
continue-on-error: true
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3434
- run: |
3535
curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install-latest.sh | bash
3636
fossa analyze --debug
@@ -58,7 +58,7 @@ jobs:
5858
pre-commit:
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@v5
61+
- uses: actions/checkout@v6
6262
- uses: actions/setup-python@v6
6363
with:
6464
python-version: "3.9"
@@ -74,7 +74,7 @@ jobs:
7474
compliance-copyrights:
7575
runs-on: ubuntu-latest
7676
steps:
77-
- uses: actions/checkout@v5
77+
- uses: actions/checkout@v6
7878
- uses: apache/[email protected]
7979

8080
build-ui:
@@ -102,7 +102,7 @@ jobs:
102102
- build-ui
103103
runs-on: ubuntu-latest
104104
steps:
105-
- uses: actions/checkout@v5
105+
- uses: actions/checkout@v6
106106
- uses: actions/setup-python@v6
107107
with:
108108
python-version: "3.9"
@@ -141,7 +141,7 @@ jobs:
141141
- "3.13"
142142
- "3.14"
143143
steps:
144-
- uses: actions/checkout@v5
144+
- uses: actions/checkout@v6
145145
- uses: actions/setup-python@v6
146146
with:
147147
python-version: ${{ matrix.python-version }}
@@ -175,7 +175,7 @@ jobs:
175175
- "3.13"
176176
- "3.14"
177177
steps:
178-
- uses: actions/checkout@v5
178+
- uses: actions/checkout@v6
179179
- uses: actions/download-artifact@v6
180180
with:
181181
name: UCC-UI-build
@@ -204,7 +204,7 @@ jobs:
204204
needs:
205205
- build-ui
206206
steps:
207-
- uses: actions/checkout@v5
207+
- uses: actions/checkout@v6
208208
- uses: actions/setup-python@v6
209209
with:
210210
python-version: "3.9"
@@ -259,7 +259,7 @@ jobs:
259259
- "9"
260260
- "10"
261261
steps:
262-
- uses: actions/checkout@v5
262+
- uses: actions/checkout@v6
263263
- uses: actions/setup-python@v6
264264
with:
265265
python-version: "3.9"
@@ -318,7 +318,7 @@ jobs:
318318
- "self-service"
319319
- "splunk_appinspect"
320320
steps:
321-
- uses: actions/checkout@v5
321+
- uses: actions/checkout@v6
322322
- uses: actions/setup-python@v6
323323
with:
324324
python-version: "3.9"
@@ -348,7 +348,7 @@ jobs:
348348
tags:
349349
- "cloud"
350350
steps:
351-
- uses: actions/checkout@v5
351+
- uses: actions/checkout@v6
352352
- uses: actions/download-artifact@v6
353353
with:
354354
name: Splunk_TA_UCCExample-packaged
@@ -381,7 +381,7 @@ jobs:
381381
matrix:
382382
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
383383
steps:
384-
- uses: actions/checkout@v5
384+
- uses: actions/checkout@v6
385385
- uses: actions/setup-python@v6
386386
with:
387387
python-version: "3.11"
@@ -455,7 +455,7 @@ jobs:
455455
contents: read
456456
if: "! github.event.pull_request.head.repo.fork "
457457
steps:
458-
- uses: actions/checkout@v5
458+
- uses: actions/checkout@v6
459459
with:
460460
# Very important: semantic-release won't trigger a tagged
461461
# build if this is not set false

.github/workflows/build-ui.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
working-directory: ui
1111
shell: bash
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
- name: install deps
1515
uses: ./.github/actions/cached-ui-deps
1616
- name: Code linting
@@ -34,7 +34,7 @@ jobs:
3434
working-directory: ui
3535
shell: bash
3636
steps:
37-
- uses: actions/checkout@v5
37+
- uses: actions/checkout@v6
3838
- name: install deps
3939
uses: ./.github/actions/cached-ui-deps
4040
- name: Build UCC library

.github/workflows/code-cov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4
2727
2828
- name: Checkout develop branch
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030
with:
3131
ref: develop
3232

@@ -39,7 +39,7 @@ jobs:
3939
poetry run pytest --cov=splunk_add_on_ucc_framework --cov-report=json:/tmp/coverage/develop-coverage.json tests/unit
4040
4141
- name: Checkout PR branch
42-
uses: actions/checkout@v5
42+
uses: actions/checkout@v6
4343

4444
- name: Install dependencies
4545
run: |

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: write
1818
pages: write
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- uses: actions/setup-python@v6
2222
with:
2323
python-version: 3.9

.github/workflows/npm-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
shell: bash
3232
steps:
3333
- name: Checkout code
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535
with:
3636
ref: ${{ github.event.inputs.branch }}
3737

.github/workflows/storybook-visual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
env:
1313
isPR: ${{ github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'main' }}
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
with:
1717
lfs: true
1818
ref: ${{ github.event.pull_request.head.ref }}

.github/workflows/ta-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Checkout UCC Framework Repository
37-
uses: actions/checkout@v5
37+
uses: actions/checkout@v6
3838
with:
3939
path: UCC
4040

@@ -96,7 +96,7 @@ jobs:
9696
runs-on: ubuntu-latest
9797
steps:
9898
- name: Checkout Target Add-on Repository
99-
uses: actions/checkout@v5
99+
uses: actions/checkout@v6
100100
with:
101101
repository: ${{ matrix.target_repo }}
102102
path: TA

docs/metadata.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Metadata contains general information about add-on build.
1616
| apiVersion | string | [Deprecated] Version of used API. |
1717
| version<span class="required-asterisk">\*</span> | string | Version of the add-on. |
1818
| schemaVersion | string | Version of JSON schema used in build process. |
19-
| \_uccVersion | string | Version of UCC used during build process. Set by UCC itself. |
2019
| hideUCCVersion | boolean | Hide the label 'Made with UCC' on the Configuration page. |
2120
| checkForUpdates | boolean | Ability to configure `app.conf->package.check_for_updates` from globalConfig file. Default `true`. |
2221
| defaultView | string | Define which view should be loaded on TA load. One of `"inputs"`, `"configuration"`, `"dashboard"` or `"search"`. Default `configuration`. |

ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
"@testing-library/react": "^15.0.6",
5252
"@vitejs/plugin-react": "^4.7.0",
5353
"@vitest/coverage-istanbul": "^3.2.4",
54-
"glob": "^11.0.3",
54+
"glob": "^11.1.0",
5555
"immutability-helper": "^3.1.1",
56-
"js-yaml": "^4.1.0",
56+
"js-yaml": "^4.1.1",
5757
"lodash": "^4.17.21",
5858
"prop-types": "^15.8.1",
5959
"react": "18",

0 commit comments

Comments
 (0)