From 303fb92342b1fefe1995741e6ca6a63ba2b2c63b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 15 Dec 2025 05:15:04 +0000 Subject: [PATCH 1/2] Initial plan From eb7f05bff884931367d4cb14e53a3b49465c925b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 15 Dec 2025 05:23:54 +0000 Subject: [PATCH 2/2] Fix sqlite-web integration to pass database filename as arg instead of env var Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> --- .../SqliteResourceBuilderExtensions.cs | 2 +- .../AddSqliteTests.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CommunityToolkit.Aspire.Hosting.Sqlite/SqliteResourceBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.Sqlite/SqliteResourceBuilderExtensions.cs index 8b86be724..90c20d3f8 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Sqlite/SqliteResourceBuilderExtensions.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Sqlite/SqliteResourceBuilderExtensions.cs @@ -76,7 +76,7 @@ public static IResourceBuilder WithSqliteWeb(this IResourceBuild .WithImage(SqliteContainerImageTags.SqliteWebImage, SqliteContainerImageTags.SqliteWebTag) .WithImageRegistry(SqliteContainerImageTags.SqliteWebRegistry) .WithHttpEndpoint(targetPort: 8080, name: "http") - .WithEnvironment(context => context.EnvironmentVariables.Add("SQLITE_DATABASE", builder.Resource.DatabaseFileName)) + .WithArgs(builder.Resource.DatabaseFileName) .WithBindMount(builder.Resource.DatabasePath, "/data") .WaitFor(builder) .WithHttpHealthCheck("/") diff --git a/tests/CommunityToolkit.Aspire.Hosting.Sqlite.Tests/AddSqliteTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Sqlite.Tests/AddSqliteTests.cs index c521a4cf0..b81a86d18 100644 --- a/tests/CommunityToolkit.Aspire.Hosting.Sqlite.Tests/AddSqliteTests.cs +++ b/tests/CommunityToolkit.Aspire.Hosting.Sqlite.Tests/AddSqliteTests.cs @@ -120,10 +120,10 @@ public async Task SqliteWebResourceConfigured() Assert.Equal(SqliteContainerImageTags.SqliteWebTag, imageAnnotation.Tag); Assert.Equal(SqliteContainerImageTags.SqliteWebRegistry, imageAnnotation.Registry); - var env = await sqliteWeb.GetEnvironmentVariableValuesAsync(); - var envVar = Assert.Single(env); - Assert.Equal("SQLITE_DATABASE", envVar.Key); - Assert.Equal(sqlite.Resource.DatabaseFileName, envVar.Value); + Assert.True(sqliteWeb.TryGetLastAnnotation(out CommandLineArgsCallbackAnnotation? argsAnnotation)); + CommandLineArgsCallbackContext argsContext = new([]); + await argsAnnotation.Callback(argsContext); + Assert.Contains(sqlite.Resource.DatabaseFileName, argsContext.Args); Assert.True(sqliteWeb.TryGetAnnotationsOfType(out var bindMountAnnotations)); var bindMountAnnotation = Assert.Single(bindMountAnnotations);