Skip to content

Update to Aspire 9.4 #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronpowell merged 11 commits into from
Jul 30, 2025
Merged

Update to Aspire 9.4 #770

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4ed5755
Update packages for Aspire 9.4
aaronpowell Jul 30, 2025
91cddc3
Fixing the usage of the GetValueAsync on ParameterResource
aaronpowell Jul 30, 2025
3ebd577
Using the new event callback model
aaronpowell Jul 30, 2025
e3b376e
More incorrect parameter usage
aaronpowell Jul 30, 2025
0c55b35
Fixing dapr tests
aaronpowell Jul 30, 2025
87180ae
Using an available cancellation token
aaronpowell Jul 30, 2025
47b3f6b
Fixing handling of async values in adminer serialization
aaronpowell Jul 30, 2025
d13c66c
Fixing dapr tests with Bicep changes from new packages
aaronpowell Jul 30, 2025
b66596c
Some how MinIO was dropped from the slnx
aaronpowell Jul 30, 2025
8e62285
Missed a test project for MinIO
aaronpowell Jul 30, 2025
8f30c88
Fixing dbgate test
aaronpowell Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing dapr tests
  • Loading branch information
@aaronpowell
aaronpowell committed Jul 30, 2025
commit 0c55b35a3a23a661dc3ef085d93edfe92addcb17
188 changes: 94 additions & 94 deletions tests/CommunityToolkit.Aspire.Hosting.Azure.Dapr.Tests/ResourceCreationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,73 +8,73 @@ namespace CommunityToolkit.Aspire.Hosting.Dapr.AzureExtensions.Tests;

public class ResourceCreationTests
{
[Fact]
public void AddAzureDaprResource_AddsToAppBuilder()
{
var builder = DistributedApplication.CreateBuilder();
[Fact]
public void AddAzureDaprResource_AddsToAppBuilder()
{
var builder = DistributedApplication.CreateBuilder();

var daprStateBuilder = builder.AddDaprStateStore("statestore")
.AddAzureDaprResource("AzureDaprResource", _ =>
{
// no-op
});
var daprStateBuilder = builder.AddDaprStateStore("statestore")
.AddAzureDaprResource("AzureDaprResource", _ =>
{
// no-op
});

using var app = builder.Build();
using var app = builder.Build();

var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();

var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());
var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());

}
}

[Fact]
public void CreateDaprComponent_ReturnsPopulatedComponent()
{
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");
[Fact]
public void CreateDaprComponent_ReturnsPopulatedComponent()
{
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");

Assert.NotNull(daprResource);
Assert.Equal("daprComponent", daprResource.BicepIdentifier);
Assert.Equal("state.redis", daprResource.ComponentType.Value);
Assert.Equal("v1", daprResource.Version.Value);
}
Assert.NotNull(daprResource);
Assert.Equal("daprComponent", daprResource.BicepIdentifier);
Assert.Equal("state.redis", daprResource.ComponentType.Value);
Assert.Equal("v1", daprResource.Version.Value);
}

[Fact]
public void GetInfrastructureConfigurationAction_ComponentNameCanBeOverwritten()
{
using var builder = TestDistributedApplicationBuilder.Create();
[Fact]
public void GetInfrastructureConfigurationAction_ComponentNameCanBeOverwritten()
{
using var builder = TestDistributedApplicationBuilder.Create();

var redisHost = new ProvisioningParameter("daprConnectionString", typeof(string));
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");
var redisHost = new ProvisioningParameter("daprConnectionString", typeof(string));
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");

daprResource.Name = "myDaprComponent";
daprResource.Name = "myDaprComponent";

var azureDaprResourceBuilder = builder.AddDaprStateStore("daprState");
var azureDaprResourceBuilder = builder.AddDaprStateStore("daprState");

var configureInfrastructure = azureDaprResourceBuilder.GetInfrastructureConfigurationAction(daprResource, [redisHost]);
var configureInfrastructure = azureDaprResourceBuilder.GetInfrastructureConfigurationAction(daprResource, [redisHost]);

azureDaprResourceBuilder.AddAzureDaprResource("AzureDaprResource", configureInfrastructure);
azureDaprResourceBuilder.AddAzureDaprResource("AzureDaprResource", configureInfrastructure);

using var app = builder.Build();
using var app = builder.Build();

var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();

var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());
var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());

