Skip to content

Commit b66596c

Browse files
aaronpowellaaronpowell
committed
Some how MinIO was dropped from the slnx
1 parent d13c66c commit b66596c

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

‎CommunityToolkit.Aspire.slnx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@
8181
<Project Path="examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost.csproj" />
8282
<Project Path="examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.ServiceDefaults/CommunityToolkit.Aspire.Hosting.Meilisearch.ServiceDefaults.csproj" />
8383
</Folder>
84+
<Folder Name="/examples/minio/">
85+
<Project Path="examples/minio/CommunityToolkit.Aspire.Hosting.Minio.ApiService/CommunityToolkit.Aspire.Hosting.Minio.ApiService.csproj" />
86+
<Project Path="examples/minio/CommunityToolkit.Aspire.Hosting.Minio.AppHost/CommunityToolkit.Aspire.Hosting.Minio.AppHost.csproj" />
87+
<Project Path="examples/minio/CommunityToolkit.Aspire.Hosting.Minio.ServiceDefaults/CommunityToolkit.Aspire.Hosting.Minio.ServiceDefaults.csproj" />
88+
</Folder>
8489
<Folder Name="/examples/mongodb-ext/">
8590
<Project Path="examples/mongodb-ext/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost.csproj" />
8691
</Folder>
@@ -161,6 +166,7 @@
161166
<Project Path="src/CommunityToolkit.Aspire.Hosting.MailPit/CommunityToolkit.Aspire.Hosting.MailPit.csproj" />
162167
<Project Path="src/CommunityToolkit.Aspire.Hosting.McpInspector/CommunityToolkit.Aspire.Hosting.McpInspector.csproj" />
163168
<Project Path="src/CommunityToolkit.Aspire.Hosting.Meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.csproj" />
169+
<Project Path="src/CommunityToolkit.Aspire.Hosting.Minio/CommunityToolkit.Aspire.Hosting.Minio.csproj" />
164170
<Project Path="src/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.csproj" />
165171
<Project Path="src/CommunityToolkit.Aspire.Hosting.MySql.Extensions/CommunityToolkit.Aspire.Hosting.MySql.Extensions.csproj" />
166172
<Project Path="src/CommunityToolkit.Aspire.Hosting.Ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.csproj" />
@@ -181,6 +187,7 @@
181187
<Project Path="src/CommunityToolkit.Aspire.Meilisearch/CommunityToolkit.Aspire.Meilisearch.csproj" />
182188
<Project Path="src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj" />
183189
<Project Path="src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj" />
190+
<Project Path="src/CommunityToolkit.Aspire.Minio.Client/CommunityToolkit.Aspire.Minio.Client.csproj" />
184191
<Project Path="src/CommunityToolkit.Aspire.OllamaSharp/CommunityToolkit.Aspire.OllamaSharp.csproj" />
185192
<Project Path="src/CommunityToolkit.Aspire.RavenDB.Client/CommunityToolkit.Aspire.RavenDB.Client.csproj" />
186193
<Project Path="src/CommunityToolkit.Aspire.SurrealDb/CommunityToolkit.Aspire.SurrealDb.csproj" />
@@ -208,6 +215,7 @@
208215
<Project Path="tests/CommunityToolkit.Aspire.Hosting.MailPit.Tests/CommunityToolkit.Aspire.Hosting.MailPit.Tests.csproj" />
209216
<Project Path="tests/CommunityToolkit.Aspire.Hosting.McpInspector.Tests/CommunityToolkit.Aspire.Hosting.McpInspector.Tests.csproj" />
210217
<Project Path="tests/CommunityToolkit.Aspire.Hosting.Meilisearch.Tests/CommunityToolkit.Aspire.Hosting.Meilisearch.Tests.csproj" />
218+
<Project Path="tests/CommunityToolkit.Aspire.Hosting.Minio.Tests/CommunityToolkit.Aspire.Hosting.Minio.Tests.csproj" />
211219
<Project Path="tests/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.Tests/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.Tests.csproj" />
212220
<Project Path="tests/CommunityToolkit.Aspire.Hosting.MySql.Extensions.Tests/CommunityToolkit.Aspire.Hosting.MySql.Extensions.Tests.csproj" />
213221
<Project Path="tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests.csproj" />

