Fixes #2646 (#2647)

Author: IEvangelist

src/Aspire.Hosting/Oracle/OracleDatabaseBuilderExtensions.cs

@@ -21,7 +21,21 @@ public static class OracleDatabaseBuilderExtensions
     /// <param name="port">The host port for Oracle Database.</param>
     /// <param name="password">The password for the Oracle Database container. Defaults to a random password.</param>
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
+    [Obsolete("Use AddOracle instead")]
     public static IResourceBuilder<OracleDatabaseServerResource> AddOracleDatabase(this IDistributedApplicationBuilder builder, string name, int? port = null, string? password = null)
+    {
+        return builder.AddOracle(name, port, password);
+    }
+
+    /// <summary>
+    /// Adds a Oracle Server resource to the application model. A container is used for local development. This version the package defaults to the 23.3.0.0 tag of the container-registry.oracle.com/database/free container image
+    /// </summary>
+    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
+    /// <param name="port">The host port for Oracle Server.</param>
+    /// <param name="password">The password for the Oracle Server container. Defaults to a random password.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
+    public static IResourceBuilder<OracleDatabaseServerResource> AddOracle(this IDistributedApplicationBuilder builder, string name, int? port = null, string? password = null)
     {
         password ??= PasswordGenerator.GeneratePassword(6, 6, 2, 2);
 

src/Components/Aspire.Oracle.EntityFrameworkCore/README.md

@@ -106,7 +106,7 @@ or
  In your AppHost project, register an Oracle container and consume the connection using the following methods: 
 
  ```csharp 
- var freepdb1 = builder.AddOracleDatabase("oracle").AddDatabase("freepdb1");
+ var freepdb1 = builder.AddOracle("oracle").AddDatabase("freepdb1");
 
  var myService = builder.AddProject<Projects.MyService>() 
                         .WithReference(freepdb1); 

tests/Aspire.Hosting.Tests/Oracle/AddOracleDatabaseTests.cs

@@ -9,13 +9,13 @@
 
 namespace Aspire.Hosting.Tests.Oracle;
 
-public class AddOracleDatabaseTests
+public class AddOracleTests
 {
     [Fact]
-    public async Task AddOracleDatabaseWithDefaultsAddsAnnotationMetadata()
+    public async Task AddOracleWithDefaultsAddsAnnotationMetadata()
     {
         var appBuilder = DistributedApplication.CreateBuilder();
-        appBuilder.AddOracleDatabase("orcl");
+        appBuilder.AddOracle("orcl");
 
         using var app = appBuilder.Build();
 
@@ -52,10 +52,10 @@ public async Task AddOracleDatabaseWithDefaultsAddsAnnotationMetadata()
     }
 
     [Fact]
-    public async Task AddOracleDatabaseAddsAnnotationMetadata()
+    public async Task AddOracleAddsAnnotationMetadata()
     {
         var appBuilder = DistributedApplication.CreateBuilder();
-        appBuilder.AddOracleDatabase("orcl", 1234, "pass");
+        appBuilder.AddOracle("orcl", 1234, "pass");
 
         using var app = appBuilder.Build();
 
@@ -95,7 +95,7 @@ public async Task AddOracleDatabaseAddsAnnotationMetadata()
     public void OracleCreatesConnectionString()
     {
         var appBuilder = DistributedApplication.CreateBuilder();
-        appBuilder.AddOracleDatabase("orcl")
+        appBuilder.AddOracle("orcl")
             .WithAnnotation(
             new AllocatedEndpointAnnotation(OracleDatabaseServerResource.PrimaryEndpointName,
             ProtocolType.Tcp,
@@ -120,7 +120,7 @@ public void OracleCreatesConnectionString()
     public void OracleCreatesConnectionStringWithDatabase()
     {
         var appBuilder = DistributedApplication.CreateBuilder();
-        appBuilder.AddOracleDatabase("orcl")
+        appBuilder.AddOracle("orcl")
             .WithAnnotation(
             new AllocatedEndpointAnnotation(OracleDatabaseServerResource.PrimaryEndpointName,
             ProtocolType.Tcp,
@@ -147,7 +147,7 @@ public void OracleCreatesConnectionStringWithDatabase()
     public async Task AddDatabaseToOracleDatabaseAddsAnnotationMetadata()
     {
         var appBuilder = DistributedApplication.CreateBuilder();
-        appBuilder.AddOracleDatabase("oracle", 1234, "pass").AddDatabase("db");
+        appBuilder.AddOracle("oracle", 1234, "pass").AddDatabase("db");
 
         using var app = appBuilder.Build();
 
@@ -188,7 +188,7 @@ public async Task AddDatabaseToOracleDatabaseAddsAnnotationMetadata()
     public async Task VerifyManifest()
     {
         var appBuilder = DistributedApplication.CreateBuilder();
-        var oracleServer = appBuilder.AddOracleDatabase("oracle");
+        var oracleServer = appBuilder.AddOracle("oracle");
         var db = oracleServer.AddDatabase("db");
 
         var serverManifest = await ManifestUtils.GetManifest(oracleServer.Resource);
@@ -239,7 +239,7 @@ public void ThrowsWithIdenticalChildResourceNames()
     {
         var builder = DistributedApplication.CreateBuilder();
 
-        var db = builder.AddOracleDatabase("oracle1");
+        var db = builder.AddOracle("oracle1");
         db.AddDatabase("db");
 
         Assert.Throws<DistributedApplicationException>(() => db.AddDatabase("db"));
@@ -250,10 +250,10 @@ public void ThrowsWithIdenticalChildResourceNamesDifferentParents()
     {
         var builder = DistributedApplication.CreateBuilder();
 
-        builder.AddOracleDatabase("oracle1")
+        builder.AddOracle("oracle1")
             .AddDatabase("db");
 
-        var db = builder.AddOracleDatabase("oracle2");
+        var db = builder.AddOracle("oracle2");
         Assert.Throws<DistributedApplicationException>(() => db.AddDatabase("db"));
     }
 
@@ -262,7 +262,7 @@ public void CanAddDatabasesWithDifferentNamesOnSingleServer()
     {
         var builder = DistributedApplication.CreateBuilder();
 
-        var oracle1 = builder.AddOracleDatabase("oracle1");
+        var oracle1 = builder.AddOracle("oracle1");
 
         var db1 = oracle1.AddDatabase("db1", "customers1");
         var db2 = oracle1.AddDatabase("db2", "customers2");
@@ -279,10 +279,10 @@ public void CanAddDatabasesWithTheSameNameOnMultipleServers()
     {
         var builder = DistributedApplication.CreateBuilder();
 
-        var db1 = builder.AddOracleDatabase("oracle1")
+        var db1 = builder.AddOracle("oracle1")
             .AddDatabase("db1", "imports");
 
-        var db2 = builder.AddOracleDatabase("oracle2")
+        var db2 = builder.AddOracle("oracle2")
             .AddDatabase("db2", "imports");
 
         Assert.Equal("imports", db1.Resource.DatabaseName);

tests/testproject/TestProject.AppHost/TestProgram.cs

@@ -58,7 +58,7 @@ private TestProgram(string[] args, Assembly assembly, bool includeIntegrationSer
             var rabbitmq = AppBuilder.AddRabbitMQ("rabbitmq");
             var mongodb = AppBuilder.AddMongoDB("mongodb")
                 .AddDatabase(mongoDbName);
-            var oracleDatabase = AppBuilder.AddOracleDatabase("oracledatabase")
+            var oracleDatabase = AppBuilder.AddOracle("oracledatabase")
                 .AddDatabase(oracleDbName);
             var kafka = AppBuilder.AddKafka("kafka");
             var cosmos = AppBuilder.AddAzureCosmosDB("cosmos").RunAsEmulator();