string bicepTemplate = resource.GetBicepTemplateString();
string bicepTemplate = resource.GetBicepTemplateString();

string expectedBicep = $$"""
string expectedBicep = $$"""
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param daprConnectionString string

var resourceToken = uniqueString(resourceGroup().id)

resource containerAppEnvironment 'Microsoft.App/managedEnvironments@2024-03-01' existing = {
resource containerAppEnvironment 'Microsoft.App/managedEnvironments@2025-01-01' existing = {
name: 'cae-${resourceToken}'
}

resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2024-03-01' = {
resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2025-01-01' = {
name: 'myDaprComponent'
properties: {
componentType: 'state.redis'
Expand All @@ -84,44 +84,44 @@ param daprConnectionString string
}
""";

Assert.Equal(expectedBicep, bicepTemplate);
}
Assert.Equal(expectedBicep.ReplaceLineEndings(), bicepTemplate.ReplaceLineEndings());
}

[Fact]
public void GetInfrastructureConfigurationAction_AddsContainerAppEnv_AndDaprComponent_AndParametersAsync()
{
using var builder = TestDistributedApplicationBuilder.Create();
[Fact]
public void GetInfrastructureConfigurationAction_AddsContainerAppEnv_AndDaprComponent_AndParametersAsync()
{
using var builder = TestDistributedApplicationBuilder.Create();

var redisHost = new ProvisioningParameter("daprConnectionString", typeof(string));
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");
var redisHost = new ProvisioningParameter("daprConnectionString", typeof(string));
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");

var azureDaprResourceBuilder = builder.AddDaprStateStore("daprState");
var azureDaprResourceBuilder = builder.AddDaprStateStore("daprState");

var configureInfrastructure = azureDaprResourceBuilder.GetInfrastructureConfigurationAction(daprResource, [redisHost]);
var configureInfrastructure = azureDaprResourceBuilder.GetInfrastructureConfigurationAction(daprResource, [redisHost]);

azureDaprResourceBuilder.AddAzureDaprResource("AzureDaprResource", configureInfrastructure);
azureDaprResourceBuilder.AddAzureDaprResource("AzureDaprResource", configureInfrastructure);

using var app = builder.Build();
using var app = builder.Build();

var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();

var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());
var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());

string bicepTemplate = resource.GetBicepTemplateString();
string bicepTemplate = resource.GetBicepTemplateString();

string expectedBicep = $$"""
string expectedBicep = $$"""
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param daprConnectionString string

var resourceToken = uniqueString(resourceGroup().id)

resource containerAppEnvironment 'Microsoft.App/managedEnvironments@2024-03-01' existing = {
resource containerAppEnvironment 'Microsoft.App/managedEnvironments@2025-01-01' existing = {
name: 'cae-${resourceToken}'
}

resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2024-03-01' = {
resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2025-01-01' = {
name: 'componentName'
properties: {
componentType: 'state.redis'
Expand All @@ -131,41 +131,41 @@ param daprConnectionString string
}
""";

Assert.Equal(expectedBicep, bicepTemplate);
}
Assert.Equal(expectedBicep.ReplaceLineEndings(), bicepTemplate.ReplaceLineEndings());
}

[Fact]
public void GetInfrastructureConfigurationAction_HandlesNullParameters()
{
using var builder = TestDistributedApplicationBuilder.Create();
[Fact]
public void GetInfrastructureConfigurationAction_HandlesNullParameters()
{
using var builder = TestDistributedApplicationBuilder.Create();

var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");

var azureDaprResourceBuilder = builder.AddDaprStateStore("statestore");
var azureDaprResourceBuilder = builder.AddDaprStateStore("statestore");

var configureInfrastructure = azureDaprResourceBuilder.GetInfrastructureConfigurationAction(daprResource);
var configureInfrastructure = azureDaprResourceBuilder.GetInfrastructureConfigurationAction(daprResource);

azureDaprResourceBuilder.AddAzureDaprResource("AzureDaprResource", configureInfrastructure);
azureDaprResourceBuilder.AddAzureDaprResource("AzureDaprResource", configureInfrastructure);

using var app = builder.Build();
using var app = builder.Build();

var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();

var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());
var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());