‎tests/CommunityToolkit.Aspire.Hosting.Minio.Tests/MinioFunctionalTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public async Task StorageGetsCreatedAndUsable()
1919

2020
var passwordParameter = ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(distributedApplicationBuilder,
2121
$"rootPassword");
22-
distributedApplicationBuilder.Configuration["Parameters:rootPassword"] = passwordParameter.Value;
22+
distributedApplicationBuilder.Configuration["Parameters:rootPassword"] = await passwordParameter.GetValueAsync(default);
2323
var rootPasswordParameter = distributedApplicationBuilder.AddParameter(passwordParameter.Name);
2424

2525
var minio = distributedApplicationBuilder
@@ -39,9 +39,9 @@ public async Task StorageGetsCreatedAndUsable()
3939

4040
var webApplicationBuilder = Host.CreateApplicationBuilder();
4141

42-
webApplicationBuilder.Services.AddMinio(configureClient => configureClient
42+
webApplicationBuilder.Services.AddMinio(async configureClient => configureClient
4343
.WithEndpoint("localhost", minioEndpoint.Port)
44-
.WithCredentials(rootUser, passwordParameter.Value)
44+
.WithCredentials(rootUser, await passwordParameter.GetValueAsync(default))
4545
.WithSSL(false)
4646
.Build());
4747

@@ -70,7 +70,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
7070

7171
var passwordParameter = ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder1,
7272
$"rootPassword");
73-
builder1.Configuration["Parameters:rootPassword"] = passwordParameter.Value;
73+
builder1.Configuration["Parameters:rootPassword"] = await passwordParameter.GetValueAsync(default);
7474
var rootPasswordParameter = builder1.AddParameter(passwordParameter.Name);
7575

7676
var minio1 = builder1.AddMinioContainer("minio",
@@ -106,9 +106,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
106106
{
107107
var webApplicationBuilder = Host.CreateApplicationBuilder();
108108

109-
webApplicationBuilder.Services.AddMinio(configureClient => configureClient
109+
webApplicationBuilder.Services.AddMinio(async configureClient => configureClient
110110
.WithEndpoint("localhost", minio1Endpoint.Port)
111-
.WithCredentials(rootUser, passwordParameter.Value)
111+
.WithCredentials(rootUser, await passwordParameter.GetValueAsync(default))
112112
.WithSSL(false)
113113
.Build());
114114

@@ -127,7 +127,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
127127
}
128128

129129
using var builder2 = TestDistributedApplicationBuilder.Create(testOutputHelper);
130-
builder2.Configuration["Parameters:rootPassword"] = passwordParameter.Value;
130+
builder2.Configuration["Parameters:rootPassword"] = await passwordParameter.GetValueAsync(default);
131131
var rootPasswordParameter2 = builder2.AddParameter(passwordParameter.Name);
132132

133133

@@ -159,9 +159,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
159159
{
160160
var webApplicationBuilder = Host.CreateApplicationBuilder();
161161

162-
webApplicationBuilder.Services.AddMinio(configureClient => configureClient
162+
webApplicationBuilder.Services.AddMinio(async configureClient => configureClient
163163
.WithEndpoint("localhost", minio2Endpoint.Port)
164-
.WithCredentials(rootUser, passwordParameter.Value)
164+
.WithCredentials(rootUser, await passwordParameter.GetValueAsync(default))
165165
.WithSSL(false)
166166
.Build());
167167

‎tests/CommunityToolkit.Aspire.Hosting.Minio.Tests/MinioPublicApiTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@ public async Task VerifyMinioContainerResourceWithUserName()
106106
.WithEndpoint("http", e => e.AllocatedEndpoint = new AllocatedEndpoint(e, "localhost", 2000));
107107

108108
var connectionString = await postgres.Resource.GetConnectionStringAsync();
109-
Assert.Equal($"Endpoint=http://localhost:2000;AccessKey=user1;SecretKey={postgres.Resource.PasswordParameter.Value}", connectionString);
109+
Assert.Equal($"Endpoint=http://localhost:2000;AccessKey=user1;SecretKey={await postgres.Resource.PasswordParameter.GetValueAsync(default)}", connectionString);
110110
}
111111
}

0 commit comments

Comments
 (0)