Merge pull request #14 from kapozade/feature/#13

Arrange file contents according to user choices.

Author: kapozade

SupremeDotnetApiTemplate.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>1.1.1</PackageVersion>
+    <PackageVersion>1.2.0-rc.1</PackageVersion>
     <PackageId>Supreme.Dotnet.Api.Template</PackageId>
     <Title>Supreme API Template</Title>
     <Authors>Onur Kapçık</Authors>

templates/api/Directory.Build.targets

@@ -14,6 +14,7 @@
     <PackageReference Update="FluentValidation.DependencyInjectionExtensions" Version="11.5.2" />
     <PackageReference Update="MediatR" Version="12.0.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="7.0.5" />
+    <PackageReference Update="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.8" />
     <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5"/>
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.5.0" />
     <PackageReference Update="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />

templates/api/container/Dockerfile.app

@@ -34,17 +34,21 @@ ENV DB_NAME=Supreme
 ENV DB_USER=sqlsa
 ENV DB_PASSWORD=SuperPass1
 ENV DB_CONNECTION_TIMEOUT=15
+//#if (enable-outbox-pattern)
 ENV RABBITMQ_HOST=rabbitmq
 ENV RABBITMQ_PORT=5672
 ENV RABBITMQ_VHOST=/
 ENV RABBITMQ_USERNAME=guest
 ENV RABBITMQ_PASSWORD=guest
+//#endif
 ENV REDIS_HOST=redis
 ENV REDIS_PORT=6379
 ENV REDIS_DBID=1
 ENV REDIS_USER=kapozade
 ENV REDIS_PASSWORD=7b0evpiTayUA9kw0VYLRyWzc0mxPChtU
+//#if (enable-open-telemetry)
 ENV JAEGER_HOST=http://jaeger:4317
+//#endif
 ENV ASPNETCORE_URLS=http://*:5000
 
 RUN envsubst < /app/appsettings.json.tmpl > /app/appsettings.json

templates/api/docker-compose.yml

@@ -9,6 +9,12 @@ services:
     depends_on:
       - redis
       - mysql
+//#if (enable-outbox-pattern)
+      - rabbitmq
+//#endif
+//#if (enable-open-telemetry)
+      - jaeger
+//#endif
 
   mysql:
     image: mysql:8.0
@@ -39,13 +45,16 @@ services:
     ports:
       - "6379:6379"
 
+//#if (enable-outbox-pattern)
   rabbitmq:
     container_name: rabbitmq
     image: heidiks/rabbitmq-delayed-message-exchange
     ports:
       - "15672:15672"
       - "5672:5672"
+//#endif
 
+//#if (enable-open-telemetry)
   jaeger:
     image: jaegertracing/all-in-one:latest
     container_name: jaeger
@@ -60,3 +69,4 @@ services:
       - "14268:14268"
     environment:
       - COLLECTOR_OTLP_ENABLED=true
+//#endif

templates/api/src/Supreme.Api/appsettings.json

@@ -24,13 +24,15 @@
       "WithThreadId"
     ]
   },
+  //#if (enable-outbox-pattern)
   "RabbitMqSettings": {
     "Host": "localhost",
     "Port": 5672,
     "VirtualHost": "/",
     "Username": "guest",
     "Password": "guest"
   },
+  //#endif
   "ApplicationSettings": {
   },
   "RedisSettings": {
@@ -40,7 +42,9 @@
     "User": "User",
     "Password": "Password"
   },
+  //#if (enable-open-telemetry)
   "JaegerSettings": {
     "Url": "http://localhost:4317"
   }
+  //#endif
 }

templates/api/src/Supreme.Api/appsettings.json.tmpl

@@ -24,13 +24,15 @@
       "WithThreadId"
     ]
   },
+  //#if (enable-outbox-pattern)
   "RabbitMqSettings": {
     "Host": "$RABBITMQ_HOST",
     "Port": $RABBITMQ_PORT,
     "VirtualHost": "$RABBITMQ_VHOST",
     "Username": "$RABBITMQ_USERNAME",
     "Password": "$RABBITMQ_PASSWORD",
   },
+  //#endif
   "ApplicationSettings": {
   },
   "RedisSettings": {
@@ -40,7 +42,9 @@
     "User": "$REDIS_USER",
     "Password": "$REDIS_PASSWORD",
   },
+  //#if (enable-open-telemetry)
   "JaegerSettings": {
     "Url": "$JAEGER_HOST",
   }
+  //#endif
 }

templates/api/src/Supreme.Infrastructure/Supreme.Infrastructure.csproj

@@ -48,6 +48,8 @@
     <PackageReference Include="MediatR" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
     <PackageReference Include="Scrutor" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+
   </ItemGroup>
 
 </Project>