Merge branch 'main' into update-deps

Altinn · Nov 11, 2024 · 4891538 · 4891538
2 parents c006207 + fbd9f9c
commit 4891538
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/container-scan.yml b/.github/workflows/container-scan.yml
@@ -22,8 +22,15 @@ jobs:
     - name: Build the Docker image
       run: docker build . --tag altinn-notifications:${{github.sha}}
 
-    - uses: Azure/[email protected]
+    - name: Run Trivy vulnerability scanner
+      uses: aquasecurity/[email protected]
       with:
-        image-name: altinn-notifications:${{ github.sha }}
+        image-ref: 'altinn-notifications:${{ github.sha }}'
+        format: 'table'
+        exit-code: '1'
+        ignore-unfixed: true
+        vuln-type: 'os,library'
+        severity: 'CRITICAL,HIGH'
       env:
-        DOCKLE_HOST: "unix:///var/run/docker.sock"
+        TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,aquasec/trivy-db,ghcr.io/aquasecurity/trivy-db
+        TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db,aquasec/trivy-java-db,ghcr.io/aquasecurity/trivy-java-db
diff --git a/src/Altinn.Notifications.Core/Altinn.Notifications.Core.csproj b/src/Altinn.Notifications.Core/Altinn.Notifications.Core.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.6.0" />
-    <PackageReference Include="libphonenumber-csharp" Version="8.13.48" />
+    <PackageReference Include="libphonenumber-csharp" Version="8.13.49" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />

diff --git a/test/Altinn.Notifications.Tests/Altinn.Notifications.Tests.csproj b/test/Altinn.Notifications.Tests/Altinn.Notifications.Tests.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
-    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="8.1.2" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.2" />
+    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="8.2.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="RandomString4Net" Version="1.8.0" />