Skip to content

Hosting.Keycloak: Fix importDirectory param validation in WithRealmImport #5220

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
merged 13 commits into from
Aug 14, 2024
Merged

Hosting.Keycloak: Fix importDirectory param validation in WithRealmImport #5220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
972f9a9
Hosting.KeyCloak: Remove incorrect param check on `WithRealmImport`
radical Aug 9, 2024
1a1639b
Merge remote-tracking branch 'origin/main' into fix-hosting-testing-cwd
radical Aug 9, 2024
e13227c
revert test changes
radical Aug 9, 2024
ac3dbc4
[tests] Add Keycloak playground app to tests
radical Aug 9, 2024
ae522b4
Add test for WithRealmImport, and use the full path for directory-exi…
radical Aug 9, 2024
ad0f520
Merge remote-tracking branch 'origin/main' into fix-hosting-testing-cwd
radical Aug 9, 2024
a09d8af
fix path
radical Aug 9, 2024
2be471b
Add missing packageVersion
radical Aug 9, 2024
08c1714
Add Aspire.Hosting.Keycloak
radical Aug 10, 2024
eda8c99
Update KeycloakResourceBuilderExtensions.cs
radical Aug 12, 2024
7dd3695
Merge remote-tracking branch 'origin/main' into fix-hosting-testing-cwd
radical Aug 13, 2024
ac2d9fd
Update src/Aspire.Hosting.Keycloak/KeycloakResourceBuilderExtensions.cs
radical Aug 13, 2024
81f982d
Merge branch 'main' into fix-hosting-testing-cwd
radical Aug 13, 2024
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
7 changes: 4 additions & 3 deletions src/Aspire.Hosting.Keycloak/KeycloakResourceBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,13 @@ public static IResourceBuilder<KeycloakResource> WithRealmImport(
ArgumentNullException.ThrowIfNull(builder);
ArgumentNullException.ThrowIfNull(importDirectory);

if (!Directory.Exists(importDirectory))
var importDirectoryFullPath = Path.GetFullPath(importDirectory, builder.ApplicationBuilder.AppHostDirectory);
if (!Directory.Exists(importDirectoryFullPath))
{
throw new DirectoryNotFoundException($"The realm import directory {importDirectory} does not exist.");
throw new DirectoryNotFoundException($"The realm import directory '{importDirectoryFullPath}' does not exist.");
}

builder.WithBindMount(importDirectory, RealmImportDirectory, isReadOnly);
builder.WithBindMount(importDirectoryFullPath, RealmImportDirectory, isReadOnly);

return builder;
}
Expand Down
11 changes: 11 additions & 0 deletions tests/Aspire.Hosting.Keycloak.Tests/KeycloakPublicApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,15 @@ public void WithRealmImportShouldThrowWhenImportDirectoryIsNull()
var exception = Assert.Throws<ArgumentNullException>(action);
Assert.Equal(nameof(importDirectory), exception.ParamName);
}

[Fact]
public void WithRealmImportShouldThrowWhenImportDirectoryDoesNotExist()
{
var builder = TestDistributedApplicationBuilder.Create();
var keycloak = builder.AddKeycloak("Keycloak");

var action = () => keycloak.WithRealmImport("does-not-exist");

Assert.Throws<DirectoryNotFoundException>(action);
}
}
3 changes: 3 additions & 0 deletions tests/Aspire.Playground.Tests/AppHostTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ public static TheoryData<TestEndpoints> TestEndpoints()
new ("cosmos", "Started$"),
new ("api", "Application started")
]),
new TestEndpoints("Keycloak.AppHost",
resourceEndpoints: new() { { "apiservice", ["/alive", "/health"] } }),

// Issue: https://github.com/dotnet/aspire/issues/5274
//new TestEndpoints("Mongo.AppHost",
//resourceEndpoints: new() { { "api", ["/alive", "/health", "/"] } },
Expand Down
1 change: 1 addition & 0 deletions tests/Aspire.Playground.Tests/Aspire.Playground.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<PackageReference Include="Microsoft.Extensions.Http.Resilience" />

<ProjectReference Include="$(PlaygroundSourceDir)CosmosEndToEnd/CosmosEndToEnd.AppHost/CosmosEndToEnd.AppHost.csproj" />
<ProjectReference Include="$(PlaygroundSourceDir)keycloak/Keycloak.AppHost/Keycloak.AppHost.csproj" />
<ProjectReference Include="$(PlaygroundSourceDir)ProxylessEndToEnd/ProxylessEndToEnd.AppHost/ProxylessEndToEnd.AppHost.csproj" />
<ProjectReference Include="$(PlaygroundSourceDir)Qdrant/Qdrant.AppHost/Qdrant.AppHost.csproj" />
<ProjectReference Include="$(PlaygroundSourceDir)TestShop/TestShop.AppHost/TestShop.AppHost.csproj" />
Expand Down
6 changes: 4 additions & 2 deletions tests/Shared/RepoTesting/Directory.Packages.Helix.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<PackageVersion Include="Aspire.Elastic.Clients.Elasticsearch" Version="$(PackageVersion)" />

<PackageVersion Include="Aspire.Hosting" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.AWS" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.AppConfiguration" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.ApplicationInsights" Version="$(PackageVersion)" />
Expand All @@ -32,11 +32,12 @@
<PackageVersion Include="Aspire.Hosting.Azure.SignalR" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.Sql" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Elasticsearch" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.WebPubSub" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Dapr" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Elasticsearch" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Garnet" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Kafka" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Keycloak" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Milvus" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.MongoDB" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.MySql" Version="$(PackageVersion)" />
Expand All @@ -55,6 +56,7 @@
<PackageVersion Include="Aspire.Hosting.Testing" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Valkey" Version="$(PackageVersion)" />

<PackageVersion Include="Aspire.Keycloak.Authentication" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.Cosmos" Version="$(PackageVersion)" />
Expand Down