Skip to content
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.

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

Adding public API test coverage #5402

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2e03cdd
Aspire.Azure.Messaging.EventHubs
Zombach Aug 23, 2024
6c0bbe9
Aspire.Azure.Messaging.ServiceBus
Zombach Aug 23, 2024
609f932
Aspire.Azure.Messaging.WebPubSub
Zombach Aug 23, 2024
eb9beda
Aspire.Azure.Storage.Blobs
Zombach Aug 23, 2024
8a07913
Aspire.Microsoft.Data.SqlClient
Zombach Aug 23, 2024
12f82b9
Aspire.Microsoft.EntityFrameworkCore.Cosmos
Zombach Aug 23, 2024
3219b6e
Aspire.Microsoft.EntityFrameworkCore.SqlServer
Zombach Aug 23, 2024
6eaf998
Aspire.MySqlConnector
Zombach Aug 23, 2024
26b3d0f
Aspire.Npgsql
Zombach Aug 23, 2024
55ffb7f
Aspire.Npgsql.EntityFrameworkCore.PostgreSQL
Zombach Aug 23, 2024
3a5d69a
Aspire.Oracle.EntityFrameworkCore
Zombach Aug 23, 2024
49ad0b0
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 24, 2024
2cf01a8
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 24, 2024
f84a605
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 27, 2024
8c1beb3
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 29, 2024
0156ccb
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 31, 2024
78bad1c
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 8, 2024
eb57d65
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 12, 2024
88d3937
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 16, 2024
1c2ca1b
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 19, 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
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ public static void AddAzureEventProcessorClient(
Action<AzureMessagingEventHubsProcessorSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventProcessorClient, EventProcessorClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new EventProcessorClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(EventProcessorClient),
configureSettings, configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -53,6 +56,7 @@ public static void AddKeyedAzureEventProcessorClient(
Action<AzureMessagingEventHubsProcessorSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventProcessorClient, EventProcessorClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

string configurationSectionName = EventProcessorClientComponent
Expand All @@ -79,6 +83,9 @@ public static void AddAzurePartitionReceiverClient(
Action<AzureMessagingEventHubsPartitionReceiverSettings>? configureSettings = null,
Action<IAzureClientBuilder<PartitionReceiver, PartitionReceiverOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new PartitionReceiverClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(PartitionReceiver),
configureSettings, configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -99,6 +106,7 @@ public static void AddKeyedAzurePartitionReceiverClient(
Action<AzureMessagingEventHubsPartitionReceiverSettings>? configureSettings = null,
Action<IAzureClientBuilder<PartitionReceiver, PartitionReceiverOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

string configurationSectionName = PartitionReceiverClientComponent
Expand All @@ -125,6 +133,9 @@ public static void AddAzureEventHubProducerClient(
Action<AzureMessagingEventHubsProducerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubProducerClient, EventHubProducerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new EventHubProducerClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(EventHubProducerClient),
configureSettings, configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -145,6 +156,7 @@ public static void AddKeyedAzureEventHubProducerClient(
Action<AzureMessagingEventHubsProducerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubProducerClient, EventHubProducerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

string configurationSectionName = EventHubProducerClientComponent
Expand Down Expand Up @@ -172,6 +184,9 @@ public static void AddAzureEventHubBufferedProducerClient(
Action<IAzureClientBuilder<EventHubBufferedProducerClient, EventHubBufferedProducerClientOptions>>?
configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new EventHubBufferedProducerClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(EventHubBufferedProducerClient), configureSettings,
configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -193,6 +208,7 @@ public static void AddKeyedAzureEventHubBufferedProducerClient(
Action<AzureMessagingEventHubsBufferedProducerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubBufferedProducerClient, EventHubBufferedProducerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

string configurationSectionName = EventHubBufferedProducerClientComponent
Expand All @@ -218,6 +234,9 @@ public static void AddAzureEventHubConsumerClient(
Action<AzureMessagingEventHubsConsumerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubConsumerClient, EventHubConsumerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new EventHubConsumerClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(EventHubConsumerClient),
configureSettings, configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -239,6 +258,7 @@ public static void AddKeyedAzureEventHubConsumerClient(
Action<AzureMessagingEventHubsConsumerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubConsumerClient, EventHubConsumerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

string configurationSectionName = EventHubConsumerClientComponent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public static void AddAzureServiceBusClient(
Action<AzureMessagingServiceBusSettings>? configureSettings = null,
Action<IAzureClientBuilder<ServiceBusClient, ServiceBusClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new MessageBusComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName, serviceKey: null);
}

Expand All @@ -55,6 +58,7 @@ public static void AddKeyedAzureServiceBusClient(
Action<AzureMessagingServiceBusSettings>? configureSettings = null,
Action<IAzureClientBuilder<ServiceBusClient, ServiceBusClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

string configurationSectionName = MessageBusComponent.GetKeyedConfigurationSectionName(name, DefaultConfigSectionName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public static void AddAzureWebPubSubServiceClient(
Action<AzureMessagingWebPubSubSettings>? configureSettings = null,
Action<IAzureClientBuilder<WebPubSubServiceClient, WebPubSubServiceClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new WebPubSubComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName, serviceKey: null);
}

Expand All @@ -56,6 +59,7 @@ public static void AddKeyedAzureWebPubSubServiceClient(
Action<AzureMessagingWebPubSubSettings>? configureSettings = null,
Action<IAzureClientBuilder<WebPubSubServiceClient, WebPubSubServiceClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);
ArgumentException.ThrowIfNullOrEmpty(serviceKey);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ public static void AddAzureBlobClient(
Action<AzureStorageBlobsSettings>? configureSettings = null,
Action<IAzureClientBuilder<BlobServiceClient, BlobClientOptions>>? configureClientBuilder = null)
{
new BlobStorageComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName, serviceKey: null);
AddAzureBlobClientInternal(
builder,
DefaultConfigSectionName,
connectionName,
serviceKey: null,
configureSettings,
configureClientBuilder);
}

/// <summary>
Expand All @@ -60,7 +66,27 @@ public static void AddKeyedAzureBlobClient(

string configurationSectionName = BlobStorageComponent.GetKeyedConfigurationSectionName(name, DefaultConfigSectionName);

new BlobStorageComponent().AddClient(builder, configurationSectionName, configureSettings, configureClientBuilder, connectionName: name, serviceKey: name);
AddAzureBlobClientInternal(
builder,
configurationSectionName,
connectionName: name,
serviceKey: name,
configureSettings,
configureClientBuilder);
}

private static void AddAzureBlobClientInternal(
IHostApplicationBuilder builder,
string configurationSectionName,
string connectionName,
string? serviceKey,
Action<AzureStorageBlobsSettings>? configureSettings = null,
Action<IAzureClientBuilder<BlobServiceClient, BlobClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new BlobStorageComponent().AddClient(builder, configurationSectionName, configureSettings, configureClientBuilder, connectionName: connectionName, serviceKey: serviceKey);
}

private sealed class BlobStorageComponent : AzureComponent<AzureStorageBlobsSettings, BlobServiceClient, BlobClientOptions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,20 @@ public static void AddSqlServerClient(this IHostApplicationBuilder builder, stri
/// <exception cref="InvalidOperationException">If required <see cref="MicrosoftDataSqlClientSettings.ConnectionString"/> is not provided in configuration section.</exception>
public static void AddKeyedSqlServerClient(this IHostApplicationBuilder builder, string name, Action<MicrosoftDataSqlClientSettings>? configureSettings = null)
{
ArgumentNullException.ThrowIfNull(name);
ArgumentException.ThrowIfNullOrEmpty(name);

AddSqlClient(builder, $"{DefaultConfigSectionName}:{name}", configureSettings, connectionName: name, serviceKey: name);
}

private static void AddSqlClient(IHostApplicationBuilder builder, string configurationSectionName,
Action<MicrosoftDataSqlClientSettings>? configure, string connectionName, object? serviceKey)
private static void AddSqlClient(
IHostApplicationBuilder builder,
string configurationSectionName,
Action<MicrosoftDataSqlClientSettings>? configure,
string connectionName,
object? serviceKey)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

MicrosoftDataSqlClientSettings settings = new();
builder.Configuration.GetSection(configurationSectionName).Bind(settings);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public static class AspireAzureEFCoreCosmosExtensions
Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);
ArgumentException.ThrowIfNullOrEmpty(databaseName);

builder.EnsureDbContextNotRegistered<TContext>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public static class AspireSqlServerEFCoreSqlClientExtensions
Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

builder.EnsureDbContextNotRegistered<TContext>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Logging;
using MySqlConnector;

namespace Microsoft.Extensions.Hosting;
Expand Down Expand Up @@ -54,6 +53,7 @@ private static void AddMySqlDataSource(IHostApplicationBuilder builder, string c
Action<MySqlConnectorSettings>? configureSettings, string connectionName, object? serviceKey)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

MySqlConnectorSettings settings = new();
builder.Configuration.GetSection(configurationSectionName).Bind(settings);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public static partial class AspireEFPostgreSqlExtensions
Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

builder.EnsureDbContextNotRegistered<TContext>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,15 @@ public static void AddKeyedNpgsqlDataSource(this IHostApplicationBuilder builder
AddNpgsqlDataSource(builder, $"{DefaultConfigSectionName}:{name}", configureSettings, connectionName: name, serviceKey: name, configureDataSourceBuilder: configureDataSourceBuilder);
}

private static void AddNpgsqlDataSource(IHostApplicationBuilder builder, string configurationSectionName,
Action<NpgsqlSettings>? configureSettings, string connectionName, object? serviceKey, Action<NpgsqlDataSourceBuilder>? configureDataSourceBuilder)
private static void AddNpgsqlDataSource(
IHostApplicationBuilder builder,
string configurationSectionName,
Action<NpgsqlSettings>? configureSettings,
string connectionName,
object? serviceKey, Action<NpgsqlDataSourceBuilder>? configureDataSourceBuilder)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

NpgsqlSettings settings = new();
builder.Configuration.GetSection(configurationSectionName).Bind(settings);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public static class AspireOracleEFCoreExtensions
Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

builder.EnsureDbContextNotRegistered<TContext>();

Expand Down
Loading
Loading