Debug locally instead of in Docker

AdminUi/src/AdminUi/AdminUi.csproj

@@ -3,10 +3,8 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <SpaRoot>ClientApp\</SpaRoot>
-        <SpaProxyServerUrl>http://localhost:4200</SpaProxyServerUrl>
+        <SpaProxyServerUrl>http://localhost:8080</SpaProxyServerUrl>
         <SpaProxyLaunchCommand>npm start</SpaProxyLaunchCommand>
-        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <DockerfileContext>..\..\..</DockerfileContext>
     </PropertyGroup>
 
     <ItemGroup>

AdminUi/src/AdminUi/ClientApp/README.md

@@ -1,6 +1,6 @@
 ## Development server
 
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
+Run `ng serve` for a dev server. Navigate to `http://localhost:8080/`. The application will automatically reload if you change any of the source files.
 
 ## Code scaffolding
 

AdminUi/src/AdminUi/ClientApp/package.json

@@ -4,7 +4,7 @@
     "license": "MIT",
     "scripts": {
         "ng": "ng",
-        "start": "ng serve --host 0.0.0.0 --disable-host-check --poll 1000",
+        "start": "ng serve --port 8080 --host 0.0.0.0 --disable-host-check --poll 1000",
         "build": "ng build",
         "build:ssr": "ng run AdminUi:server:dev",
         "watch": "ng build --watch --configuration development",

AdminUi/src/AdminUi/ClientApp/src/environments/environment.development.ts

@@ -1,5 +1,5 @@
 export const environment = {
     production: false,
-    apiUrl: "http://localhost:5173/api/v1",
-    odataUrl: "http://localhost:5173/odata"
+    apiUrl: "http://localhost:8082/api/v1",
+    odataUrl: "http://localhost:8082/odata"
 };

AdminUi/src/AdminUi/Properties/launchSettings.json

@@ -1,39 +1,13 @@
 {
-    "profiles": {
-        "AdminAPI": {
-            "commandName": "Project",
-            "launchBrowser": false,
-            "environmentVariables": {
-                "ASPNETCORE_ENVIRONMENT": "Development",
-                "Infrastructure__EventBus__ConnectionInfo": "localhost",
-                "Infrastructure__SqlDatabase__ConnectionString": "User ID=adminUi;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;", // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=adminUi;Password=Passw0rd;TrustServerCertificate=True"
-                "Modules__Devices__Infrastructure__SqlDatabase__ConnectionString": "User ID=devices;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;", // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=devices;Password=Passw0rd;TrustServerCertificate=True"
-                "Modules__Quotas__Infrastructure__SqlDatabase__ConnectionString": "User ID=quotas;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;", // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=quotas;Password=Passw0rd;TrustServerCertificate=True"
-                "Logging__WriteTo__Seq__Args__ServerUrl": "http://localhost:5341"
-            },
-            "applicationUrl": "http://0.0.0.0:5000"
-        },
-        "AdminUi": {
-            "commandName": "Project",
-            "launchBrowser": true,
-            "applicationUrl": "http://localhost:5173",
-            "environmentVariables": {
-                "ASPNETCORE_ENVIRONMENT": "Development",
-                "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
-                "Infrastructure__EventBus__ConnectionInfo": "localhost",
-                "Infrastructure__SqlDatabase__ConnectionString": "User ID=adminUi;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;", // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=adminUi;Password=Passw0rd;TrustServerCertificate=True"
-                "Modules__Devices__Infrastructure__SqlDatabase__ConnectionString": "User ID=devices;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;", // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=devices;Password=Passw0rd;TrustServerCertificate=True"
-                "Modules__Quotas__Infrastructure__SqlDatabase__ConnectionString": "User ID=quotas;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;", // "ConnectionString": "Server=localhost;Database=enmeshed;User Id=quotas;Password=Passw0rd;TrustServerCertificate=True"
-                "Logging__WriteTo__Seq__Args__ServerUrl": "http://localhost:5341"
-            }
-        }
-    },
-    "iisSettings": {
-        "windowsAuthentication": false,
-        "anonymousAuthentication": true,
-        "iisExpress": {
-            "applicationUrl": "http://localhost:39955",
-            "sslPort": 0
-        }
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "Default": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Local",
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
+        "ASPNETCORE_URLS": "http://localhost:8082"
+      }
     }
+  }
 }

AdminUi/src/AdminUi/appsettings.override.json

@@ -3,7 +3,7 @@
         "ApiKey": "test"
     },
     "Cors": {
-        "AllowedOrigins": "http://localhost:4200;https://localhost:4200",
+        "AllowedOrigins": "http://localhost:8080;https://localhost:8080",
         "ExposedHeaders": "",
         "AccessControlAllowCredentials": true
     },
