Merge pull request #63 from Particular/alignwithsamples

irinascurtu · web-flow · commit 7610ee30d11f · 2024-12-16T14:31:59.000+02:00
Aligned with code under samples and improved the running profiles
diff --git a/README.md b/README.md
@@ -2,14 +2,30 @@
 
 A MassTransit version of the [NServiceBus Monitoring Demo](https://github.com/Particular/MonitoringDemo/)
 
-## Launching the Particular Platform
+## Launching the Particular Platform for MassTransit
 
-The Particular Service Platform can be pulled down using [the showcase provided `docker-compose.yml`](/src/docker-compose.yml) which uses **RabbitMQ**
+To launch using **RabbitMQ**:
+```cmd
+cd src
+docker compose -f docker-compose-base.yml -f compose-rabbitmq.yml --env-file rabbit.env up -d
+```
+
+To launch using **Amazon SQS**:
+
+First you need to update the variables in `sqs.env` with all the account details and then
+```cmd
+cd src
+docker compose -f docker-compose-base.yml -f compose-sqs.yml --env-file sqs.env up -d
+```
 
+To launch using **Azure ServiceBus**:
+
+First you need to update the variables in `asb.env` with all the account details and then
 ```cmd
 cd src
-docker compose up
+docker compose -f docker-compose-base.yml -f compose-azure.yml --env-file asb.env up -d
 ```
+
 ## Prerequisites
 
 - Have "Enable Multi-Project Launch profiles" enabled
@@ -22,4 +38,4 @@ Allow Visual Studio 2024 "multi-launch" so you can easily select the profile you
 
 Each project has 3 launch profiles to select Azure Service Bus, AmazonSQS, or RabbitMQ as the transport and reads environment variables to initialize the transport.
 
-The demo requires running the Particular Service Platform for MassTransit as well as a RabbitMQ broker. The whole package can be pulled down using Docker compose and the dockerfile at [~/src/docker-compose.yml](/src/docker-compose.yml)
+The demo requires running the Particular Service Platform for MassTransit as described above.
diff --git a/src/.run/AmazonSQS.run.xml b/src/.run/AmazonSQS.run.xml
@@ -0,0 +1,9 @@
+﻿<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="AmazonSQS" type="CompoundRunConfigurationType">
+    <toRun name="Billing: AmazonSQS" type="LaunchSettings" />
+    <toRun name="ClientUI: AmazonSQS" type="LaunchSettings" />
+    <toRun name="Sales: AmazonSQS" type="LaunchSettings" />
+    <toRun name="Shipping: AmazonSQS" type="LaunchSettings" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/src/.run/Azure.run.xml b/src/.run/Azure.run.xml
@@ -0,0 +1,9 @@
+﻿<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Azure" type="CompoundRunConfigurationType">
+    <toRun name="Billing: Azure Service Bus" type="LaunchSettings" />
+    <toRun name="ClientUI: Azure Service Bus" type="LaunchSettings" />
+    <toRun name="Sales: Azure Service Bus" type="LaunchSettings" />
+    <toRun name="Shipping: Azure Service Bus" type="LaunchSettings" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/src/.run/RabbitMQ.run.xml b/src/.run/RabbitMQ.run.xml
@@ -0,0 +1,9 @@
+﻿<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RabbitMQ" type="CompoundRunConfigurationType">
+    <toRun name="Billing: RabbitMQ" type="LaunchSettings" />
+    <toRun name="ClientUI: RabbitMQ" type="LaunchSettings" />
+    <toRun name="Sales: RabbitMQ" type="LaunchSettings" />
+    <toRun name="Shipping: RabbitMQ" type="LaunchSettings" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/src/Billing/ConsoleBackgroundService.cs b/src/Billing/ConsoleBackgroundService.cs
@@ -13,7 +13,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             Console.Clear();
             await Console.Out.WriteLineAsync("""
                 Billing Endpoint:
-
+                 
                 - Press I to increase the simulated failure rate
                 - Press D to decrease the simulated failure rate
                 - Press R to reset simulation
diff --git a/src/Billing/Program.cs b/src/Billing/Program.cs
@@ -1,5 +1,4 @@
 ﻿namespace Billing;
-
 using Microsoft.Extensions.Hosting;
 using MassTransit;
 using Microsoft.Extensions.DependencyInjection;
@@ -20,7 +19,6 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                 services.AddMassTransit(x =>
                 {
                     x.AddConsumers(Assembly.GetExecutingAssembly());
-
                     x.SetupTransport(args);
                 });
 
diff --git a/src/Billing/Properties/launchSettings.json b/src/Billing/Properties/launchSettings.json
@@ -1,16 +1,16 @@
 ﻿{
   "profiles": {
-    "Azure Service Bus": {
+    "RabbitMQ": {
       "commandName": "Project",
-      "commandLineArgs": "--azureservicebus",
+      "commandLineArgs": "--rabbitmq",
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "RabbitMQ": {
+    "Azure Service Bus": {
       "commandName": "Project",
-      "commandLineArgs": "--rabbitmq",
+      "commandLineArgs": "--azureservicebus",
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/ClientUI/Properties/launchSettings.json b/src/ClientUI/Properties/launchSettings.json
@@ -1,16 +1,16 @@
 ﻿{
   "profiles": {
-    "Azure Service Bus": {
+    "RabbitMQ": {
       "commandName": "Project",
-      "commandLineArgs": "--azureservicebus",
+      "commandLineArgs": "--rabbitmq",
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "RabbitMQ": {
+    "Azure Service Bus": {
       "commandName": "Project",
-      "commandLineArgs": "--rabbitmq",
+      "commandLineArgs": "--azureservicebus",
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/Helper/BusRegistrationConfiguratorExt.cs b/src/Helper/BusRegistrationConfiguratorExt.cs
@@ -1,5 +1,4 @@
-﻿using System.Reflection.Metadata;
-using MassTransit;
+﻿using MassTransit;
 
 public static class BusRegistrationConfiguratorExt
 {
diff --git a/src/Sales/Properties/launchSettings.json b/src/Sales/Properties/launchSettings.json
@@ -1,16 +1,16 @@
 ﻿{
   "profiles": {
-    "Azure Service Bus": {
+    "RabbitMQ": {
       "commandName": "Project",
-      "commandLineArgs": "--azureservicebus",
+      "commandLineArgs": "--rabbitmq",
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "RabbitMQ": {
+    "Azure Service Bus": {
       "commandName": "Project",
-      "commandLineArgs": "--rabbitmq",
+      "commandLineArgs": "--azureservicebus",
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/Shipping/Properties/launchSettings.json b/src/Shipping/Properties/launchSettings.json
@@ -1,16 +1,16 @@
 ﻿{
   "profiles": {
-    "Azure Service Bus": {
+    "RabbitMQ": {
       "commandName": "Project",
-      "commandLineArgs": "--azureservicebus",
+      "commandLineArgs": "--rabbitmq",
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "RabbitMQ": {
+    "Azure Service Bus": {
       "commandName": "Project",
-      "commandLineArgs": "--rabbitmq",
+      "commandLineArgs": "--azureservicebus",
       "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/asb.env b/src/asb.env
@@ -1,6 +1,3 @@
-RAVENDB_CONNECTIONSTRING="http://servicecontrol-db:8080"
-ALLOW_MESSAGE_EDITING=true
-SHOW_PENDING_RETRY=true
-
 TRANSPORTTYPE="NetStandardAzureServiceBus"
-CONNECTIONSTRING="<connectionstring>"
+# Update this variable with the value from Azure portal 
+CONNECTIONSTRING="Endpoint=sb://[NAMESPACE].servicebus.windows.net/;SharedAccessKeyName=[KEYNAME];SharedAccessKey=[KEY]"
diff --git a/src/compose-azure.yml b/src/compose-azure.yml
@@ -0,0 +1 @@
+name: particular-platform-masstransit-recoverability-azure
diff --git a/src/compose-rabbitmq.yml b/src/compose-rabbitmq.yml
@@ -0,0 +1,42 @@
+name: particular-platform-masstransit-recoverability-rabbit
+
+services:
+  rabbitmq:
+    container_name: "rabbitmq"
+    image: rabbitmq:management-alpine
+    restart: unless-stopped
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 5s
+      timeout: 30s
+      retries: 5
+      start_period: 30s
+    environment:
+      - RABBITMQ_DEFAULT_USER=guest
+      - RABBITMQ_DEFAULT_PASS=guest
+    volumes:
+      - rabbitmq-data:/var/lib/rabbitmq
+      - rabbitmq-logs:/var/log/rabbitmq
+    ports:
+      - 56721:5672
+      - 15672:15672
+    configs:
+      - source: plugins
+        target: /etc/rabbitmq/enabled_plugins
+
+  service-control:
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+
+  masstransit-connector:
+    environment:
+      - MANAGEMENTAPI
+
+configs:
+  plugins:
+    content: "[rabbitmq_management, rabbitmq_shovel_management]."
+
+volumes:
+  rabbitmq-data:
+  rabbitmq-logs:
diff --git a/src/compose-sqs.yml b/src/compose-sqs.yml
@@ -0,0 +1,12 @@
+name: particular-platform-masstransit-recoverability-sqs
+
+services:
+  masstransit-connector:
+    environment:
+        - AWS_REGION
+        - AWS_ACCESS_KEY_ID
+        - AWS_SECRET_ACCESS_KEY
+
+  service-control:
+    environment:
+        CONNECTIONSTRING: Region=${AWS_REGION};AccessKeyId=${AWS_ACCESS_KEY_ID};SecretAccessKey=${AWS_SECRET_ACCESS_KEY}
diff --git a/src/docker-compose-base.yml b/src/docker-compose-base.yml
@@ -0,0 +1,46 @@
+services:
+  service-control-db:
+    container_name: servicecontrol-db
+    image: particular/servicecontrol-ravendb:6
+    volumes:
+      - sc-data:/var/lib/ravendb/data
+  service-control:
+    depends_on:
+      service-control-db:
+        condition: service_healthy
+    container_name: servicecontrol
+    image: particular/servicecontrol:6
+    command: "--setup-and-run"
+    ports:
+      - 33333:33333
+    environment:
+      - TRANSPORTTYPE
+      - CONNECTIONSTRING
+      - RAVENDB_CONNECTIONSTRING=http://servicecontrol-db:8080
+      - ALLOWMESSAGEEDITING=true
+      - SHOW_PENDING_RETRY=true
+  masstransit-connector:
+    depends_on:
+      service-control:
+        condition: service_healthy
+    container_name: masstransit-connector
+    image: particular/servicecontrol-connector-masstransit:latest
+    command: "--setup-and-run"
+    environment:
+      - TRANSPORTTYPE
+      - CONNECTIONSTRING
+  service-pulse:
+    depends_on:
+      service-control:
+        condition: service_healthy
+    container_name: servicepulse
+    image: particular/servicepulse:latest
+    ports:
+        - 9090:9090
+    environment:
+        SERVICECONTROL_URL: http://localhost:33333/api/
+        ENABLE_REVERSE_PROXY: false
+        SHOW_PENDING_RETRY: false
+
+volumes:
+  sc-data:
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
diff --git a/src/rabbit.env b/src/rabbit.env
@@ -1,7 +1,3 @@
-RAVENDB_CONNECTIONSTRING="http://servicecontrol-db:8080"
-ALLOW_MESSAGE_EDITING=true
-SHOW_PENDING_RETRY=true
-
 TRANSPORTTYPE="RabbitMQ.QuorumConventionalRouting"
 CONNECTIONSTRING="host=rabbitmq"
 
diff --git a/src/sqs.env b/src/sqs.env
@@ -1,10 +1,6 @@
-RAVENDB_CONNECTIONSTRING="http://servicecontrol-db:8080"
-ALLOW_MESSAGE_EDITING=true
-SHOW_PENDING_RETRY=true
-
 TRANSPORTTYPE="AmazonSQS"
-CONNECTIONSTRING="Region=$AWS_REGION;AccessKeyId=$AWS_ACCESS_KEY_ID;SecretAccessKey=$AWS_SECRET_ACCESS_KEY"
 
+# Update these variable values
 AWS_REGION="<region>"
 AWS_ACCESS_KEY_ID="<access-key>"
-AWS_SECRET_ACCESS_KEY="<secret-access-key>"
+AWS_SECRET_ACCESS_KEY="<secret-access-key>"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System.Reflection.Metadata;`
`2`		`-using MassTransit;`
	`1`	`+using MassTransit;`
`3`	`2`
`4`	`3`	`public static class BusRegistrationConfiguratorExt`
`5`	`4`	`{`