Merge branch 'main' into fix/high-reportee-count-performance-improvement

Altinn · Dec 11, 2024 · 01b0436 · 01b0436
2 parents c180167 + f9c2c9d
commit 01b0436
Show file tree

Hide file tree

Showing 10 changed files with 2,546 additions and 2,527 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ include:
 
 services:
   dialogporten-webapi-ingress:
-    image: nginx:1.27.2
+    image: nginx:1.27.3
     ports:
       - "7214:80"
     volumes:
@@ -38,7 +38,7 @@ services:
       - ./.aspnet/https:/https
 
   dialogporten-graphql-ingress:
-    image: nginx:1.27.2
+    image: nginx:1.27.3
     ports:
       - "7215:80"
     volumes:

diff --git a/docs/schema/V1/swagger.verified.json b/docs/schema/V1/swagger.verified.json
@@ -4683,7 +4683,7 @@
       "JWTBearerAuth": {
         "bearerFormat": "JWT",
         "description": "Enter a JWT token to authorize the requests...",
-        "scheme": "Bearer",
+        "scheme": "bearer",
         "type": "http"
       }
     }

diff --git a/src/Digdir.Domain.Dialogporten.WebApi/OpenApiDocumentExtensions.cs b/src/Digdir.Domain.Dialogporten.WebApi/OpenApiDocumentExtensions.cs
@@ -6,6 +6,24 @@ namespace Digdir.Domain.Dialogporten.WebApi;
 
 public static class OpenApiDocumentExtensions
 {
+    /// <summary>
+    /// To have this be validated in BlackDuck, we need to lower case the bearer scheme name.
+    /// From editor.swagger.io:
+    /// Structural error at components.securitySchemes.JWTBearerAuth
+    /// should NOT have a `bearerFormat` property without `scheme: bearer` being set
+    /// </summary>
+    /// <param name="openApiDocument"></param>
+    public static void FixJwtBearerCasing(this OpenApiDocument openApiDocument)
+    {
+        foreach (var securityScheme in openApiDocument.Components.SecuritySchemes.Values)
+        {
+            if (securityScheme.Scheme.Equals("Bearer", StringComparison.Ordinal))
+            {
+                securityScheme.Scheme = "bearer";
+            }
+        }
+    }
+
     /// <summary>
     /// When generating ProblemDetails and ProblemDetails_Error, there is a bug/weird behavior in NSwag or FastEndpoints
     /// which results in certain 'Description' properties being generated when running on f.ex. MacOS,

diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Program.cs b/src/Digdir.Domain.Dialogporten.WebApi/Program.cs
@@ -201,6 +201,7 @@ static void BuildAndRun(string[] args, TelemetryConfiguration telemetryConfigura
                 document.Generator = null;
                 document.ReplaceProblemDetailsDescriptions();
                 document.MakeCollectionsNullable();
+                document.FixJwtBearerCasing();
             };
         }, uiConfig =>
         {

diff --git a/src/Digdir.Tool.Dialogporten.Benchmarks/Digdir.Tool.Dialogporten.Benchmarks.csproj b/src/Digdir.Tool.Dialogporten.Benchmarks/Digdir.Tool.Dialogporten.Benchmarks.csproj
@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-        <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0"/>
+        <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0"/>
         <PackageReference Include="NSec.Cryptography" Version="24.4.0"/>
     </ItemGroup>
 

diff --git a/...ication.Integration.Tests/Digdir.Domain.Dialogporten.Application.Integration.Tests.csproj b/...ication.Integration.Tests/Digdir.Domain.Dialogporten.Application.Integration.Tests.csproj
@@ -11,7 +11,7 @@
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
         <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
         <PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
-        <PackageReference Include="FluentAssertions" Version="6.12.2" />
+        <PackageReference Include="FluentAssertions" Version="7.0.0" />
         <PackageReference Include="NSubstitute" Version="5.3.0"/>
         <PackageReference Include="Respawn" Version="6.2.1"/>
         <PackageReference Include="Testcontainers.PostgreSql" Version="4.0.0" />

diff --git a/...logporten.Application.Unit.Tests/Digdir.Domain.Dialogporten.Application.Unit.Tests.csproj b/...logporten.Application.Unit.Tests/Digdir.Domain.Dialogporten.Application.Unit.Tests.csproj
@@ -10,7 +10,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="6.12.2" />
+        <PackageReference Include="FluentAssertions" Version="7.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="Verify.Xunit" Version="28.4.0" />
         <PackageReference Include="NSubstitute" Version="5.3.0"/>

diff --git a/...main.Dialogporten.Architecture.Tests/Digdir.Domain.Dialogporten.Architecture.Tests.csproj b/...main.Dialogporten.Architecture.Tests/Digdir.Domain.Dialogporten.Architecture.Tests.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="coverlet.collector" Version="6.0.2"/>
-        <PackageReference Include="FluentAssertions" Version="6.12.2" />
+        <PackageReference Include="FluentAssertions" Version="7.0.0" />
         <PackageReference Include="Medo.Uuid7" Version="2.1.1" />
         <PackageReference Include="Microsoft.Build" Version="17.12.6" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />

diff --git a/tests/k6/tests/performancetest_data/endusers-yt01.csv b/tests/k6/tests/performancetest_data/endusers-yt01.csv
diff --git a/tests/k6/tests/serviceowner/performance/README.md b/tests/k6/tests/serviceowner/performance/README.md
@@ -4,7 +4,7 @@ This performance test directory focuses on evaluating the GET and POST endpoints
 
 ### Prerequisites
 Before running the performance test, make sure you have met the following prerequisites:
-- [K6 prerequisites](../../README.md#Prerequisites)
+- [K6 prerequisites](../../../README.md#Prerequisites)
 
 ### Test Files
 The test files associated with this performance test are