Skip to content

Commit 55895fa

Browse files
authored
Updated Dapr runtime/CLI version used in integration tests (#1485)
* Updated itests.yml to use latest 1.15 runtime and CLI versions over 1.14 versions * 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 <[email protected]>
1 parent c14fcea commit 55895fa

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

.github/workflows/itests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
GOOS: linux
4949
GOARCH: amd64
5050
GOPROXY: https://proxy.golang.org
51-
DAPR_CLI_VER: 1.14.0
52-
DAPR_RUNTIME_VER: 1.14.0
51+
DAPR_CLI_VER: 1.15.0
52+
DAPR_RUNTIME_VER: 1.15.3
5353
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.14/install/install.sh
5454
DAPR_CLI_REF: ''
5555
steps:

examples/AspNetCore/SecretStoreConfigurationProviderSample/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To load secrets into configuration call the _AddDaprSecretStore_ extension metho
2020
Use Dapr to run the application:
2121

2222
```shell
23-
dapr run --app-id SecretStoreConfigurationProviderSample --components-path ./components/ -- dotnet run
23+
dapr run --app-id SecretStoreConfigurationProviderSample --resources-path ./components/ -- dotnet run
2424
```
2525

2626
### 2. Test the application

examples/Client/ConfigurationApi/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ cd examples/Client/ConfigurationApi
147147
To run the `ConfigurationExample`, execute the following command:
148148

149149
```bash
150-
dapr run --app-id configexample --components-path ./Components -- dotnet run
150+
dapr run --app-id configexample --resources-path ./Components -- dotnet run
151151
```
152152

153153
### Get Configuration

examples/Client/DistributedLock/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cd examples/Client/DistributedLock
2424
In order to run the application that generates data for the workers to process, simply run the following command:
2525

2626
```bash
27-
dapr run --components-path ./Components --app-id generator -- dotnet run
27+
dapr run --resources-path ./Components --app-id generator -- dotnet run
2828
```
2929

3030
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
3333
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:
3434

3535
```bash
36-
dapr run --components-path ./Components --app-id worker --app-port 5000 -- dotnet run
37-
dapr run --components-path ./Components --app-id worker --app-port 5001 -- dotnet run
36+
dapr run --resources-path ./Components --app-id worker --app-port 5000 -- dotnet run
37+
dapr run --resources-path ./Components --app-id worker --app-port 5001 -- dotnet run
3838
```
3939

4040
After running the applications, they will attempt to process files. You should see output such as:

test/Dapr.E2E.Test/Actors/E2ETests.CustomSerializerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public async Task ActorCanSupportCustomSerializer()
9797
/// <see cref="ISerializationActor"/>. (it's defined in the base of it.)
9898
/// That why <see cref="ISerializationActor.AnotherMethod(DateTime)"/> was created,
9999
/// so there are now more then one method.
100-
/// </remark>
100+
/// </remarks>
101101
[Fact]
102102
public async Task ActorCanSupportCustomSerializerAndCallMoreThenOneDefinedMethod()
103103
{

test/Dapr.E2E.Test/DaprTestApp.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public DaprTestApp(ITestOutputHelper output, string appId)
4545
{
4646
var (appPort, httpPort, grpcPort, metricsPort) = GetFreePorts();
4747

48-
var componentsPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "components");
48+
var resourcesPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "components");
4949
var configPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "configuration", "featureconfig.yaml");
5050
var arguments = new List<string>()
5151
{
@@ -55,11 +55,10 @@ public DaprTestApp(ITestOutputHelper output, string appId)
5555
"--dapr-http-port", httpPort.ToString(CultureInfo.InvariantCulture),
5656
"--dapr-grpc-port", grpcPort.ToString(CultureInfo.InvariantCulture),
5757
"--metrics-port", metricsPort.ToString(CultureInfo.InvariantCulture),
58-
"--components-path", componentsPath,
58+
"--resources-path", resourcesPath,
5959
"--config", configPath,
6060
"--log-level", "debug",
61-
"--dapr-http-max-request-size", "32",
62-
61+
"--max-body-size", "8Mi"
6362
};
6463

6564
if (configuration.UseAppPort)

0 commit comments

Comments
 (0)