Mega CDK polish PR. (#2875)

Author: mitchdenny

playground/OpenAIEndToEnd/OpenAIEndToEnd.AppHost/Program.cs

@@ -5,7 +5,7 @@
 
 builder.AddAzureProvisioning();
 
-var openai = builder.AddAzureOpenAIConstruct("openai")
+var openai = builder.AddAzureOpenAI("openai")
                     .AddDeployment(new("gpt-35-turbo", "gpt-35-turbo", "0613"));
 
 builder.AddProject<Projects.OpenAIEndToEnd_WebStory>("webstory")

playground/cdk/CdkSample.AppHost/CdkSample.AppHost.csproj

@@ -7,6 +7,7 @@
     <Nullable>enable</Nullable>
     <IsAspireHost>true</IsAspireHost>
     <UserSecretsId>44b9bf37-1892-4852-8b5f-153e3ac5d24c</UserSecretsId>
+    <EnablePreviewFeatures>True</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>

playground/cdk/CdkSample.AppHost/Program.cs

@@ -6,64 +6,64 @@
 var builder = DistributedApplication.CreateBuilder(args);
 builder.AddAzureProvisioning();
 
-var cosmosdb = builder.AddAzureCosmosDBConstruct("cosmos").AddDatabase("cosmosdb");
+var cosmosdb = builder.AddAzureCosmosDB("cosmos").AddDatabase("cosmosdb");
 
 var sku = builder.AddParameter("storagesku");
 var locationOverride = builder.AddParameter("locationOverride");
-var storage = builder.AddAzureConstructStorage("storage", (_, account) =>
+var storage = builder.AddAzureStorage("storage", (_, _, account) =>
 {
     account.AssignProperty(sa => sa.Sku.Name, sku);
     account.AssignProperty(sa => sa.Location, locationOverride);
 });
 
 var blobs = storage.AddBlobs("blobs");
 
-var sqldb = builder.AddSqlServer("sql").AsAzureSqlDatabaseConstruct().AddDatabase("sqldb");
+var sqldb = builder.AddSqlServer("sql").AsAzureSqlDatabase().AddDatabase("sqldb");
 
 var signaturesecret = builder.AddParameter("signaturesecret");
-var keyvault = builder.AddAzureKeyVaultConstruct("mykv", (construct, keyVault) =>
+var keyvault = builder.AddAzureKeyVault("mykv", (_, construct, keyVault) =>
 {
     var secret = new KeyVaultSecret(construct, name: "mysecret");
     secret.AssignProperty(x => x.Properties.Value, signaturesecret);
 });
 
-var cache = builder.AddRedis("cache").AsAzureRedisConstruct();
+var cache = builder.AddRedis("cache").AsAzureRedis();
 
 var pgsqlAdministratorLogin = builder.AddParameter("pgsqlAdministratorLogin");
 var pgsqlAdministratorLoginPassword = builder.AddParameter("pgsqlAdministratorLoginPassword", secret: true);
 var pgsqldb = builder.AddPostgres("pgsql")
-                   .AsAzurePostgresFlexibleServerConstruct(pgsqlAdministratorLogin, pgsqlAdministratorLoginPassword)
+                   .AsAzurePostgresFlexibleServer(pgsqlAdministratorLogin, pgsqlAdministratorLoginPassword)
                    .AddDatabase("pgsqldb");
 
-var pgsql2 = builder.AddPostgres("pgsql2").AsAzurePostgresFlexibleServerConstruct();
+var pgsql2 = builder.AddPostgres("pgsql2").AsAzurePostgresFlexibleServer();
 
-var sb = builder.AddAzureServiceBusConstruct("servicebus")
+var sb = builder.AddAzureServiceBus("servicebus")
     .AddQueue("queue1",
-        (construct, queue) =>
+        (_, construct, queue) =>
         {
             queue.Properties.MaxDeliveryCount = 5;
             queue.Properties.LockDuration = TimeSpan.FromMinutes(5);
         })
     .AddTopic("topic1",
-        (construct, topic) =>
+        (_, construct, topic) =>
         {
             topic.Properties.EnablePartitioning = true;
         })
     .AddTopic("topic2")
     .AddSubscription("topic1", "subscription1",
-        (construct, subscription) =>
+        (_, construct, subscription) =>
         {
             subscription.Properties.LockDuration = TimeSpan.FromMinutes(5);
             subscription.Properties.RequiresSession = true;
         })
     .AddSubscription("topic1", "subscription2")
     .AddTopic("topic3", new[] { "sub1", "sub2" });
 
-var appConfig = builder.AddAzureAppConfigurationConstruct("appConfig");
+var appConfig = builder.AddAzureAppConfiguration("appConfig");
 
-var search = builder.AddAzureConstructSearch("search");
+var search = builder.AddAzureSearch("search");
 
-var signalr = builder.AddAzureSignalRConstruct("signalr");
+var signalr = builder.AddAzureSignalR("signalr");
 
 builder.AddProject<Projects.CdkSample_ApiService>("api")
     .WithReference(signalr)

src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj

@@ -6,6 +6,7 @@
     <PackageTags>aspire hosting azure</PackageTags>
     <Description>Azure resource types for .NET Aspire.</Description>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateRequiresPreviewFeaturesAttribute>False</GenerateRequiresPreviewFeaturesAttribute>
   </PropertyGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure/AzureAppConfigurationResource.cs

@@ -5,32 +5,12 @@
 
 namespace Aspire.Hosting.Azure;
 
-/// <summary>
-/// A resource that represents Azure App Configuration.
-/// </summary>
-/// <param name="name">The name of the resource.</param>
-public class AzureAppConfigurationResource(string name) :
-    AzureBicepResource(name, templateResourceName: "Aspire.Hosting.Azure.Bicep.appconfig.bicep"),
-    IResourceWithConnectionString
-{
-    /// <summary>
-    /// Gets the appConfigEndpoint output reference for the Azure App Configuration resource.
-    /// </summary>
-    public BicepOutputReference Endpoint => new("appConfigEndpoint", this);
-
-    /// <summary>
-    /// Gets the connection string template for the manifest for the Azure App Configuration resource.
-    /// </summary>
-    public ReferenceExpression ConnectionStringExpression =>
-        ReferenceExpression.Create($"{Endpoint}");
-}
-
 /// <summary>
 /// A resource that represents Azure App Configuration.
 /// </summary>
 /// <param name="name">The name of the resource.</param>
 /// <param name="configureConstruct"></param>
-public class AzureAppConfigurationConstructResource(string name, Action<ResourceModuleConstruct> configureConstruct) :
+public class AzureAppConfigurationResource(string name, Action<ResourceModuleConstruct> configureConstruct) :
     AzureConstructResource(name, configureConstruct),
     IResourceWithConnectionString
 {

src/Aspire.Hosting.Azure/AzureBlobStorageResource.cs

@@ -36,34 +36,3 @@ internal void WriteToManifest(ManifestPublishingContext context)
         context.WriteConnectionString(this);
     }
 }
-
-/// <summary>
-/// A resource that represents an Azure Blob Storage account.
-/// </summary>
-/// <param name="name">The name of the resource.</param>
-/// <param name="storage">The <see cref="AzureStorageResource"/> that the resource is stored in.</param>
-public class AzureBlobStorageConstructResource(string name, AzureStorageConstructResource storage) : Resource(name),
-    IResourceWithConnectionString,
-    IResourceWithParent<AzureStorageConstructResource>
-{
-    /// <summary>
-    /// Gets the parent AzureStorageResource of this AzureBlobStorageResource.
-    /// </summary>
-    public AzureStorageConstructResource Parent => storage;
-
-    /// <summary>
-    /// Gets the connection string template for the manifest for the Azure Blob Storage resource.
-    /// </summary>
-    public ReferenceExpression ConnectionStringExpression =>
-        Parent.GetBlobConnectionString();
-
-    /// <summary>
-    /// Called by manifest publisher to write manifest resource.
-    /// </summary>
-    /// <param name="context">The context for the manifest publishing operation.</param>
-    internal void WriteToManifest(ManifestPublishingContext context)
-    {
-        context.Writer.WriteString("type", "value.v0");
-        context.WriteConnectionString(this);
-    }
-}

src/Aspire.Hosting.Azure/AzureCosmosDBResource.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.Versioning;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Azure;
 using Aspire.Hosting.Azure.Cosmos;
@@ -14,38 +15,7 @@ namespace Aspire.Hosting;
 /// <summary>
 /// A resource that represents an Azure Cosmos DB.
 /// </summary>
-public class AzureCosmosDBResource(string name) :
-    AzureBicepResource(name, templateResourceName: "Aspire.Hosting.Azure.Bicep.cosmosdb.bicep"),
-    IResourceWithConnectionString,
-    IResourceWithEndpoints
-{
-    internal List<string> Databases { get; } = [];
-
-    internal EndpointReference EmulatorEndpoint => new(this, "emulator");
-
-    /// <summary>
-    /// Gets the "connectionString" reference from the secret outputs of the Azure Cosmos DB resource.
-    /// </summary>
-    public BicepSecretOutputReference ConnectionString => new("connectionString", this);
-
-    /// <summary>
-    /// Gets a value indicating whether the Azure Cosmos DB resource is running in the local emulator.
-    /// </summary>
-    public bool IsEmulator => this.IsContainer();
-
-    /// <summary>
-    /// Gets the connection string template for the manifest for the Azure Cosmos DB resource.
-    /// </summary>
-    public ReferenceExpression ConnectionStringExpression =>
-        IsEmulator
-        ? ReferenceExpression.Create($"{AzureCosmosDBEmulatorConnectionString.Create(EmulatorEndpoint.Port)}")
-        : ReferenceExpression.Create($"{ConnectionString}");
-}
-
-/// <summary>
-/// A resource that represents an Azure Cosmos DB.
-/// </summary>
-public class AzureCosmosDBConstructResource(string name, Action<ResourceModuleConstruct> configureConstruct) :
+public class AzureCosmosDBResource(string name, Action<ResourceModuleConstruct> configureConstruct) :
     AzureConstructResource(name, configureConstruct),
     IResourceWithConnectionString,
     IResourceWithEndpoints
@@ -86,22 +56,19 @@ public static class AzureCosmosExtensions
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<AzureCosmosDBResource> AddAzureCosmosDB(this IDistributedApplicationBuilder builder, string name)
     {
-        var resource = new AzureCosmosDBResource(name);
-        return builder.AddResource(resource)
-                      .WithParameter("databaseAccountName", resource.CreateBicepResourceName())
-                      .WithParameter("databases", resource.Databases)
-                      .WithParameter(AzureBicepResource.KnownParameters.KeyVaultName)
-                      .WithManifestPublishingCallback(resource.WriteToManifest);
+#pragma warning disable CA2252 // This API requires opting into preview features
+        return builder.AddAzureCosmosDB(name, static (_, _, _, _) => { });
+#pragma warning restore CA2252 // This API requires opting into preview features
     }
-
     /// <summary>
     /// Adds an Azure Cosmos DB connection to the application model.
     /// </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="configureResource"></param>
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
-    public static IResourceBuilder<AzureCosmosDBConstructResource> AddAzureCosmosDBConstruct(this IDistributedApplicationBuilder builder, string name, Action<IResourceBuilder<AzureCosmosDBConstructResource>, ResourceModuleConstruct, CosmosDBAccount, IEnumerable<CosmosDBSqlDatabase>>? configureResource = null)
+    [RequiresPreviewFeatures]
+    public static IResourceBuilder<AzureCosmosDBResource> AddAzureCosmosDB(this IDistributedApplicationBuilder builder, string name, Action<IResourceBuilder<AzureCosmosDBResource>, ResourceModuleConstruct, CosmosDBAccount, IEnumerable<CosmosDBSqlDatabase>>? configureResource = null)
     {
         var configureConstruct = (ResourceModuleConstruct construct) =>
         {
@@ -116,7 +83,7 @@ public static IResourceBuilder<AzureCosmosDBConstructResource> AddAzureCosmosDBC
             var keyVaultNameParameter = new Parameter("keyVaultName");
             construct.AddParameter(keyVaultNameParameter);
 
-            var azureResource = (AzureCosmosDBConstructResource)construct.Resource;
+            var azureResource = (AzureCosmosDBResource)construct.Resource;
             var azureResourceBuilder = builder.CreateResourceBuilder(azureResource);
             List<CosmosDBSqlDatabase> cosmosSqlDatabases = new List<CosmosDBSqlDatabase>();
             foreach (var databaseName in azureResource.Databases)
@@ -134,7 +101,7 @@ public static IResourceBuilder<AzureCosmosDBConstructResource> AddAzureCosmosDBC
             }
         };
 
-        var resource = new AzureCosmosDBConstructResource(name, configureConstruct);
+        var resource = new AzureCosmosDBResource(name, configureConstruct);
         return builder.AddResource(resource)
                       .WithParameter(AzureBicepResource.KnownParameters.KeyVaultName)
                       .WithManifestPublishingCallback(resource.WriteToManifest);
@@ -166,23 +133,6 @@ public static IResourceBuilder<AzureCosmosDBResource> RunAsEmulator(this IResour
         return builder;
     }
 
-    /// <summary>
-    /// Configures an Azure Cosmos DB resource to be emulated using the Azure Cosmos DB emulator with the NoSQL API. This resource requires an <see cref="AzureCosmosDBResource"/> to be added to the application model.
-    /// For more information on the Azure Cosmos DB emulator, see <a href="https://learn.microsoft.com/azure/cosmos-db/emulator#authentication"></a>
-    /// </summary>
-    /// <param name="builder">The Azure Cosmos DB resource builder.</param>
-    /// <param name="configureContainer">Callback that exposes underlying container used for emulation to allow for customization.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
-    /// <remarks>
-    /// When using the Azure Cosmos DB emulator, the container requires a TLS/SSL certificate.
-    /// For more information, see <a href="https://learn.microsoft.com/azure/cosmos-db/how-to-develop-emulator?tabs=docker-linux#export-the-emulators-tlsssl-certificate"></a>
-    /// </remarks>
-    [Obsolete("Renamed to RunAsEmulator. Will be removed in next preview")]
-    public static IResourceBuilder<AzureCosmosDBResource> UseEmulator(this IResourceBuilder<AzureCosmosDBResource> builder, Action<IResourceBuilder<AzureCosmosDBEmulatorResource>>? configureContainer = null)
-    {
-        return builder.RunAsEmulator(configureContainer);
-    }
-
     /// <summary>
     /// Configures the gateway port for the Azure Cosmos DB emulator.
     /// </summary>
@@ -208,18 +158,6 @@ public static IResourceBuilder<AzureCosmosDBResource> AddDatabase(this IResource
         builder.Resource.Databases.Add(databaseName);
         return builder;
     }
-
-    /// <summary>
-    /// Adds a database to the associated Cosmos DB account resource.
-    /// </summary>
-    /// <param name="builder">AzureCosmosDB resource builder.</param>
-    /// <param name="databaseName">Name of database.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
-    public static IResourceBuilder<AzureCosmosDBConstructResource> AddDatabase(this IResourceBuilder<AzureCosmosDBConstructResource> builder, string databaseName)
-    {
-        builder.Resource.Databases.Add(databaseName);
-        return builder;
-    }
 }
 
 file static class AzureCosmosDBEmulatorConnectionString

src/Aspire.Hosting.Azure/AzureKeyVaultResource.cs

@@ -5,32 +5,12 @@
 
 namespace Aspire.Hosting.Azure;
 
-/// <summary>
-/// A resource that represents an Azure Key Vault.
-/// </summary>
-/// <param name="name">The name of the resource.</param>
-public class AzureKeyVaultResource(string name) :
-    AzureBicepResource(name, templateResourceName: "Aspire.Hosting.Azure.Bicep.keyvault.bicep"),
-    IResourceWithConnectionString
-{
-    /// <summary>
-    /// Gets the "vaultUri" output reference for the Azure Key Vault resource.
-    /// </summary>
-    public BicepOutputReference VaultUri => new("vaultUri", this);
-
-    /// <summary>
-    /// Gets the connection string template for the manifest for the Azure Key Vault resource.
-    /// </summary>
-    public ReferenceExpression ConnectionStringExpression =>
-        ReferenceExpression.Create($"{VaultUri}");
-}
-
 /// <summary>
 /// A resource that represents an Azure Key Vault.
 /// </summary>
 /// <param name="name">The name of the resource.</param>
 /// <param name="configureConstruct"></param>
-public class AzureKeyVaultConstructResource(string name, Action<ResourceModuleConstruct> configureConstruct) : AzureConstructResource(name, configureConstruct), IResourceWithConnectionString
+public class AzureKeyVaultResource(string name, Action<ResourceModuleConstruct> configureConstruct) : AzureConstructResource(name, configureConstruct), IResourceWithConnectionString
 {
     /// <summary>
     /// Gets the "vaultUri" output reference for the Azure Key Vault resource.

src/Aspire.Hosting.Azure/AzureOpenAIResource.cs

@@ -4,46 +4,12 @@
 
 namespace Aspire.Hosting.ApplicationModel;
 
-/// <summary>
-/// Represents an Azure OpenAI resource.
-/// </summary>
-/// <param name="name">The name of the resource.</param>
-public class AzureOpenAIResource(string name) :
-    AzureBicepResource(name, templateResourceName: "Aspire.Hosting.Azure.Bicep.openai.bicep"),
-    IResourceWithConnectionString
-{
-    private readonly List<AzureOpenAIDeployment> _deployments = [];
-
-    /// <summary>
-    /// Gets the "connectionString" output reference from the Azure OpenAI resource.
-    /// </summary>
-    public BicepOutputReference ConnectionString => new("connectionString", this);
-
-    /// <summary>
-    /// Gets the connection string template for the manifest for the resource.
-    /// </summary>
-    public ReferenceExpression ConnectionStringExpression =>
-        ReferenceExpression.Create($"{ConnectionString}");
-
-    /// <summary>
-    /// Gets the list of deployments of the Azure OpenAI resource.
-    /// </summary>
-    public IReadOnlyList<AzureOpenAIDeployment> Deployments => _deployments;
-
-    internal void AddDeployment(AzureOpenAIDeployment deployment)
-    {
-        ArgumentNullException.ThrowIfNull(deployment);
-
-        _deployments.Add(deployment);
-    }
-}
-
 /// <summary>
 /// Represents an Azure OpenAI resource.
 /// </summary>
 /// <param name="name">The name of the resource.</param>
 /// <param name="configureConstruct">Configures the underlying Azure resource using the CDK.</param>
-public class AzureOpenAIConstructResource(string name, Action<ResourceModuleConstruct> configureConstruct) :
+public class AzureOpenAIResource(string name, Action<ResourceModuleConstruct> configureConstruct) :
     AzureConstructResource(name, configureConstruct),
     IResourceWithConnectionString
 {