chore: merge develop into main (#1995)

Author: kkedziak-splunk

.github/workflows/automatic_doc_generation.yml

@@ -12,7 +12,7 @@ jobs:
     env:
       isPR: ${{ github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'main' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: true
           ref: ${{ github.event.pull_request.head.ref }}
@@ -32,7 +32,7 @@ jobs:
 
       - name: Importing GPG key
         if: ${{ env.isPR }}
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@v7
         with:
           git_committer_name: ${{ secrets.SA_GH_USER_NAME }}
           git_committer_email: ${{ secrets.SA_GH_USER_EMAIL }}

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

@@ -22,22 +22,22 @@ jobs:
     outputs:
       matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - id: matrix
         uses: splunk/addonfactory-test-matrix-action@v3.1
 
   fossa-scan:
     continue-on-error: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - run: |
           curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install-latest.sh | bash
           fossa analyze --debug
-          fossa report attribution --format text > /tmp/THIRDPARTY
+          fossa report attribution --format text --timeout 7200 > /tmp/THIRDPARTY
         env:
           FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         with:
           name: THIRDPARTY
           path: /tmp/THIRDPARTY
@@ -58,7 +58,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.9"
@@ -74,7 +74,7 @@ jobs:
   compliance-copyrights:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: apache/skywalking-eyes@v0.8.0
 
   build-ui:
@@ -102,16 +102,16 @@ jobs:
       - build-ui
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.9"
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         with:
           name: UCC-UI-build
           path: built-ui/
 
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         if: "! github.event.pull_request.head.repo.fork "
         with:
           name: THIRDPARTY
@@ -123,7 +123,7 @@ jobs:
         run: |
           cp -R built-ui/. splunk_add_on_ucc_framework/package/appserver/static/js/build
           poetry build
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         with:
           name: UCC-build
           path: dist/
@@ -141,7 +141,7 @@ jobs:
           - "3.13"
           - "3.14"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
@@ -175,8 +175,8 @@ jobs:
           - "3.13"
           - "3.14"
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/download-artifact@v6
+      - uses: actions/checkout@v6
+      - uses: actions/download-artifact@v8
         with:
           name: UCC-UI-build
           path: built-ui/
@@ -204,11 +204,11 @@ jobs:
     needs:
       - build-ui
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.9"
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         with:
           name: UCC-UI-build
           path: built-ui/
@@ -222,11 +222,11 @@ jobs:
           RUM_ACCESS_TOKEN: ${{ secrets.RUM_ACCESS_TOKEN}}
       - run: poetry run ucc-gen package --path output/Splunk_TA_UCCExample
       - run: poetry run ucc-gen validate --addon-path output/Splunk_TA_UCCExample
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         with:
           name: Splunk_TA_UCCExample-raw-output
           path: output/*
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         with:
           name: Splunk_TA_UCCExample-packaged
           path: Splunk_TA_UCCExample*.tar.gz
@@ -259,11 +259,11 @@ jobs:
           - "9"
           - "10"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.9"
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         with:
           name: Splunk_TA_UCCExample-raw-output
           path: output/
@@ -281,7 +281,7 @@ jobs:
           until curl -k -s -u admin:Chang3d! https://localhost:8089/services/server/info\?output_mode\=json | jq '.entry[0].content.kvStoreStatus' | grep -o "ready" ; do echo -n "Waiting for KVStore to become ready-" && sleep 5 ; done
         timeout-minutes: 5
       - run: poetry run pytest tests/ui --test-group-count 10 --test-group ${{ matrix.test-group }} --test-group-random-seed 123456 --headless --junitxml=test-results/junit.xml
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: test-results-ui-${{ matrix.splunk.version }}-${{ matrix.test-group }}
@@ -291,7 +291,7 @@ jobs:
         run: |
           docker cp splunk:/opt/splunk/var/log/splunk/splunkd.log ./splunkd.log
       - name: Upload splunkd.log to GitHub Check
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         if: failure()
         with:
           name: test-ui-splunkd-splunkd-${{ matrix.splunk.version }}-${{ matrix.test-group }}.log
@@ -318,7 +318,7 @@ jobs:
           - "self-service"
           - "splunk_appinspect"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.9"
@@ -348,8 +348,8 @@ jobs:
         tags:
           - "cloud"
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/download-artifact@v6
+      - uses: actions/checkout@v6
+      - uses: actions/download-artifact@v8
         with:
           name: Splunk_TA_UCCExample-packaged
           path: build/package
@@ -362,7 +362,7 @@ jobs:
           password: ${{secrets.SPL_COM_PASSWORD}}
           app_path: build/package
           included_tags: ${{ matrix.tags }}
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         if: always()
         with:
           name: appinspect-api-html-report-${{ matrix.tags }}
@@ -381,11 +381,11 @@ jobs:
       matrix:
         splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.11"
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         with:
           name: UCC-UI-build
           path: built-ui/
@@ -455,7 +455,7 @@ jobs:
       contents: read
     if: "! github.event.pull_request.head.repo.fork "
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Very important: semantic-release won't trigger a tagged
           # build if this is not set false
@@ -466,11 +466,11 @@ jobs:
       - name: install UI deps
         uses: ./.github/actions/cached-ui-deps
       - run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}}
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         with:
           name: UCC-UI-build
           path: built-ui/
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v8
         with:
           name: THIRDPARTY
       - run: cp -f THIRDPARTY NOTICE

.github/workflows/build-ui.yml

@@ -10,7 +10,7 @@ jobs:
         working-directory: ui
         shell: bash
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: install deps
         uses: ./.github/actions/cached-ui-deps
       - name: Code linting
@@ -22,7 +22,7 @@ jobs:
       - name: Pack tarball
         run: npm pack
       - name: Upload tarball as artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: UCC-UI-lib-tarball
           path: "ui/*.tgz"
@@ -34,7 +34,7 @@ jobs:
         working-directory: ui
         shell: bash
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: install deps
         uses: ./.github/actions/cached-ui-deps
       - name: Build UCC library
@@ -44,7 +44,7 @@ jobs:
       - name: List deps into dependencies.txt
         run: yarn list --prod --depth 0 | python ../.github/scripts/format_yarn_deps.py --output-file=dist/dependencies.txt
       - name: Upload dist with name UCC-UI-build
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: UCC-UI-build
           path: ui/dist/build

.github/workflows/code-cov.yml

@@ -26,7 +26,7 @@ jobs:
           curl -sSL https://install.python-poetry.org | python3 - --version 2.1.4
 
       - name: Checkout develop branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: develop
 
@@ -39,7 +39,7 @@ jobs:
           poetry run pytest --cov=splunk_add_on_ucc_framework --cov-report=json:/tmp/coverage/develop-coverage.json tests/unit
 
       - name: Checkout PR branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install dependencies
         run: |

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
       contents: write
       pages: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: 3.9

.github/workflows/npm-publish.yml

@@ -31,7 +31,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.inputs.branch }}
 

.github/workflows/storybook-visual.yml

@@ -12,7 +12,7 @@ jobs:
     env:
       isPR: ${{ github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'main' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           lfs: true
           ref: ${{ github.event.pull_request.head.ref }}
@@ -30,7 +30,7 @@ jobs:
             "npx wait-on tcp:6006 && yarn test-storybook ${{ env.isPR && '-u' || ''}}"
       - name: Import GPG key
         if: ${{ env.isPR }}
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@v7
         with:
           git_committer_name: ${{ secrets.SA_GH_USER_NAME }}
           git_committer_email: ${{ secrets.SA_GH_USER_EMAIL }}
@@ -43,7 +43,7 @@ jobs:
         run: |
           git add \*.png
           git diff --staged --exit-code || (git commit -S -m "update screenshots" && git push)
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         name: "Upload test report"
         if: ${{ failure() }}
         with:

.github/workflows/ta-tests.yml

@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout UCC Framework Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: UCC
 
@@ -55,7 +55,7 @@ jobs:
         run: poetry build
 
       - name: Upload UCC Artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: ucc-package-whl
           path: UCC/dist/*.whl
@@ -96,7 +96,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Target Add-on Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ matrix.target_repo }}
           path: TA
@@ -112,13 +112,13 @@ jobs:
         run: curl -sSL https://install.python-poetry.org | python3 - --version ${{env.POETRY_VERSION}} && poetry self add poetry-plugin-export@${{env.POETRY_EXPORT_PLUGIN_VERSION}}
 
       - name: Download UCC Artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v8
         with:
           name: ucc-package-whl
           path: UCC
       - name: Importing GPG key
         if: success() && github.event.inputs.run_pipelines == 'true'
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@v7
         with:
           git_committer_name: ${{ secrets.SA_GH_USER_NAME }}
           git_committer_email: ${{ secrets.SA_GH_USER_EMAIL }}

docs/metadata.md

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