Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use redis in web api #527

Merged
merged 22 commits into from
Mar 13, 2024
Merged

feat: use redis in web api #527

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bd32fd6
chore: restructure bicep types
arealmaas Mar 5, 2024
53af77f
chore: restructure bicep params
arealmaas Mar 5, 2024
e9d87be
chore: restructure bicep params
arealmaas Mar 5, 2024
fa0769f
feat: add redis
arealmaas Mar 5, 2024
e2e9d13
feat: add redis
arealmaas Mar 5, 2024
f3dc0a4
cleanup
arealmaas Mar 5, 2024
64b0321
cleanup
arealmaas Mar 5, 2024
b389dc5
feat(azure): add redis
arealmaas Mar 5, 2024
dc6450b
feat(web-api): use redis for distributed cache
arealmaas Mar 5, 2024
a77e5b7
muurge
arealmaas Mar 7, 2024
18acd25
cleanup
arealmaas Mar 7, 2024
99f5b29
cleanup
arealmaas Mar 7, 2024
fbf87c5
refactor connection string
arealmaas Mar 11, 2024
e9e6414
muurge
arealmaas Mar 11, 2024
ed6cf2b
refactorz
arealmaas Mar 11, 2024
2128b24
cleanup
arealmaas Mar 11, 2024
9cc6837
fix condition
arealmaas Mar 11, 2024
ec494c4
cleanup
arealmaas Mar 11, 2024
2ab22d2
cleanup
arealmaas Mar 11, 2024
4eb60f2
testing and fix validation
arealmaas Mar 12, 2024
9335541
cleanup
arealmaas Mar 12, 2024
8a892d5
muurge
arealmaas Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion docker-compose-no-webapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,18 @@ services:
interval: 5s
timeout: 20s
retries: 5


dialogporten-redis:
image: redis:7.0-alpine
restart: always
ports:
- "6379:6379"
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 10s
timeout: 5s
retries: 5

dialogporten-service:
build:
context: .
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ services:
depends_on:
dialogporten-postgres:
condition: service_healthy

dialogporten-redis:
condition: service_healthy
environment:
- Infrastructure:DialogRedisConnectionString=redis://dialogporten-redis:6379
- Infrastructure:DialogDbConnectionString=${DB_CONNECTION_STRING}
- Serilog__WriteTo__0__Name=Console
- Serilog__MinimumLevel__Default=Debug
Expand Down
1 change: 1 addition & 0 deletions ...igdir.Domain.Dialogporten.Infrastructure/Digdir.Domain.Dialogporten.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<PackageReference Include="Altinn.ApiClients.Maskinporten" Version="9.1.0" />
<PackageReference Include="Altinn.Authorization.ABAC" Version="0.0.7" />
<PackageReference Include="Bogus" Version="35.4.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
Expand Down
8 changes: 8 additions & 0 deletions src/Digdir.Domain.Dialogporten.Infrastructure/InfrastructureExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
// Framework
.AddValidatorsFromAssembly(thisAssembly, ServiceLifetime.Transient, includeInternalTypes: true)
.AddDistributedMemoryCache()
.AddStackExchangeRedisCache(options =>
{
var infrastructureSettings = infrastructureConfigurationSection.Get<InfrastructureSettings>()
?? throw new InvalidOperationException("Failed to get Redis connection string. Infrastructure settings must not be null.");
oskogstad marked this conversation as resolved.
Show resolved Hide resolved
var connectionString = infrastructureSettings.DialogRedisConnectionString;
options.Configuration = connectionString;
options.InstanceName = "Redis";
})
.AddDbContext<DialogDbContext>((services, options) =>
{
var connectionString = services.GetRequiredService<IOptions<InfrastructureSettings>>()
Expand Down
1 change: 1 addition & 0 deletions src/Digdir.Domain.Dialogporten.Infrastructure/InfrastructureSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public sealed class InfrastructureSettings
public const string ConfigurationSectionName = "Infrastructure";

public required string DialogDbConnectionString { get; init; }
public required string DialogRedisConnectionString { get; init; }
public required AltinnPlatformSettings Altinn { get; init; }
public required AltinnCdnPlatformSettings AltinnCdn { get; init; }
public required MaskinportenSettings Maskinporten { get; init; }
Expand Down
24 changes: 12 additions & 12 deletions src/Digdir.Domain.Dialogporten.WebApi/Digdir.Domain.Dialogporten.WebApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.4"/>
<PackageReference Include="FastEndpoints.Swagger" Version="5.22.0"/>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.2"/>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2"/>
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0"/>
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1"/>
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
<PackageReference Include="Azure.Identity" Version="1.10.4" />
arealmaas marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="FastEndpoints.Swagger" Version="5.22.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Digdir.Domain.Dialogporten.Application\Digdir.Domain.Dialogporten.Application.csproj"/>
<ProjectReference Include="..\Digdir.Domain.Dialogporten.Infrastructure\Digdir.Domain.Dialogporten.Infrastructure.csproj"/>
<ProjectReference Include="..\Digdir.Domain.Dialogporten.Application\Digdir.Domain.Dialogporten.Application.csproj" />
<ProjectReference Include="..\Digdir.Domain.Dialogporten.Infrastructure\Digdir.Domain.Dialogporten.Infrastructure.csproj" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/Digdir.Domain.Dialogporten.WebApi/appsettings.Development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
}
},
"Infrastructure": {
"DialogRedisConnectionString": "TODO: Add to local secrets",
"DialogDbConnectionString": "TODO: Add to local secrets",
// Settings from appsettings.json, environment variables or other configuration providers.
// The first three are always mandatory for all client definitions types
Expand Down
1 change: 1 addition & 0 deletions src/Digdir.Domain.Dialogporten.WebApi/appsettings.staging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
}
},
"Infrastructure": {
"DialogRedisConnectionString": "TODO: Add to local secrets",
"DialogDbConnectionString": "TODO: Add to local secrets",
// Settings from appsettings.json, environment variables or other configuration providers.
// The first three are always mandatory for all client definitions types
Expand Down
1 change: 1 addition & 0 deletions src/Digdir.Domain.Dialogporten.WebApi/appsettings.test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
}
},
"Infrastructure": {
"DialogRedisConnectionString": "TODO: Add to local secrets",
"DialogDbConnectionString": "TODO: Add to local secrets",
// Settings from appsettings.json, environment variables or other configuration providers.
// The first three are always mandatory for all client definitions types
Expand Down