diff --git a/.dev/appsettings.override.json b/.dev/appsettings.override.json index e655dfa..6ca6244 100644 --- a/.dev/appsettings.override.json +++ b/.dev/appsettings.override.json @@ -1,5 +1,6 @@ { "Authentication": { + "ApiKey": "test", "JwtSigningCertificate": "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" }, "Cors": { @@ -8,40 +9,33 @@ }, "Infrastructure": { "EventBus": { - "Vendor": "RabbitMQ", - "ConnectionInfo": "rabbitmq", - "RabbitMQUsername": "guest", - "RabbitMQPassword": "guest", - "ConnectionRetryCount": 5 + "ProductName": "RabbitMQ", + "RabbitMQ": { + "EnableSsl": false, + "HostName": "rabbitmq", + "Username": "guest", + "Password": "guest" + } }, "SqlDatabase": { "Provider": "Postgres", - "ConnectionString": "User Id=adminUi;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" + "ConnectionString": "User ID=postgres;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" } }, - "Modules": { - "Challenges": { - "Infrastructure": { - "SqlDatabase": { - "Provider": "Postgres", - "ConnectionString": "User ID=challenges;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" - } - } + "ModuleDefaults": { + "Application": { + "didDomainName": "localhost" }, - "Quotas": { - "Infrastructure": { - "SqlDatabase": { - "Provider": "Postgres", - "ConnectionString": "User ID=quotas;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" - } + "Infrastructure": { + "SqlDatabase": { + "Provider": "Postgres", + "ConnectionString": "User ID=postgres;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" } - }, + } + }, + "Modules": { "Devices": { "Infrastructure": { - "SqlDatabase": { - "Provider": "Postgres", - "ConnectionString": "User ID=devices;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" - }, "PushNotifications": { "Providers": { "Dummy": { @@ -49,63 +43,31 @@ } } } - }, - "Application": { - "didDomainName": "localhost" } }, "Files": { "Infrastructure": { - "SqlDatabase": { - "Provider": "Postgres", - "ConnectionString": "User ID=files;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" - }, "BlobStorage": { - "CloudProvider": "Azure", - "ConnectionInfo": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;" + "ProductName": "AzureStorageAccount", + "AzureStorageAccount": { + "ConnectionString": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;", + "ContainerName": "files" + } } } }, "Messages": { - "Infrastructure": { - "SqlDatabase": { - "Provider": "Postgres", - "ConnectionString": "User ID=messages;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" - } - }, "Application": { - "didDomainName": "localhost" + "maxNumberOfMessageRecipients": 5 } }, - "Relationships": { - "Infrastructure": { - "SqlDatabase": { - "Provider": "Postgres", - "ConnectionString": "User ID=relationships;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" - } - }, + "Tags": { "Application": { - "didDomainName": "localhost" - } - }, - "Synchronization": { - "Infrastructure": { - "SqlDatabase": { - "Provider": "Postgres", - "ConnectionString": "User ID=synchronization;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" - } - } - }, - "Tokens": { - "Infrastructure": { - "SqlDatabase": { - "Provider": "Postgres", - "ConnectionString": "User ID=tokens;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" - } + "SupportedLanguages": ["en"] } } }, - "Serilog": { + "Logging": { "MinimumLevel": { "Default": "Debug" }, @@ -118,19 +80,5 @@ } } ] - }, - "SwaggerUi": { - "TokenUrl": "http://localhost:5000/connect/token", - "Enabled": true - }, - "Logging": { - "WriteTo": { - "Console": { - "Name": "Console", - "Args": { - "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss}|{Level} => CorrelationID:{CorrelationID} => RequestId:{RequestId} => RequestPath:{RequestPath}{NewLine} {SourceContext}{NewLine} {Message}{NewLine}{Exception}" - } - } - } } } diff --git a/.dev/compose.backbone.env b/.dev/compose.backbone.env index 1d41727..f77e38d 100644 --- a/.dev/compose.backbone.env +++ b/.dev/compose.backbone.env @@ -1 +1 @@ -BACKBONE_VERSION=6.6.1 +BACKBONE_VERSION=6.43.0 diff --git a/.dev/compose.backbone.yml b/.dev/compose.backbone.yml index 8428dee..e5d63fb 100644 --- a/.dev/compose.backbone.yml +++ b/.dev/compose.backbone.yml @@ -12,8 +12,6 @@ services: condition: service_started rabbitmq: condition: service_started - seed-database: - condition: service_completed_successfully azure-storage-emulator: condition: service_started database-migrator: @@ -36,35 +34,16 @@ services: - source: Config target: app/appsettings.override.json - admin-ui: - image: ghcr.io/nmshd/backbone-admin-ui:${BACKBONE_VERSION} - container_name: admin-ui - hostname: admin-ui - ports: - - "8091:8080" - depends_on: - database: - condition: service_started - rabbitmq: - condition: service_started - consumer-api: - condition: service_healthy - database-migrator: - condition: service_completed_successfully - configs: - - source: Config - target: app/appsettings.override.json - database-migrator: container_name: database-migrator-test image: ghcr.io/nmshd/backbone-database-migrator:${BACKBONE_VERSION} - depends_on: - seed-database: - condition: service_completed_successfully environment: Infrastructure__SqlDatabase__Provider: Postgres Infrastructure__SqlDatabase__ConnectionString: "Server=postgres;Database=enmeshed;User Id=postgres;Password=Passw0rd;Port=5432" ASPNETCORE_ENVIRONMENT: Development + depends_on: + database: + condition: service_healthy configs: - source: Config target: app/appsettings.override.json @@ -78,8 +57,6 @@ services: environment: - POSTGRES_PASSWORD=Passw0rd - POSTGRES_DB=enmeshed - ports: - - 5432:5432 healthcheck: test: ["CMD", "pg_isready", "-U", "postgres"] interval: 5s @@ -91,28 +68,15 @@ services: hostname: azurite image: mcr.microsoft.com/azure-storage/azurite command: azurite -d /data/debug.log -l /data --blobHost "0.0.0.0" --queueHost "0.0.0.0" - ports: - - "10000:10000" + pull_policy: always rabbitmq: container_name: bkb-rabbitmq hostname: rabbitmq - image: rabbitmq:3.12.10-management-alpine - ports: - - "5672:5672" + image: rabbitmq:4.1.0-alpine ### seeds ### - seed-database: - container_name: seed-database - image: postgres - environment: - - PGPASSWORD=Passw0rd - command: /bin/bash -c 'env && apt update -y && apt install -y wget && wget https://raw.githubusercontent.com/nmshd/backbone/${BACKBONE_VERSION}/scripts/sql/postgres/setup.sql -O /setup-postgres.sql && psql -h postgres -U postgres -d enmeshed -f /setup-postgres.sql' - depends_on: - database: - condition: service_healthy - seed-client: container_name: seed-client image: ghcr.io/nmshd/backbone-admin-cli:${BACKBONE_VERSION} @@ -120,9 +84,9 @@ services: consumer-api: condition: service_healthy command: backbone client create --clientId test --clientSecret test --defaultTier Basic - environment: - Database__Provider: Postgres - Database__ConnectionString: "Server=postgres;Database=enmeshed;User Id=devices;Password=Passw0rd;Port=5432" + configs: + - source: Config + target: app/appsettings.override.json configs: Config: