Merge pull request #119 from Particular/az-improvements

Removed the file reading

Author: johnsimons

README.md

@@ -39,15 +39,23 @@ docker compose -p particular-platform-showcase -f docker-compose-base.yml -f com
 ### (Alternative) Run from an IDE
 
 <details>
-> [!WARNING]
-> When using Visual Studio, ensure you have the "Enable Multi-Project Launch profiles" setting on. Allow Visual Studio 2022 "multi-launch" so you can easily select the profile you want to run.
->
-> It can be activated by accessing the Tools menu -> Manage preview features- Enable Multi-Project Launch profiles.
+TIP
+When using Visual Studio, ensure you have the "Enable Multi-Project Launch profiles" setting on. Allow Visual Studio 2022 "multi-launch" so you can easily select the profile you want to run.
+It can be activated by accessing the Tools menu -> Manage preview features- Enable Multi-Project Launch profiles.
 
 To start the required infrastructure for the showcase, run one of the docker command below from the `src` folder in a terminal.
 
 RabbitMQ
 
+Update `rabbit.env` file section named "Only used for the showcase processes" to:
+```env
+# Only used for the showcase processes
+RABBITMQ_HOST="localhost"
+RABBITMQ_PORT="33721"
+RABBITMQ_VIRTUALHOST="/"
+```
+
+Then run:
 ```cmd
 docker compose -p particular-platform-showcase -f docker-compose-base.yml -f compose-rabbitmq.yml --env-file rabbit.env --profile infrastructure --profile frontend up -d
 ```

src/Helper/BusRegistrationConfiguratorExt.cs

