Upgraded Dapr to 1.14; NuGet upgrades

ScottArbeit · Aug 17, 2024 · 1479c61 · 1479c61
1 parent 1cd4f19
commit 1479c61
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 37 deletions.
diff --git a/src/Grace.Actors/Grace.Actors.fsproj b/src/Grace.Actors/Grace.Actors.fsproj
@@ -43,14 +43,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Azure.Storage.Blobs" Version="12.21.1" />
+		<PackageReference Include="Azure.Storage.Blobs" Version="12.21.2" />
 		<PackageReference Include="Azure.Storage.Blobs.Batch" Version="12.18.1" />
 		<PackageReference Include="Azure.Storage.Common" Version="12.20.1" />
-		<PackageReference Include="Dapr.Actors" Version="1.13.1" />
-		<PackageReference Include="Dapr.Client" Version="1.13.1" />
+		<PackageReference Include="Dapr.Actors" Version="1.14.0" />
+		<PackageReference Include="Dapr.Client" Version="1.14.0" />
 		<PackageReference Include="FSharpPlus" Version="1.6.1" />
 		<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.42.0" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.6.24327.7" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.7.24405.7" />
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="NodaTime" Version="3.1.11" />
 		<PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.2.0" />
@@ -67,7 +67,7 @@
 	</ItemGroup>-->
 
 	<ItemGroup>
-		<PackageReference Update="FSharp.Core" Version="8.0.301" />
+		<PackageReference Update="FSharp.Core" Version="8.0.400" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/Grace.Aspire.ServiceDefaults/Grace.Aspire.ServiceDefaults.csproj b/src/Grace.Aspire.ServiceDefaults/Grace.Aspire.ServiceDefaults.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.6.24353.1" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.7.24412.10" />
     <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.1.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />

diff --git a/src/Grace.CLI/Grace.CLI.fsproj b/src/Grace.CLI/Grace.CLI.fsproj
@@ -38,10 +38,10 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0-preview.6.24328.4" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="9.0.0-preview.6.24328.4" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-preview.6.24327.7" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.6.24327.7" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0-preview.7.24406.2" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="9.0.0-preview.7.24406.2" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-preview.7.24405.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.7.24405.7" />
 		<PackageReference Include="NodaTime" Version="3.1.11" />
 		<PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.2.0" />
 		<PackageReference Include="OpenTelemetry" Version="1.9.0" />
@@ -55,14 +55,14 @@
 		<PackageReference Include="Spectre.Console.Json" Version="0.49.1" />
 		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
 		<PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
-		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-preview.6.24327.7" />
+		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-preview.7.24405.7" />
 		<PackageReference Include="System.Reactive" Version="6.0.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Grace.SDK\Grace.SDK.fsproj" />
 		<ProjectReference Include="..\Grace.Shared\Grace.Shared.fsproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Update="FSharp.Core" Version="8.0.301" />
+		<PackageReference Update="FSharp.Core" Version="8.0.400" />
 	</ItemGroup>
 </Project>
diff --git a/src/Grace.Load/Grace.Load.fsproj b/src/Grace.Load/Grace.Load.fsproj
@@ -21,7 +21,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Update="FSharp.Core" Version="8.0.301" />
+		<PackageReference Update="FSharp.Core" Version="8.0.400" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/Grace.SDK/Grace.SDK.fsproj b/src/Grace.SDK/Grace.SDK.fsproj
@@ -27,8 +27,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Azure.Storage.Blobs" Version="12.21.1" />
-		<PackageReference Include="Dapr.Client" Version="1.13.1" />
+		<PackageReference Include="Azure.Storage.Blobs" Version="12.21.2" />
+		<PackageReference Include="Dapr.Client" Version="1.14.0" />
 		<PackageReference Include="Polly" Version="8.4.1" />
 	</ItemGroup>
 
@@ -37,7 +37,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Update="FSharp.Core" Version="8.0.301" />
+		<PackageReference Update="FSharp.Core" Version="8.0.400" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/Grace.Server.Tests/General.Server.Tests.fs b/src/Grace.Server.Tests/General.Server.Tests.fs
@@ -29,12 +29,14 @@ module Services =
     let graceServerPath = Path.Combine(Environment.CurrentDirectory, "..", "..", "..", "..", "Grace.Server")
 
     let graceServerAppId = "grace-server-integration-test"