@@ -13,7 +13,7 @@
     "Infrastructure": {
         "EventBus": {
             "Vendor": "RabbitMQ", // possible values: InMemory, RabbitMQ, GoogleCloud, Azure
-            "ConnectionInfo": "rabbitmq",
+            "ConnectionInfo": "localhost",
 
             "RabbitMQUsername": "guest", // only available for RabbitMQ
             "RabbitMQPassword": "guest", // only available for RabbitMQ
@@ -24,7 +24,7 @@
         },
         "SqlDatabase": {
             "Provider": "Postgres",
-            "ConnectionString": "User ID=adminUi;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" // postgres
+            "ConnectionString": "User ID=adminUi;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;" // postgres
             //"ConnectionString": "Server=ms-sql-server;Database=enmeshed;User Id=adminUi;Password=Passw0rd;TrustServerCertificate=True"
         }
     },
@@ -40,7 +40,7 @@
             "Infrastructure": {
                 "SqlDatabase": {
                     "Provider": "Postgres",
-                    "ConnectionString": "User ID=devices;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" // postgres
+                    "ConnectionString": "User ID=devices;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;" // postgres
                     //"ConnectionString": "Server=ms-sql-server;Database=enmeshed;User Id=devices;Password=Passw0rd;TrustServerCertificate=True"
                 },
                 "PushNotifications": {
@@ -58,7 +58,7 @@
             "Infrastructure": {
                 "SqlDatabase": {
                     "Provider": "Postgres",
-                    "ConnectionString": "User ID=quotas;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" // postgres
+                    "ConnectionString": "User ID=quotas;Password=Passw0rd;Server=localhost;Port=5432;Database=enmeshed;" // postgres
                     //"ConnectionString": "Server=ms-sql-server;Database=enmeshed;User Id=quotas;Password=Passw0rd;TrustServerCertificate=True"
                 }
             }
@@ -79,8 +79,11 @@
             "Seq": {
                 "Name": "Seq",
                 "Args": {
-                    "ServerUrl": "http://seq:5341"
+                    "ServerUrl": "http://localhost:5341"
                 }
+            },
+            "Debug": {
+                "Name": "Debug"
             }
         }
     }

Backbone.slnLaunch

@@ -0,0 +1,22 @@
+[
+  {
+    "Name": "Admin UI \u002B Consumer API",
+    "Projects": [
+      {
+        "Name": "ConsumerApi\\ConsumerApi.csproj",
+        "Action": "Start",
+        "DebugTarget": ""
+      },
+      {
+        "Name": "docker-compose\\docker-compose.dcproj",
+        "Action": "StartWithoutDebugging",
+        "DebugTarget": ""
+      },
+      {
+        "Name": "AdminUi\\src\\AdminUi\\AdminUi.csproj",
+        "Action": "Start",
+        "DebugTarget": ""
+      }
+    ]
+  }
+]

BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs

@@ -3,7 +3,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Npgsql;
 using Polly;
+using Polly.Retry;
 
 namespace Backbone.BuildingBlocks.API.Extensions;
 
