From 9664cae5e14dc38c9f759dcdfe65349b2bd51a49 Mon Sep 17 00:00:00 2001
From: mkolasinski-splunk <mkolasinski@splunk.com>
Date: Fri, 27 Jun 2025 11:44:54 +0200
Subject: [PATCH] chore: merge main

---
 .github/workflows/reusable-build-test-release.yml | 13 ++++++-------
 runbooks/update_appinspect_cli_action.md          |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml
index 46b7ce0f..1dd60f11 100644
--- a/.github/workflows/reusable-build-test-release.yml
+++ b/.github/workflows/reusable-build-test-release.yml
@@ -39,13 +39,13 @@ on:
         required: false
         description: "branch for k8s manifests to run the tests on"
         type: string
-        default: "v3.4.1"
+        default: "v3.5.1"
       scripted-inputs-os-list:
         required: false
         description: "list of OS used for scripted input tests"
         type: string
         default: >-
-          ["ubuntu:14.04", "ubuntu:16.04","ubuntu:18.04","ubuntu:22.04", "ubuntu:24.04", "redhat:8.4", "redhat:8.5", "redhat:8.6", "redhat:8.8"]
+          ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04", "redhat:8.4", "redhat:8.5", "redhat:8.6", "redhat:8.8", "redhat:9.5"]
       upgrade-tests-ta-versions:
         required: false
         description: "List with TA versions (in 'X.X.X' format) that should be used as starting points for upgrade tests. Example: ['7.6.0', '7.7.0']"
@@ -139,7 +139,6 @@ jobs:
           set -o xtrace
           # List all files modified in the commit or PR
           changed_files=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }})
-          # changed_files=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }})
 
           # Check if any of the changed files are not in docs/*, mkdocs.yml, or .github/workflows/docs.yml
           if echo "$changed_files" | grep -vqE '^(docs/|mkdocs.yml|.github/workflows/docs.yml)'; then
@@ -415,7 +414,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.7"
+          python-version: "3.9"
       - uses: pre-commit/action@v3.0.1
 
   review_secrets:
@@ -930,7 +929,7 @@ jobs:
           name: package-splunkbase
           path: build/package/
       - name: Scan
-        uses: splunk/appinspect-cli-action@v2.9
+        uses: splunk/appinspect-cli-action@v2.10
         with:
           app_path: build/package/
           included_tags: ${{ matrix.tags }}
@@ -1074,9 +1073,9 @@ jobs:
         run: |
           poetry install --only modinput
           if [ -f "tests/ucc_modinput_functional/tmp/openapi.json" ]; then
-            poetry run ucc-test-modinput -o tests/ucc_modinput_functional/tmp/openapi.json -t ${{ steps.download-openapi.outputs.download-path }}/tmp/
+            poetry run ucc-test-modinput gen -o tests/ucc_modinput_functional/tmp/openapi.json -t ${{ steps.download-openapi.outputs.download-path }}/tmp/
           else
-            poetry run ucc-test-modinput -o ${{ steps.download-openapi.outputs.download-path }}/openapi.json -t ${{ steps.download-openapi.outputs.download-path }}/tmp/
+            poetry run ucc-test-modinput gen -o ${{ steps.download-openapi.outputs.download-path }}/openapi.json -t ${{ steps.download-openapi.outputs.download-path }}/tmp/
           fi
       - name: upload-libs-to-s3
         id: upload-libs-to-s3
diff --git a/runbooks/update_appinspect_cli_action.md b/runbooks/update_appinspect_cli_action.md
index 41911cc5..3670962b 100644
--- a/runbooks/update_appinspect_cli_action.md
+++ b/runbooks/update_appinspect_cli_action.md
@@ -22,7 +22,7 @@ Once Splunk AppInspect team releases AppInspect CLI - we need to make sure that
 
 - create a PR in this repository with a new version of the action ([example PR](https://github.com/splunk/addonfactory-workflow-addon-release/pull/247))
     - make sure that PR is towards `main` branch
-    - make sure the tile of the PR follows the format: "fix: update AppInspect CLI action to v.X.Y"
+    - make sure the title of the PR follows the format: "fix: update AppInspect CLI action to v.X.Y"
     - make sure that the pipeline is green
     - attach a link to a test run of reusable workflow
     - get review from the team