prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(api-clients): ♻ mv directory host to configuration

Browse source
This commit is contained in:
Collin M. Barrett 2020-09-15 17:01:15 -05:00
parent d383d28e67
commit f5e0f608b1
5 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env
View file

@ -6,6 +6,7 @@ ARCHIVAL_GIT_REPOSITORY_PATH=archives
ARCHIVAL_GIT_USER_NAME=FilterLists Archival
ARCHIVAL_GIT_USER_EMAIL=noreply@filterlists.com
DIRECTORY_HOST=directory-api
DIRECTORY_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=
DIRECTORY_CONNECTION_STRING=Server=directory-db;Database=filterlists;User Id=filterlists;Password=filterlists;
DIRECTORY_DB_USER=filterlists

7
docker-compose.yml
View file

@ -27,6 +27,7 @@ services:
ApplicationInsights__ServerTelemetryChannelStoragePath: ${APPLICATION_INSIGHTS_SERVER_TELEMETRY_CHANNEL_STORAGE_PATH}
ApplicationInsights__InstrumentationKey: ${ARCHIVAL_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY}
ConnectionStrings__SchedulingConnection: ${ARCHIVAL_REDIS_CONNECTION_STRING}
Api__DirectoryHost: ${DIRECTORY_HOST}
Git__RepositoryPath: ${ARCHIVAL_GIT_REPOSITORY_PATH}
Git__UserName: ${ARCHIVAL_GIT_USER_NAME}
Git__UserEmail: ${ARCHIVAL_GIT_USER_EMAIL}
@ -44,8 +45,10 @@ services:
image: ghcr.io/collinbarrett/filterlists-directory-api
restart: always
networks:
- reverse-proxy
- directory
reverse-proxy:
aliases:
- ${DIRECTORY_HOST}
directory:
depends_on:
- directory-db
volumes:

2
services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs
View file

@ -23,7 +23,7 @@ public static void AddInfrastructureServices(this IServiceCollection services, I
services.AddSharedKernelLogging(configuration);
services.AddSchedulingServices(configuration);
services.AddApiClients();
services.AddApiClients(configuration);
services.AddPersistenceServices(configuration);
}

10
services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/ConfigurationExtensions.cs
View file

@ -1,4 +1,6 @@
using System;
using FilterLists.SharedKernel.Apis.Clients.Options;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Refit;
@ -6,11 +8,15 @@ namespace FilterLists.SharedKernel.Apis.Clients
{
public static class ConfigurationExtensions
{
public static void AddApiClients(this IServiceCollection services)
public static void AddApiClients(this IServiceCollection services, IConfiguration configuration)
{
// TODO: use SystemTextJsonContentSerializer() once less feature-limited
services.AddRefitClient<IDirectoryApi>()
.ConfigureHttpClient(c => c.BaseAddress = new Uri("http://directory-api"));
.ConfigureHttpClient(c =>
{
var host = configuration.GetSection(ApiOptions.Key).Get<ApiOptions>().DirectoryHost;
c.BaseAddress = new UriBuilder("http", host).Uri;
});
}
}
}

9
services/SharedKernel/FilterLists.SharedKernel.Apis.Clients/Options/ApiOptions.cs Normal file
View file

@ -0,0 +1,9 @@
namespace FilterLists.SharedKernel.Apis.Clients.Options
{
internal class ApiOptions
{
public const string Key = "Api";
public string DirectoryHost { get; set; } = null!;
}
}