From 5b6746455e0a9f7f860160bdde3d9b951ee1846b Mon Sep 17 00:00:00 2001 From: Whit Waldo Date: Sun, 16 Mar 2025 19:47:00 -0500 Subject: [PATCH 1/6] Updated itests.yml to use latest 1.15 runtime and CLI versions over 1.14 versions Signed-off-by: Whit Waldo --- .github/workflows/itests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/itests.yml b/.github/workflows/itests.yml index 4dcdfb951..0c96fa9ca 100644 --- a/.github/workflows/itests.yml +++ b/.github/workflows/itests.yml @@ -48,8 +48,8 @@ jobs: GOOS: linux GOARCH: amd64 GOPROXY: https://proxy.golang.org - DAPR_CLI_VER: 1.14.0 - DAPR_RUNTIME_VER: 1.14.0 + DAPR_CLI_VER: 1.15.0 + DAPR_RUNTIME_VER: 1.15.3 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.14/install/install.sh DAPR_CLI_REF: '' steps: From fce125b0fc0b7e84a535c84315b80aef01ab4f8f Mon Sep 17 00:00:00 2001 From: Whit Waldo Date: Sun, 16 Mar 2025 19:50:36 -0500 Subject: [PATCH 2/6] Updated CLI argument name as `dapr-http-max-request-size` was changed in a recent update included in the CLI Signed-off-by: Whit Waldo --- test/Dapr.E2E.Test/DaprTestApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Dapr.E2E.Test/DaprTestApp.cs b/test/Dapr.E2E.Test/DaprTestApp.cs index 2330785d8..66ada8477 100644 --- a/test/Dapr.E2E.Test/DaprTestApp.cs +++ b/test/Dapr.E2E.Test/DaprTestApp.cs @@ -58,7 +58,7 @@ public DaprTestApp(ITestOutputHelper output, string appId) "--components-path", componentsPath, "--config", configPath, "--log-level", "debug", - "--dapr-http-max-request-size", "32", + "--max-body-size", "32", }; From e321d445ba43152654d86429ad17e764bbef5bfb Mon Sep 17 00:00:00 2001 From: Whit Waldo Date: Sun, 16 Mar 2025 19:50:53 -0500 Subject: [PATCH 3/6] Removed unnecessary empty line in file Signed-off-by: Whit Waldo --- test/Dapr.E2E.Test/DaprTestApp.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/Dapr.E2E.Test/DaprTestApp.cs b/test/Dapr.E2E.Test/DaprTestApp.cs index 66ada8477..8e72a1e5a 100644 --- a/test/Dapr.E2E.Test/DaprTestApp.cs +++ b/test/Dapr.E2E.Test/DaprTestApp.cs @@ -58,8 +58,7 @@ public DaprTestApp(ITestOutputHelper output, string appId) "--components-path", componentsPath, "--config", configPath, "--log-level", "debug", - "--max-body-size", "32", - + "--max-body-size", "32" }; if (configuration.UseAppPort) From f4ba6b70602ffc3a3a8889ebd596e789bdf9d7f5 Mon Sep 17 00:00:00 2001 From: Whit Waldo Date: Sun, 16 Mar 2025 19:56:07 -0500 Subject: [PATCH 4/6] Updated to use '--resources-path' instead of the now-deprected '--components-path' Signed-off-by: Whit Waldo --- .../SecretStoreConfigurationProviderSample/README.md | 2 +- examples/Client/ConfigurationApi/README.md | 2 +- examples/Client/DistributedLock/README.md | 6 +++--- test/Dapr.E2E.Test/DaprTestApp.cs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/AspNetCore/SecretStoreConfigurationProviderSample/README.md b/examples/AspNetCore/SecretStoreConfigurationProviderSample/README.md index 09422e474..a5d60c2fa 100644 --- a/examples/AspNetCore/SecretStoreConfigurationProviderSample/README.md +++ b/examples/AspNetCore/SecretStoreConfigurationProviderSample/README.md @@ -20,7 +20,7 @@ To load secrets into configuration call the _AddDaprSecretStore_ extension metho Use Dapr to run the application: ```shell -dapr run --app-id SecretStoreConfigurationProviderSample --components-path ./components/ -- dotnet run +dapr run --app-id SecretStoreConfigurationProviderSample --resources-path ./components/ -- dotnet run ``` ### 2. Test the application diff --git a/examples/Client/ConfigurationApi/README.md b/examples/Client/ConfigurationApi/README.md index 7425a780a..d73a29f9f 100644 --- a/examples/Client/ConfigurationApi/README.md +++ b/examples/Client/ConfigurationApi/README.md @@ -147,7 +147,7 @@ cd examples/Client/ConfigurationApi To run the `ConfigurationExample`, execute the following command: ```bash -dapr run --app-id configexample --components-path ./Components -- dotnet run +dapr run --app-id configexample --resources-path ./Components -- dotnet run ``` ### Get Configuration diff --git a/examples/Client/DistributedLock/README.md b/examples/Client/DistributedLock/README.md index cdac6f91a..6a1af3b34 100644 --- a/examples/Client/DistributedLock/README.md +++ b/examples/Client/DistributedLock/README.md @@ -24,7 +24,7 @@ cd examples/Client/DistributedLock In order to run the application that generates data for the workers to process, simply run the following command: ```bash -dapr run --components-path ./Components --app-id generator -- dotnet run +dapr run --resources-path ./Components --app-id generator -- dotnet run ``` This application will create a new file to process once every 10 seconds. The files are stored in `DistributedLock/tmp`. @@ -33,8 +33,8 @@ This application will create a new file to process once every 10 seconds. The fi In order to properly demonstrate locking, this application will be run more than once with the same App ID. However, the applications do need different ports in order to properly receive bindings. Run them with the command below: ```bash -dapr run --components-path ./Components --app-id worker --app-port 5000 -- dotnet run -dapr run --components-path ./Components --app-id worker --app-port 5001 -- dotnet run +dapr run --resources-path ./Components --app-id worker --app-port 5000 -- dotnet run +dapr run --resources-path ./Components --app-id worker --app-port 5001 -- dotnet run ``` After running the applications, they will attempt to process files. You should see output such as: diff --git a/test/Dapr.E2E.Test/DaprTestApp.cs b/test/Dapr.E2E.Test/DaprTestApp.cs index 8e72a1e5a..fdbcee9b5 100644 --- a/test/Dapr.E2E.Test/DaprTestApp.cs +++ b/test/Dapr.E2E.Test/DaprTestApp.cs @@ -45,7 +45,7 @@ public DaprTestApp(ITestOutputHelper output, string appId) { var (appPort, httpPort, grpcPort, metricsPort) = GetFreePorts(); - var componentsPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "components"); + var resourcesPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "components"); var configPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "configuration", "featureconfig.yaml"); var arguments = new List() { @@ -55,7 +55,7 @@ public DaprTestApp(ITestOutputHelper output, string appId) "--dapr-http-port", httpPort.ToString(CultureInfo.InvariantCulture), "--dapr-grpc-port", grpcPort.ToString(CultureInfo.InvariantCulture), "--metrics-port", metricsPort.ToString(CultureInfo.InvariantCulture), - "--components-path", componentsPath, + "--resources-path", resourcesPath, "--config", configPath, "--log-level", "debug", "--max-body-size", "32" From 4a9ea88a4e3e1b5812a6b31c08443241c7d911f7 Mon Sep 17 00:00:00 2001 From: Whit Waldo Date: Sun, 16 Mar 2025 20:04:56 -0500 Subject: [PATCH 5/6] Fixed malformed XML comment Signed-off-by: Whit Waldo --- test/Dapr.E2E.Test/Actors/E2ETests.CustomSerializerTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Dapr.E2E.Test/Actors/E2ETests.CustomSerializerTests.cs b/test/Dapr.E2E.Test/Actors/E2ETests.CustomSerializerTests.cs index 5a20fff3d..26f01fb5a 100644 --- a/test/Dapr.E2E.Test/Actors/E2ETests.CustomSerializerTests.cs +++ b/test/Dapr.E2E.Test/Actors/E2ETests.CustomSerializerTests.cs @@ -97,7 +97,7 @@ public async Task ActorCanSupportCustomSerializer() /// . (it's defined in the base of it.) /// That why was created, /// so there are now more then one method. - /// + /// [Fact] public async Task ActorCanSupportCustomSerializerAndCallMoreThenOneDefinedMethod() { From cf310f7c8a29e00361d969f97931e9de14e939f4 Mon Sep 17 00:00:00 2001 From: Whit Waldo Date: Sun, 16 Mar 2025 20:05:15 -0500 Subject: [PATCH 6/6] Updated max body size to use a significantly larger size Signed-off-by: Whit Waldo --- test/Dapr.E2E.Test/DaprTestApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Dapr.E2E.Test/DaprTestApp.cs b/test/Dapr.E2E.Test/DaprTestApp.cs index fdbcee9b5..8776a43d5 100644 --- a/test/Dapr.E2E.Test/DaprTestApp.cs +++ b/test/Dapr.E2E.Test/DaprTestApp.cs @@ -58,7 +58,7 @@ public DaprTestApp(ITestOutputHelper output, string appId) "--resources-path", resourcesPath, "--config", configPath, "--log-level", "debug", - "--max-body-size", "32" + "--max-body-size", "8Mi" }; if (configuration.UseAppPort)