@@ -5,39 +5,51 @@ public static class BusRegistrationConfiguratorExt
 {
     public static void SetupTransport(this IBusRegistrationConfigurator x, string[] args)
     {
-        string selectedTransport = Environment.GetEnvironmentVariable("TRANSPORT_TYPE") ?? "RabbitMQ";
+        var selectedTransport = Environment.GetEnvironmentVariable("TRANSPORT_TYPE") ?? "RabbitMQ";
+        string envFile;
 
         switch (selectedTransport)
         {
-            case "AmazonSQS":
-                x.UsingAmazonSqs((ctx, cfg) =>
+            case "AzureServiceBus":
+                var connectionString = Environment.GetEnvironmentVariable("CONNECTION_STRING");
+                envFile = Path.GetFullPath("../../../asb.env");
+                if (File.Exists(envFile))
                 {
-                    var envs = DotEnv.Read(new DotEnvOptions(envFilePaths: [Path.GetFullPath("../../../sqs.env")]));
-                    cfg.Host(envs["AWS_REGION"], h =>
-                    {
-                        h.AccessKey(envs["AWS_ACCESS_KEY_ID"]);
-                        h.SecretKey(envs["AWS_SECRET_ACCESS_KEY"]);
-                    });
+                    var envs = DotEnv.Read(new DotEnvOptions(envFilePaths: [envFile], ignoreExceptions: false));
+                    connectionString = envs["CONNECTION_STRING"];
+                }
 
-                    cfg.ConfigureEndpoints(ctx);
-                });
-                break;
-            case "AzureServiceBus":
-                var envs = DotEnv.Read(new DotEnvOptions(envFilePaths: [Path.GetFullPath("../../../asb.env")], ignoreExceptions: false));
                 x.UsingAzureServiceBus((context, cfg) =>
                 {
-                    cfg.Host(envs["CONNECTION_STRING"]);
+                    cfg.Host(connectionString);
 
                     cfg.ConfigureEndpoints(context);
                 });
+
                 break;
             case "RabbitMQ":
+                var host = Environment.GetEnvironmentVariable("RABBITMQ_HOST");
+                var port = Environment.GetEnvironmentVariable("RABBITMQ_PORT") ?? "5672";
+                var vHost = Environment.GetEnvironmentVariable("RABBITMQ_VIRTUALHOST");
+                var username = Environment.GetEnvironmentVariable("RABBITMQ_MANAGEMENT_API_USERNAME");
+                var password = Environment.GetEnvironmentVariable("RABBITMQ_MANAGEMENT_API_PASSWORD");
+                envFile = Path.GetFullPath("../../../rabbit.env");
+                if (File.Exists(envFile))
+                {
+                    var envs = DotEnv.Read(new DotEnvOptions(envFilePaths: [envFile], ignoreExceptions: false));
+                    host = envs["RABBITMQ_HOST"];
+                    port = envs["RABBITMQ_PORT"];
+                    vHost = envs["RABBITMQ_VIRTUALHOST"];
+                    username = envs["RABBITMQ_MANAGEMENT_API_USERNAME"];
+                    password = envs["RABBITMQ_MANAGEMENT_API_PASSWORD"];
+                }
+
                 x.UsingRabbitMq((context, cfg) =>
                 {
-                    cfg.Host("rabbitmq", 5672, "/", h =>
+                    cfg.Host(host, ushort.Parse(port), vHost, h =>
                     {
-                        h.Username("guest");
-                        h.Password("guest");
+                        h.Username(username);
+                        h.Password(password);
                     });
                     cfg.ConfigureEndpoints(context);
                 });

src/MassTransitShowcaseDemo.sln

@@ -2,11 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34902.65
 MinimumVisualStudioVersion = 15.0.26730.12
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7D29C905-CE3A-4D93-8271-7BA09CEE1631}"
-	ProjectSection(SolutionItems) = preProject
-		Directory.Build.props = Directory.Build.props
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientUI", "ClientUI\ClientUI.csproj", "{918001C1-B9F6-4E81-894B-128271E8D910}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Messages", "Messages\Messages.csproj", "{CFF586B0-0FA1-4F3C-B860-44BE86B0F341}"

src/compose-rabbitmq-user.yml

@@ -8,4 +8,32 @@ services:
     environment:
       - LICENSINGCOMPONENT_RABBITMQ_APIURL=${RABBITMQ_MANAGEMENT_API_URL}
       - LICENSINGCOMPONENT_RABBITMQ_USERNAME=${RABBITMQ_MANAGEMENT_API_USERNAME}
-      - LICENSINGCOMPONENT_RABBITMQ_PASSWORD=${RABBITMQ_MANAGEMENT_API_PASSWORD}
+      - LICENSINGCOMPONENT_RABBITMQ_PASSWORD=${RABBITMQ_MANAGEMENT_API_PASSWORD}
+  clientui:
+    environment:
+      - RABBITMQ_MANAGEMENT_API_USERNAME
+      - RABBITMQ_MANAGEMENT_API_PASSWORD
+      - RABBITMQ_HOST
+      - RABBITMQ_PORT
+      - RABBITMQ_VIRTUALHOST
+  sales:
+    environment:
+      - RABBITMQ_MANAGEMENT_API_USERNAME
+      - RABBITMQ_MANAGEMENT_API_PASSWORD
+      - RABBITMQ_HOST
+      - RABBITMQ_PORT
+      - RABBITMQ_VIRTUALHOST
+  shipping:
+    environment:
+      - RABBITMQ_MANAGEMENT_API_USERNAME
+      - RABBITMQ_MANAGEMENT_API_PASSWORD
+      - RABBITMQ_HOST
+      - RABBITMQ_PORT
+      - RABBITMQ_VIRTUALHOST
+  billing:
+    environment:
+      - RABBITMQ_MANAGEMENT_API_USERNAME
+      - RABBITMQ_MANAGEMENT_API_PASSWORD
+      - RABBITMQ_HOST
+      - RABBITMQ_PORT
+      - RABBITMQ_VIRTUALHOST

src/compose-rabbitmq.yml

@@ -40,6 +40,35 @@ services:
       - RABBITMQ_MANAGEMENT_API_URL
       - RABBITMQ_MANAGEMENT_API_USERNAME
       - RABBITMQ_MANAGEMENT_API_PASSWORD
+  
+  clientui:
+    environment:
+      - RABBITMQ_MANAGEMENT_API_USERNAME
+      - RABBITMQ_MANAGEMENT_API_PASSWORD
+      - RABBITMQ_HOST
+      - RABBITMQ_PORT
+      - RABBITMQ_VIRTUALHOST
+  sales:
+    environment:
+      - RABBITMQ_MANAGEMENT_API_USERNAME
+      - RABBITMQ_MANAGEMENT_API_PASSWORD
+      - RABBITMQ_HOST
+      - RABBITMQ_PORT
+      - RABBITMQ_VIRTUALHOST
+  shipping:
+    environment:
+      - RABBITMQ_MANAGEMENT_API_USERNAME
+      - RABBITMQ_MANAGEMENT_API_PASSWORD
+      - RABBITMQ_HOST
+      - RABBITMQ_PORT
+      - RABBITMQ_VIRTUALHOST
+  billing:
+    environment:
+      - RABBITMQ_MANAGEMENT_API_USERNAME
+      - RABBITMQ_MANAGEMENT_API_PASSWORD
+      - RABBITMQ_HOST
+      - RABBITMQ_PORT
+      - RABBITMQ_VIRTUALHOST
 
 configs:
   plugins:

src/rabbit.env

@@ -6,7 +6,7 @@ RABBITMQ_MANAGEMENT_API_URL="http://rabbitmq:15672"
 RABBITMQ_MANAGEMENT_API_USERNAME=guest
 RABBITMQ_MANAGEMENT_API_PASSWORD=guest
 
-#Only used for the showcase processes
+# Only used for the showcase processes
 RABBITMQ_HOST="rabbitmq"
 RABBITMQ_PORT="5672"
 RABBITMQ_VIRTUALHOST="/"