string bicepTemplate = resource.GetBicepTemplateString();
string bicepTemplate = resource.GetBicepTemplateString();

string expectedBicep = $$"""
string expectedBicep = $$"""
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

var resourceToken = uniqueString(resourceGroup().id)

resource containerAppEnvironment 'Microsoft.App/managedEnvironments@2024-03-01' existing = {
resource containerAppEnvironment 'Microsoft.App/managedEnvironments@2025-01-01' existing = {
name: 'cae-${resourceToken}'
}

resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2024-03-01' = {
resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2025-01-01' = {
name: 'componentName'
properties: {
componentType: 'state.redis'
Expand All @@ -175,32 +175,32 @@ public void GetInfrastructureConfigurationAction_HandlesNullParameters()
}
""";

Assert.Equal(expectedBicep, bicepTemplate);
}
Assert.Equal(expectedBicep.ReplaceLineEndings(), bicepTemplate.ReplaceLineEndings());
}

[Fact]
public void ConfigureKeyVaultSecretsComponent_AddsKeyVaultSecretsComponent()
{
using var builder = TestDistributedApplicationBuilder.Create();
[Fact]
public void ConfigureKeyVaultSecretsComponent_AddsKeyVaultSecretsComponent()
{
using var builder = TestDistributedApplicationBuilder.Create();

var redisHost = new ProvisioningParameter("daprConnectionString", typeof(string));
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");
var redisHost = new ProvisioningParameter("daprConnectionString", typeof(string));
var daprResource = AzureDaprHostingExtensions.CreateDaprComponent("daprComponent", "componentName", "state.redis", "v1");

var keyVaultName = new ProvisioningParameter(AzureBicepResource.KnownParameters.KeyVaultName, typeof(string));
var keyVaultName = new ProvisioningParameter("keyVaultName", typeof(string));


var azureDaprResourceBuilder = builder.AddDaprStateStore("statestore")
.ConfigureKeyVaultSecretsComponent(keyVaultName);
var azureDaprResourceBuilder = builder.AddDaprStateStore("statestore")
.ConfigureKeyVaultSecretsComponent(keyVaultName);

using var app = builder.Build();
using var app = builder.Build();

var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();

var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());
var resource = Assert.Single(appModel.Resources.OfType<AzureDaprComponentResource>());

string bicepTemplate = resource.GetBicepTemplateString();
string bicepTemplate = resource.GetBicepTemplateString();

string expectedBicep = $$"""
string expectedBicep = $$"""
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

Expand All @@ -210,11 +210,11 @@ param keyVaultName string

var resourceToken = uniqueString(resourceGroup().id)

resource containerAppEnvironment 'Microsoft.App/managedEnvironments@2024-03-01' existing = {
resource containerAppEnvironment 'Microsoft.App/managedEnvironments@2025-01-01' existing = {
name: 'cae-${resourceToken}'
}

resource secretStore 'Microsoft.App/managedEnvironments/daprComponents@2024-03-01' = {
resource secretStore 'Microsoft.App/managedEnvironments/daprComponents@2025-01-01' = {
name: 'statestore-secretstore'
properties: {
componentType: 'secretstores.azure.keyvault'
Expand All @@ -236,8 +236,8 @@ param keyVaultName string
output secretStoreComponent string = 'statestore-secretstore'
""";

Assert.Equal(expectedBicep, bicepTemplate);
}
Assert.Equal(expectedBicep.ReplaceLineEndings(), bicepTemplate.ReplaceLineEndings());
}


}
Expand Down
Loading