Merge branch 'main' into dependabot/pip/src/api-legacy/pypdf2-1.27.9

swisstopo · Nov 30, 2023 · add9741 · add9741
2 parents 73c4292 + 299ab1b
commit add9741
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 96 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,10 +11,10 @@ jobs:
     name: Build and run tests
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
 
@@ -27,10 +27,10 @@ jobs:
       - name: Run dotnet tests
         run: dotnet test BDMS.sln -c Release --no-build --verbosity normal --filter TestCategory!=LongRunning
 
-      - name: Setup Node.js 16
-        uses: actions/setup-node@v3
+      - name: Setup Node.js 20
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - working-directory: ./src/client
         run: npm ci
@@ -47,10 +47,10 @@ jobs:
         containers: [1, 2, 3, 4, 5]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v2
+        uses: actions/dependency-review-action@v3
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set environment variables
         run: |
@@ -28,7 +28,7 @@ jobs:
 
       - name: Collect Docker image metadata
         id: meta-api-legacy
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.BASE_IMAGE_NAME }}-api-legacy
           labels: |
@@ -43,7 +43,7 @@ jobs:
 
       - name: Collect Docker image metadata
         id: meta-api
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.BASE_IMAGE_NAME }}-api
           labels: |
@@ -58,7 +58,7 @@ jobs:
 
       - name: Collect Docker image metadata
         id: meta-client
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.BASE_IMAGE_NAME }}-client
           labels: |
@@ -72,14 +72,14 @@ jobs:
             type=semver,pattern=v{{version}},value=${{ env.VERSION }}
 
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner  }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image (api-legacy)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./src/api-legacy
           push: true
@@ -92,7 +92,7 @@ jobs:
           cache-to: type=inline
 
       - name: Build and push Docker image (api)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./src/api
           push: true
@@ -105,7 +105,7 @@ jobs:
           cache-to: type=inline
 
       - name: Build and push Docker image (client)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./src/client
           target: deploy

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set environment variables
         run: |
@@ -32,7 +32,7 @@ jobs:
 
       - name: Collect Docker image metadata
         id: meta-api-legacy
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.BASE_IMAGE_NAME }}-api-legacy
           labels: |
@@ -44,7 +44,7 @@ jobs:
 
       - name: Collect Docker image metadata
         id: meta-api
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.BASE_IMAGE_NAME }}-api
           labels: |
@@ -56,7 +56,7 @@ jobs:
 
       - name: Collect Docker image metadata
         id: meta-client
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.BASE_IMAGE_NAME }}-client
           labels: |
@@ -67,14 +67,14 @@ jobs:
             type=semver,pattern=v{{version}}
 
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner  }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image (api-legacy)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./src/api-legacy
           push: true
@@ -87,7 +87,7 @@ jobs:
           cache-to: type=inline
 
       - name: Build and push Docker image (api)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./src/api
           push: true
@@ -100,7 +100,7 @@ jobs:
           cache-to: type=inline
 
       - name: Build and push Docker image (client)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./src/client
           target: deploy
@@ -119,7 +119,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set environment variables
         run: |

diff --git a/src/api/BDMS.csproj b/src/api/BDMS.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AnalysisLevel>latest-all</AnalysisLevel>
+    <AnalysisLevel>6.0-latest</AnalysisLevel>
     <NoWarn>CS1591,CS8618,CS8620</NoWarn>
     <Product>BDMS</Product>
     <Authors>GeoWerkstatt GmbH</Authors>

diff --git a/src/api/Controllers/UploadController.cs b/src/api/Controllers/UploadController.cs
@@ -212,7 +212,7 @@ public async Task<ActionResult<int>> UploadFileAsync(int workgroupId, IFormFile
                             }
                             catch (Exception ex)
                             {
-                                logger.LogError("Invalid code list value of any multi code list property.", ex);
+                                logger.LogError(ex, "Invalid code list value of any multi code list property.");
                                 throw;
                             }
 

diff --git a/src/client/Dockerfile b/src/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM cypress/included:12.4.0 AS development
+FROM cypress/included:13.6.0 AS development
 ARG VERSION
 ARG REVISION
 ENV REACT_APP_VERSION ${VERSION}+${REVISION}

diff --git a/src/client/cypress/support/e2e.js b/src/client/cypress/support/e2e.js
@@ -1,5 +1,11 @@
 import { interceptApiCalls, loginAndResetState } from "../e2e/testHelpers";
 
+Cypress.on('uncaught:exception', () => {
+  // returning false here prevents Cypress from
+  // failing the test
+  return false;
+});
+
 beforeEach(() => {
   interceptApiCalls();
   loginAndResetState();
-Original file line number
+Diff line change
@@ Expand Up @@
                                 }
                                 catch (Exception ex)
                                 {
-                                    logger.LogError("Invalid code list value of any multi code list property.", ex);
+                                    logger.LogError(ex, "Invalid code list value of any multi code list property.");
                                     throw;
                                 }
@@ Expand Down @@