Skip to content

Commit eb7f05b

Browse files
Copilotaaronpowell
andcommitted
Fix sqlite-web integration to pass database filename as arg instead of env var
Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>
1 parent 303fb92 commit eb7f05b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/CommunityToolkit.Aspire.Hosting.Sqlite/SqliteResourceBuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static IResourceBuilder<SqliteResource> WithSqliteWeb(this IResourceBuild
7676
.WithImage(SqliteContainerImageTags.SqliteWebImage, SqliteContainerImageTags.SqliteWebTag)
7777
.WithImageRegistry(SqliteContainerImageTags.SqliteWebRegistry)
7878
.WithHttpEndpoint(targetPort: 8080, name: "http")
79-
.WithEnvironment(context => context.EnvironmentVariables.Add("SQLITE_DATABASE", builder.Resource.DatabaseFileName))
79+
.WithArgs(builder.Resource.DatabaseFileName)
8080
.WithBindMount(builder.Resource.DatabasePath, "/data")
8181
.WaitFor(builder)
8282
.WithHttpHealthCheck("/")

tests/CommunityToolkit.Aspire.Hosting.Sqlite.Tests/AddSqliteTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ public async Task SqliteWebResourceConfigured()
120120
Assert.Equal(SqliteContainerImageTags.SqliteWebTag, imageAnnotation.Tag);
121121
Assert.Equal(SqliteContainerImageTags.SqliteWebRegistry, imageAnnotation.Registry);
122122

123-
var env = await sqliteWeb.GetEnvironmentVariableValuesAsync();
124-
var envVar = Assert.Single(env);
125-
Assert.Equal("SQLITE_DATABASE", envVar.Key);
126-
Assert.Equal(sqlite.Resource.DatabaseFileName, envVar.Value);
123+
Assert.True(sqliteWeb.TryGetLastAnnotation(out CommandLineArgsCallbackAnnotation? argsAnnotation));
124+
CommandLineArgsCallbackContext argsContext = new([]);
125+
await argsAnnotation.Callback(argsContext);
126+
Assert.Contains(sqlite.Resource.DatabaseFileName, argsContext.Args);
127127

128128
Assert.True(sqliteWeb.TryGetAnnotationsOfType<ContainerMountAnnotation>(out var bindMountAnnotations));
129129
var bindMountAnnotation = Assert.Single(bindMountAnnotations);

0 commit comments

Comments
 (0)