Skip to content

Commit 29c8a29

Browse files
committed
Messaging: Remove Azure Storage Queue
1 parent f38e2ca commit 29c8a29

24 files changed

+3
-645
lines changed

src/Microservices/Common/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
1717
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
1818
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
19-
<PackageReference Include="Azure.Storage.Queues" Version="12.21.0" />
2019
<PackageReference Include="Castle.Core" Version="5.1.1" />
2120
<PackageReference Include="Confluent.Kafka" Version="2.8.0" />
2221
<PackageReference Include="CryptographyHelper" Version="3.1.0" />

src/Microservices/Common/ClassifiedAds.Infrastructure/HealthChecks/HealthCheckBuilderExtensions.cs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using ClassifiedAds.Infrastructure.HealthChecks;
2-
using ClassifiedAds.Infrastructure.Messaging.AzureQueue;
32
using ClassifiedAds.Infrastructure.Messaging.AzureServiceBus;
43
using ClassifiedAds.Infrastructure.Messaging.Kafka;
54
using ClassifiedAds.Infrastructure.Messaging.RabbitMQ;
@@ -79,25 +78,6 @@ public static IHealthChecksBuilder AddAzureBlobStorage(
7978
timeout));
8079
}
8180

82-
public static IHealthChecksBuilder AddAzureQueueStorage(
83-
this IHealthChecksBuilder builder,
84-
string connectionString,
85-
string queueName,
86-
string name = default,
87-
HealthStatus? failureStatus = default,
88-
IEnumerable<string> tags = default,
89-
TimeSpan? timeout = default)
90-
{
91-
return builder.Add(new HealthCheckRegistration(
92-
name,
93-
new AzureQueueStorageHealthCheck(
94-
connectionString: connectionString,
95-
queueName: queueName),
96-
failureStatus,
97-
tags,
98-
timeout));
99-
}
100-
10181
public static IHealthChecksBuilder AddAzureServiceBusQueue(
10282
this IHealthChecksBuilder builder,
10383
string connectionString,

src/Microservices/Common/ClassifiedAds.Infrastructure/Messaging/AzureQueue/AzureQueueOptions.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Microservices/Common/ClassifiedAds.Infrastructure/Messaging/AzureQueue/AzureQueueReceiver.cs

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/Microservices/Common/ClassifiedAds.Infrastructure/Messaging/AzureQueue/AzureQueueSender.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/Microservices/Common/ClassifiedAds.Infrastructure/Messaging/AzureQueue/AzureQueueStorageHealthCheck.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/Microservices/Common/ClassifiedAds.Infrastructure/Messaging/MessagingCollectionExtensions.cs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using ClassifiedAds.Domain.Infrastructure.Messaging;
22
using ClassifiedAds.Infrastructure.Messaging;
3-
using ClassifiedAds.Infrastructure.Messaging.AzureQueue;
43
using ClassifiedAds.Infrastructure.Messaging.AzureServiceBus;
54
using ClassifiedAds.Infrastructure.Messaging.Fake;
65
using ClassifiedAds.Infrastructure.Messaging.Kafka;
@@ -12,22 +11,6 @@ namespace Microsoft.Extensions.DependencyInjection;
1211

1312
public static class MessagingCollectionExtensions
1413
{
15-
public static IServiceCollection AddAzureQueueSender<T>(this IServiceCollection services, AzureQueueOptions options)
16-
{
17-
services.AddSingleton<IMessageSender<T>>(new AzureQueueSender<T>(
18-
options.ConnectionString,
19-
options.QueueNames[typeof(T).Name]));
20-
return services;
21-
}
22-
23-
public static IServiceCollection AddAzureQueueReceiver<TConsumer, T>(this IServiceCollection services, AzureQueueOptions options)
24-
{
25-
services.AddTransient<IMessageReceiver<TConsumer, T>>(x => new AzureQueueReceiver<TConsumer, T>(
26-
options.ConnectionString,
27-
options.QueueNames[typeof(T).Name]));
28-
return services;
29-
}
30-
3114
public static IServiceCollection AddAzureServiceBusSender<T>(this IServiceCollection services, AzureServiceBusOptions options)
3215
{
3316
services.AddSingleton<IMessageSender<T>>(new AzureServiceBusSender<T>(
@@ -114,10 +97,6 @@ public static IServiceCollection AddMessageBusSender<T>(this IServiceCollection
11497
{
11598
services.AddKafkaSender<T>(options.Kafka);
11699
}
117-
else if (options.UsedAzureQueue())
118-
{
119-
services.AddAzureQueueSender<T>(options.AzureQueue);
120-
}
121100
else if (options.UsedAzureServiceBus())
122101
{
123102
services.AddAzureServiceBusSender<T>(options.AzureServiceBus);
@@ -140,10 +119,6 @@ public static IServiceCollection AddMessageBusReceiver<TConsumer, T>(this IServi
140119
{
141120
services.AddKafkaReceiver<TConsumer, T>(options.Kafka);
142121
}
143-
else if (options.UsedAzureQueue())
144-
{
145-
services.AddAzureQueueReceiver<TConsumer, T>(options.AzureQueue);
146-
}
147122
else if (options.UsedAzureServiceBus())
148123
{
149124
services.AddAzureServiceBusReceiver<TConsumer, T>(options.AzureServiceBus);
@@ -180,16 +155,6 @@ public static IHealthChecksBuilder AddMessageBusHealthCheck(this IHealthChecksBu
180155
name: name,
181156
failureStatus: HealthStatus.Degraded);
182157
}
183-
else if (options.UsedAzureQueue())
184-
{
185-
foreach (var queueName in options.AzureQueue.QueueNames)
186-
{
187-
healthChecksBuilder.AddAzureQueueStorage(connectionString: options.AzureQueue.ConnectionString,
188-
queueName: queueName.Value,
189-
name: $"Message Broker (Azure Queue) {queueName.Key}",
190-
failureStatus: HealthStatus.Degraded);
191-
}
192-
}
193158
else if (options.UsedAzureServiceBus())
194159
{
195160
foreach (var queueName in options.AzureServiceBus.QueueNames)

src/Microservices/Common/ClassifiedAds.Infrastructure/Messaging/MessagingOptions.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using ClassifiedAds.Infrastructure.Messaging.AzureQueue;
2-
using ClassifiedAds.Infrastructure.Messaging.AzureServiceBus;
1+
using ClassifiedAds.Infrastructure.Messaging.AzureServiceBus;
32
using ClassifiedAds.Infrastructure.Messaging.Kafka;
43
using ClassifiedAds.Infrastructure.Messaging.RabbitMQ;
54

@@ -13,8 +12,6 @@ public class MessagingOptions
1312

1413
public KafkaOptions Kafka { get; set; }
1514

16-
public AzureQueueOptions AzureQueue { get; set; }
17-
1815
public AzureServiceBusOptions AzureServiceBus { get; set; }
1916

2017
public bool UsedRabbitMQ()
@@ -27,11 +24,6 @@ public bool UsedKafka()
2724
return Provider == "Kafka";
2825
}
2926

30-
public bool UsedAzureQueue()
31-
{
32-
return Provider == "AzureQueue";
33-
}
34-
3527
public bool UsedAzureServiceBus()
3628
{
3729
return Provider == "AzureServiceBus";

src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
1717
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
1818
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
19-
<PackageReference Include="Azure.Storage.Queues" Version="12.21.0" />
2019
<PackageReference Include="Castle.Core" Version="5.1.1" />
2120
<PackageReference Include="Confluent.Kafka" Version="2.8.0" />
2221
<PackageReference Include="CryptographyHelper" Version="3.1.0" />

src/ModularMonolith/ClassifiedAds.Infrastructure/HealthChecks/HealthCheckBuilderExtensions.cs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using ClassifiedAds.Infrastructure.HealthChecks;
2-
using ClassifiedAds.Infrastructure.Messaging.AzureQueue;
32
using ClassifiedAds.Infrastructure.Messaging.AzureServiceBus;
43
using ClassifiedAds.Infrastructure.Messaging.Kafka;
54
using ClassifiedAds.Infrastructure.Messaging.RabbitMQ;
@@ -79,25 +78,6 @@ public static IHealthChecksBuilder AddAzureBlobStorage(
7978
timeout));
8079
}
8180

82-
public static IHealthChecksBuilder AddAzureQueueStorage(
83-
this IHealthChecksBuilder builder,
84-
string connectionString,
85-
string queueName,
86-
string name = default,
87-
HealthStatus? failureStatus = default,
88-
IEnumerable<string> tags = default,
89-
TimeSpan? timeout = default)
90-
{
91-
return builder.Add(new HealthCheckRegistration(
92-
name,
93-
new AzureQueueStorageHealthCheck(
94-
connectionString: connectionString,
95-
queueName: queueName),
96-
failureStatus,
97-
tags,
98-
timeout));
99-
}
100-
10181
public static IHealthChecksBuilder AddAzureServiceBusQueue(
10282
this IHealthChecksBuilder builder,
10383
string connectionString,

0 commit comments

Comments
 (0)