Adds Aspire Oracle EntityFrameworkCore Database component. #1295
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using Aspire.Hosting.Tests.Helpers; | ||
| using Xunit; | ||
|
|
||
| namespace Aspire.Hosting.Tests.Oracle; | ||
|
|
||
| [Collection("IntegrationServices")] | ||
| public class OracleDatabaseFunctionalTests | ||
| { | ||
| private readonly IntegrationServicesFixture _integrationServicesFixture; | ||
|
|
||
| public OracleDatabaseFunctionalTests(IntegrationServicesFixture integrationServicesFixture) | ||
| { | ||
| _integrationServicesFixture = integrationServicesFixture; | ||
| } | ||
|
|
||
| [LocalOnlyFact()] | ||
| public async Task VerifyOracleDatabaseWorks() | ||
| { | ||
| var testProgram = _integrationServicesFixture.TestProgram; | ||
| var client = _integrationServicesFixture.HttpClient; | ||
|
|
||
| using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1)); | ||
|
|
||
| var response = await testProgram.IntegrationServiceABuilder!.HttpGetAsync(client, "http", "/oracledatabase/verify", cts.Token); | ||
|
|
||
| Assert.True(response.IsSuccessStatusCode); | ||
eerhardt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,30 @@ | ||||||
| // Licensed to the .NET Foundation under one or more agreements. | ||||||
| // The .NET Foundation licenses this file to you under the MIT license. | ||||||
|
|
||||||
| using Oracle.ManagedDataAccess.Client; | ||||||
|
|
||||||
| public static class OracleDatabaseExtensions | ||||||
| { | ||||||
| public static void MapOracleDatabaseApi(this WebApplication app) | ||||||
| { | ||||||
| app.MapGet("/oracledatabase/verify", VerifyOracleDatabaseAsync); | ||||||
| } | ||||||
|
|
||||||
| private static async Task<IResult> VerifyOracleDatabaseAsync(OracleConnection connection) | ||||||
|
There was a problem hiding this comment. This should be
Suggested change
And then using the EF Component you are adding in this PR. |
||||||
| { | ||||||
| try | ||||||
| { | ||||||
| await connection.OpenAsync(); | ||||||
|
|
||||||
| var command = connection.CreateCommand(); | ||||||
| command.CommandText = $"SELECT 1 FROM DUAL"; | ||||||
| var results = await command.ExecuteReaderAsync(); | ||||||
|
|
||||||
| return results.HasRows ? Results.Ok("Success!") : Results.Problem("Failed"); | ||||||
| } | ||||||
| catch (Exception e) | ||||||
| { | ||||||
| return Results.Problem(e.ToString()); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using Oracle.ManagedDataAccess.Client; | ||
|
|
||
| // This is a workaround while https://github.com/dotnet/aspire/pull/1004 is not merged. | ||
| public static class OracleManagedDataAccessExtensions | ||
| { | ||
| public static void AddOracleClient(this WebApplicationBuilder builder, string connectionName) | ||
| { | ||
| ArgumentNullException.ThrowIfNull(builder); | ||
|
|
||
| var connectionString = builder.Configuration.GetConnectionString(connectionName); | ||
| builder.Services.AddScoped(_ => new OracleConnection(connectionString)); | ||
| } | ||
|
|
||
| public static void AddKeyedOracleClient(this WebApplicationBuilder builder, string connectionName) | ||
| { | ||
| ArgumentNullException.ThrowIfNull(builder); | ||
|
|
||
| var connectionString = builder.Configuration.GetConnectionString(connectionName); | ||
| builder.Services.AddKeyedSingleton(connectionName, (serviceProvider, _) => new OracleConnection(connectionString)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should centralize this generated password logic into
PasswordUtils@mitchdennyThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that it is different than SqlServer.
aspire/src/Aspire.Hosting/SqlServer/SqlServerBuilderExtensions.cs
Line 25 in bc220e3
and MySql
aspire/src/Aspire.Hosting/MySql/MySqlBuilderExtensions.cs
Line 27 in bc220e3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably just come up with a decent password generator that we can use. What I did for SQL Server was half baked and really only appropriate for inner loop (which luckily is where it is used). I'd be happy to see this go in without change this password generation logic and instead see an issue created where we properly develop out PasswordUtils than can meet our various use cases (needs to be flexible enough to side step various limitations around what the containerized tool can used, and what we can escape in the connection string.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know an issue hasn't been created yet, but I saw this comment and opened a PR that might address it: #1469.