Test sonar

.github/workflows/main.yml

@@ -14,14 +14,25 @@ jobs:
   python:
     name: Python
     uses: ./.github/workflows/python-tests.yml
-
+    with:
+      cache_key: python-coverage-report-${{ github.sha }}-${{ github.run_id }}
   docker:
-    name: Docker
-    uses: ./.github/workflows/docker-dry-run.yml
-
+    name: Docker Dry Run
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gisktzh/github-actions/docker-dry-run@main
+        with:
+          image: gb3-search-api
   sonarcloud:
     name: SonarCloud
-    uses: ./.github/workflows/sonar-analysis.yml
     needs: python
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gisktzh/github-actions/sonarcloud-analysis@main
+        with:
+          sonar_token: ${{ secrets.SONAR_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          coverage_file_path: coverage.xml
+          coverage_cache_key: python-coverage-report-${{ github.sha }}-${{ github.run_id }}

.github/workflows/python-tests.yml

@@ -1,6 +1,12 @@
 name: Tests
 
-on: workflow_call
+on:
+  workflow_call:
+    inputs:
+      cache_key:
+        description: 'Cache key for coverage report'
+        required: true
+        type: string
 
 env:
   PYTHON_VERSION: '3.10'
@@ -27,4 +33,4 @@ jobs:
         uses: actions/cache@v4
         with:
           path: coverage.xml
-          key: python-coverage-report-${{ github.sha }}-${{ github.run_id }}
+          key: ${{inputs.cache_key}}

indexes/search_results.py

@@ -16,7 +16,7 @@ def prepare_search_result_for_gb3(index: str, search_result: ObjectApiResponse,
         raise HTTPException(status_code=500, detail="Index is not properly configured")
 
 def get_results(index: str, search_result: ObjectApiResponse,
-                display_string_factory: Callable[dict, str]) -> SearchResult:
+                display_string_factory: Callable[dict, str], unused: str = "") -> SearchResult:
     matches = []
     hits = search_result["hits"]["hits"]
     for hit in hits:

pyproject.toml

@@ -1,4 +1,4 @@
 [tool.pytest.ini_options]
 pythonpath = [
     "."
-]
+]