@@ -20,13 +22,12 @@ public static IHost MigrateDbContext<TContext>(this IHost host) where TContext :
         {
             logger.LogInformation("Migrating database associated with context '{context}'", typeof(TContext).Name);
 
-            var retry = Policy.Handle<SqlException>()
-                .WaitAndRetry(new[]
-                {
+            var retry = Policy.Handle<SqlException>().Or<PostgresException>()
+                .WaitAndRetry([
                     TimeSpan.FromSeconds(5),
                     TimeSpan.FromSeconds(10),
                     TimeSpan.FromSeconds(15)
-                });
+                ]);
 
             retry.Execute(context.Database.Migrate);
 

BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/RabbitMQServiceCollectionExtensions.cs

@@ -19,7 +19,6 @@ public static void AddRabbitMq(this IServiceCollection services, Action<RabbitMq
         {
             var logger = sp.GetRequiredService<ILogger<DefaultRabbitMqPersistentConnection>>();
 
-
             var factory = new ConnectionFactory
             {
                 HostName = options.HostName

ConsumerApi.Tests.Integration/Features/Tokens/{id}/GET.feature

@@ -1,49 +1,49 @@
-@Integration
-Feature: GET Token
-
-User requests a Token
-
-Scenario: Requesting an own Token as an authenticated user
-	Given the user is authenticated
-	And an own Token t
-	When a GET request is sent to the Tokens/{id} endpoint with t.Id
-	Then the response status code is 200 (OK)
-	And the response contains a Token
-
-Scenario: Requesting an own Token as an anonymous user
-	Given the user is unauthenticated
-	And an own Token t
-	When a GET request is sent to the Tokens/{id} endpoint with t.Id
-	Then the response status code is 200 (OK)
-	And the response contains a Token
-
-Scenario: Requesting a peer Token as an authenticated user
-	Given the user is authenticated
-	And a peer Token p
-	When a GET request is sent to the Tokens/{id} endpoint with p.Id
-	Then the response status code is 200 (OK)
-	And the response contains a Token
-
-Scenario: Requesting a nonexistent Token as an authenticated user
-	Given the user is authenticated
-	When a GET request is sent to the Tokens/{id} endpoint with "TOKthisisnonexisting"
-	Then the response status code is 404 (Not Found)
-	And the response content includes an error with the error code "error.platform.recordNotFound"
-
-#@ignore("skipping_due_to_required_backbone_changes")
-#Scenario: Requesting a Token with an unsupported Accept Header
-#	Given the Accept header is 'application/xml'
-#	When a GET request is sent to the Tokens/{id} endpoint with a valid Id
-#	Then the response status code is 406 (Not Acceptable)
-#
-#@ignore("skipping_due_to_required_backbone_changes")
-#Scenario Outline: Requesting a Token with an invalid id
-#	When a GET request is sent to the Tokens/{id} endpoint with <id>
-#	Then the response status code is 400 (Bad Request)
-#	And the response content includes an error with the error code "error.platform.invalidId"
-#Examples:
-#	| id                          | description                 |
-#	| TOKthishastoomanycharacters | More than 20 characters     |
-#	| TOKnotenoughchars           | Less than 20 characters     |
-#	| TOK_frfssd_fdfdsed#_        | Contains invalid characters |
+@Integration
+Feature: GET Token
+
+User requests a Token
+
+Scenario: Requesting an own Token as an authenticated user
+	Given the user is authenticated
+	And an own Token t
+	When a GET request is sent to the Tokens/{id} endpoint with t.Id
+	Then the response status code is 200 (OK)
+	And the response contains a Token
+
+Scenario: Requesting an own Token as an anonymous user
+	Given the user is unauthenticated
+	And an own Token t
+	When a GET request is sent to the Tokens/{id} endpoint with t.Id
+	Then the response status code is 200 (OK)
+	And the response contains a Token
+
+Scenario: Requesting a peer Token as an authenticated user
+	Given the user is authenticated
+	And a peer Token p
+	When a GET request is sent to the Tokens/{id} endpoint with p.Id
+	Then the response status code is 200 (OK)
+	And the response contains a Token
+
+Scenario: Requesting a nonexistent Token as an authenticated user
+	Given the user is authenticated
+	When a GET request is sent to the Tokens/{id} endpoint with "TOKthisisnonexisting"
+	Then the response status code is 404 (Not Found)
+	And the response content includes an error with the error code "error.platform.recordNotFound"
+
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario: Requesting a Token with an unsupported Accept Header
+#	Given the Accept header is 'application/xml'
+#	When a GET request is sent to the Tokens/{id} endpoint with a valid Id
+#	Then the response status code is 406 (Not Acceptable)
+#
+#@ignore("skipping_due_to_required_backbone_changes")
+#Scenario Outline: Requesting a Token with an invalid id
+#	When a GET request is sent to the Tokens/{id} endpoint with <id>
+#	Then the response status code is 400 (Bad Request)
+#	And the response content includes an error with the error code "error.platform.invalidId"
+#Examples:
+#	| id                          | description                 |
+#	| TOKthishastoomanycharacters | More than 20 characters     |
+#	| TOKnotenoughchars           | Less than 20 characters     |
+#	| TOK_frfssd_fdfdsed#_        | Contains invalid characters |
 #	| POKfdjfdjflndjkfndjk        | Does not have TOK prefix    |

ConsumerApi/ConsumerApi.csproj

@@ -2,8 +2,6 @@
 
 	<PropertyGroup>
 		<UserSecretsId>f114fba8-95dd-4fee-8385-af8e8a343c68</UserSecretsId>
-		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
 	</PropertyGroup>
 
 	<ItemGroup>

ConsumerApi/Properties/launchSettings.json

@@ -1,13 +1,13 @@
 {
-    "profiles": {
-        "Default": {
-            "commandName": "Project"
-        },
-        "Docker": {
-            "commandName": "Docker",
-            "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-            "publishAllPorts": true
-        }
-    },
-    "$schema": "http://json.schemastore.org/launchsettings.json"
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "Default": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "Modules__Files__Infrastructure__BlobStorage__ConnectionInfo": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;",
+        "ASPNETCORE_ENVIRONMENT": "Local",
+        "ASPNETCORE_URLS": "http://localhost:8081"
+      }
+    }
+  }
 }

ConsumerApi/QuotasDbContextSeeder.cs

@@ -22,7 +22,7 @@ public QuotasDbContextSeeder(DevicesDbContext devicesDbContext, IMediator mediat
 
     public async Task SeedAsync(QuotasDbContext context)
     {
-        await SeedTier(context);
+        await SeedTiers(context);
         await AddTierToIdentities(context);
         await EnsureQueuedForDeletionTierWithQuotas();
     }
@@ -45,7 +45,7 @@ private async Task AddTierToIdentities(QuotasDbContext context)
         await context.SaveChangesAsync();
     }
 
-    private async Task SeedTier(QuotasDbContext context)
+    private async Task SeedTiers(QuotasDbContext context)
     {
         if (await context.Tiers.AnyAsync())
             return;