+    let daprSchedulerContainerName = "dapr-scheduler-integration-test"
     let daprPlacementContainerName = "dapr-placement-integration-test"
     let zipkinContainerName = "zipkin-integration-test"
     let daprAppPort = "5002"
     let daprHttpPort = "3551"
     let daprGrpcPort = "50051"
     let daprPlacementPort = "6055"
+    let daprSchedulerPort = "6065"
     let zipkinPort = "9412"
 
     let numberOfRepositories = 3
@@ -99,6 +101,31 @@ type Setup() =
                     | _ -> ()
                 )
 
+                // Stop the Dapr scheduler container.
+                let daprSchedulerDockerArguments =
+                    [|
+                        "rm"
+                        daprSchedulerContainerName
+                        "--force"
+                    |]
+
+                let! daprSchedulerResult =
+                    Cli.Wrap(dockerExecutablePath)
+                        .WithArguments(daprSchedulerDockerArguments)
+                        .WithValidation(CommandResultValidation.None)
+                        .WithStandardOutputPipe(PipeTarget.ToStringBuilder(sbOutput))
+                        .WithStandardErrorPipe(PipeTarget.ToStringBuilder(sbError))
+                        .ExecuteBufferedAsync()
+
+                if daprSchedulerResult.ExitCode = 0 then
+                    logToTestConsole $"Dapr scheduler container stopped successfully. Output: {sbOutput}"
+                else
+                    let msg = $"Dapr scheduler container failed to stop. Exit code: {daprSchedulerResult.ExitCode}. Output: {sbOutput}. Error: {sbError}."
+                    logToTestConsole msg
+
+                sbOutput.Clear() |> ignore
+                sbError.Clear() |> ignore
+
                 // Stop the Dapr placement container.
                 let daprPlacementDockerArguments =
                     [|
@@ -166,14 +193,44 @@ type Setup() =
 
             do! this.DeleteContainers()
 
+            let daprSchedulerDockerRunArguments =
+                [|
+                    "run"
+                    "-d"
+                    "--name"; daprSchedulerContainerName
+                    "--restart"; "always"
+                    "-p"; $"{daprSchedulerPort}:50006"
+                    "daprio/dapr:1.14.1"
+                    "./scheduler"
+                    "--etcd-data-dir"; "/var/lock/dapr/scheduler"
+                |]
+
+            // Start the Dapr scheduler container.
+            let! daprSchedulerResult =
+                Cli.Wrap(dockerExecutablePath)
+                    .WithArguments(daprSchedulerDockerRunArguments)
+                    .WithStandardOutputPipe(PipeTarget.ToStringBuilder(sbOutput))
+                    .WithStandardErrorPipe(PipeTarget.ToStringBuilder(sbError))
+                    .WithValidation(CliWrap.CommandResultValidation.None)
+                    .ExecuteAsync()
+
+            if daprSchedulerResult.ExitCode = 0 then
+                logToTestConsole $"Dapr scheduler container started successfully. Output: {sbOutput}"
+            else
+                let msg = $"Dapr scheduler container failed to start. Exit code: {daprSchedulerResult.ExitCode}; Output: {sbOutput}; Error: {sbError}"
+                logToTestConsole msg
+
+            sbOutput.Clear() |> ignore
+            sbError.Clear() |> ignore
+
             let daprPlacementDockerRunArguments =
                 [|
                     "run"
                     "-d"
                     "--name"; daprPlacementContainerName
                     "--restart"; "always"
                     "-p"; $"{daprPlacementPort}:50005"
-                    "daprio/dapr:1.13.5"
+                    "daprio/dapr:1.14.1"
                     "./placement"
                     "--log-level"; "debug"
                     "--enable-metrics"
@@ -266,6 +323,7 @@ type Setup() =
                     "--log-level"; "debug"
                     "--enable-api-logging"
                     "--placement-host-address"; $"127.0.0.1:{daprPlacementPort}"
+                    "--scheduler-host-address"; $"127.0.0.1:{daprSchedulerPort}"
                     "--resources-path"; $"{daprComponentsPath}"
                     "--config"; $"{daprConfigFilePath}"
                     "--"

diff --git a/src/Grace.Server.Tests/Grace.Server.Tests.fsproj b/src/Grace.Server.Tests/Grace.Server.Tests.fsproj
@@ -23,11 +23,11 @@
 	<ItemGroup>
 		<PackageReference Include="FSharp.Control.TaskSeq" Version="0.4.0" />
 		<PackageReference Include="FsUnit" Version="6.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.6.24328.4" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.7.24406.2" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0-release-24373-02" />
 		<PackageReference Include="NUnit" Version="4.1.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-		<PackageReference Include="NUnit.Analyzers" Version="4.2.0">
+		<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -43,7 +43,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Update="FSharp.Core" Version="8.0.301" />
+		<PackageReference Update="FSharp.Core" Version="8.0.400" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/Grace.Server/Grace.Server.fsproj b/src/Grace.Server/Grace.Server.fsproj
@@ -64,25 +64,25 @@
 		<PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
 		<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
 		<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
-		<PackageReference Include="Azure.Storage.Blobs" Version="12.21.1" />
+		<PackageReference Include="Azure.Storage.Blobs" Version="12.21.2" />
 		<PackageReference Include="Azure.Storage.Blobs.Batch" Version="12.18.1" />
 		<PackageReference Include="FSharp.SystemTextJson" Version="1.3.13" />
-		<PackageReference Include="Giraffe" Version="6.4.0" />
-		<PackageReference Include="Dapr.Client" Version="1.13.1" />
-		<PackageReference Include="Dapr.AspNetCore" Version="1.13.1" />
-		<PackageReference Include="Dapr.Actors" Version="1.13.1" />
-		<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.13.1" />
-		<PackageReference Include="Dapr.Extensions.Configuration" Version="1.13.1" />
+		<PackageReference Include="Giraffe" Version="7.0.0" />
+		<PackageReference Include="Dapr.Client" Version="1.14.0" />
+		<PackageReference Include="Dapr.AspNetCore" Version="1.14.0" />
+		<PackageReference Include="Dapr.Actors" Version="1.14.0" />
+		<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.14.0" />
+		<PackageReference Include="Dapr.Extensions.Configuration" Version="1.14.0" />
 		<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.42.0" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.6.24327.7" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.7.24405.7" />
 		<!--<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="7.0.1">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>-->
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0-preview.6.24327.7" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.6.24327.7" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-preview.6.24327.7" />
-		<PackageReference Include="Microsoft.OpenApi" Version="1.6.16" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0-preview.7.24405.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.7.24405.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0-preview.7.24405.7" />
+		<PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
 		<PackageReference Include="OpenTelemetry" Version="1.9.0" />
 		<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
@@ -97,7 +97,7 @@
 		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.0" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Update="FSharp.Core" Version="8.0.301" />
+		<PackageReference Update="FSharp.Core" Version="8.0.400" />
 	</ItemGroup>
 	<ItemGroup>
 		<InternalsVisibleTo Include="Grace.Server.Tests" />

diff --git a/src/Grace.Server/Startup.Server.fs b/src/Grace.Server/Startup.Server.fs
@@ -400,7 +400,7 @@ module Application =
                 //.AddSingleton(Constants.JsonSerializerOptions)
 
                 // Next line adds the Json serializer that Giraffe uses internally.
-                .AddSingleton<Json.ISerializer>(SystemTextJson.Serializer(Constants.JsonSerializerOptions))
+                .AddSingleton<Json.ISerializer>(Json.Serializer(Constants.JsonSerializerOptions))
 
                 .AddHttpLogging(fun loggingOptions ->
                     loggingOptions.CombineLogs <- true

diff --git a/src/Grace.Shared/Grace.Shared.fsproj b/src/Grace.Shared/Grace.Shared.fsproj
@@ -54,8 +54,8 @@
 		<PackageReference Include="FSharp.Control.TaskSeq" Version="0.4.0" />
 		<PackageReference Include="FSharp.SystemTextJson" Version="1.3.13" />
 		<PackageReference Include="FSharpPlus" Version="1.6.1" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.6.24327.7" />
-		<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.6.24328.4" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.7.24405.7" />
+		<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.7.24406.2" />
 		<PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
 		<PackageReference Include="MimeTypes" Version="2.5.2">
 			<PrivateAssets>all</PrivateAssets>
@@ -69,7 +69,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Update="FSharp.Core" Version="8.0.301" />
+		<PackageReference Update="FSharp.Core" Version="8.0.400" />
 	</ItemGroup>
 
 </Project>