From 3ed85260c59800540e7a199f10bbd4e7ac75fce6 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Thu, 4 Jul 2019 13:10:54 -0500 Subject: [PATCH] ren Settings classes --- ...ghts.cs => ApplicationInsightsSettings.cs} | 4 +--- ...trings.cs => ConnectionStringsSettings.cs} | 2 +- .../{GitHub.cs => GitHubSettings.cs} | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 20 ++++++++++++++----- .../Clients/AgentGitHubClient.cs | 18 ++++++++--------- 5 files changed, 27 insertions(+), 19 deletions(-) rename src/FilterLists.Agent/AppSettings/{ApplicationInsights.cs => ApplicationInsightsSettings.cs} (53%) rename src/FilterLists.Agent/AppSettings/{ConnectionStrings.cs => ConnectionStringsSettings.cs} (79%) rename src/FilterLists.Agent/AppSettings/{GitHub.cs => GitHubSettings.cs} (89%) diff --git a/src/FilterLists.Agent/AppSettings/ApplicationInsights.cs b/src/FilterLists.Agent/AppSettings/ApplicationInsightsSettings.cs similarity index 53% rename from src/FilterLists.Agent/AppSettings/ApplicationInsights.cs rename to src/FilterLists.Agent/AppSettings/ApplicationInsightsSettings.cs index 7264ee7c5..75049681b 100644 --- a/src/FilterLists.Agent/AppSettings/ApplicationInsights.cs +++ b/src/FilterLists.Agent/AppSettings/ApplicationInsightsSettings.cs @@ -1,8 +1,6 @@ namespace FilterLists.Agent.AppSettings { -#pragma warning disable CA1724 - public class ApplicationInsights -#pragma warning restore CA1724 + public class ApplicationInsightsSettings { public string InstrumentationKey { get; set; } } diff --git a/src/FilterLists.Agent/AppSettings/ConnectionStrings.cs b/src/FilterLists.Agent/AppSettings/ConnectionStringsSettings.cs similarity index 79% rename from src/FilterLists.Agent/AppSettings/ConnectionStrings.cs rename to src/FilterLists.Agent/AppSettings/ConnectionStringsSettings.cs index 7c32513ec..52f7a480d 100644 --- a/src/FilterLists.Agent/AppSettings/ConnectionStrings.cs +++ b/src/FilterLists.Agent/AppSettings/ConnectionStringsSettings.cs @@ -3,7 +3,7 @@ namespace FilterLists.Agent.AppSettings { [UsedImplicitly] - public class ConnectionStrings + public class ConnectionStringsSettings { public string FilterListsConnection { get; set; } } diff --git a/src/FilterLists.Agent/AppSettings/GitHub.cs b/src/FilterLists.Agent/AppSettings/GitHubSettings.cs similarity index 89% rename from src/FilterLists.Agent/AppSettings/GitHub.cs rename to src/FilterLists.Agent/AppSettings/GitHubSettings.cs index 33c7743ca..6e51d9b05 100644 --- a/src/FilterLists.Agent/AppSettings/GitHub.cs +++ b/src/FilterLists.Agent/AppSettings/GitHubSettings.cs @@ -1,6 +1,6 @@ namespace FilterLists.Agent.AppSettings { - public class GitHub + public class GitHubSettings { public string ProductHeaderValue { get; set; } public string PersonalAccessToken { get; set; } diff --git a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs index 471be80b9..4f7745f38 100644 --- a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs +++ b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs @@ -1,4 +1,5 @@ -using System.Net.Http; +using System; +using System.Net.Http; using CommandLine; using FilterLists.Agent.AppSettings; using FilterLists.Agent.Core.Interfaces; @@ -36,9 +37,17 @@ private static void AddConfiguration(this IServiceCollection services) .AddJsonFile("appsettings.Development.json", true, true) #endif .Build(); - services.Configure(config.GetSection(nameof(ApplicationInsights))); - services.Configure(config.GetSection(nameof(ConnectionStrings))); - services.Configure(config.GetSection(nameof(GitHub))); + services.Configure( + config.GetSection(nameof(ApplicationInsightsSettings).RemoveSettingsSuffix())); + services.Configure( + config.GetSection(nameof(ConnectionStringsSettings).RemoveSettingsSuffix())); + services.Configure( + config.GetSection(nameof(GitHubSettings).RemoveSettingsSuffix())); + } + + private static string RemoveSettingsSuffix(this string section) + { + return section.Replace("Settings", "", StringComparison.Ordinal); } private static void AddLoggingCustom(this IServiceCollection services) @@ -46,7 +55,8 @@ private static void AddLoggingCustom(this IServiceCollection services) services.AddLogging(b => { b.AddConsole(); - var appInsightsConfig = b.Services.BuildServiceProvider().GetService>(); + var appInsightsConfig = b.Services.BuildServiceProvider() + .GetService>(); b.AddApplicationInsights(appInsightsConfig.Value.InstrumentationKey); }); } diff --git a/src/FilterLists.Agent/Infrastructure/Clients/AgentGitHubClient.cs b/src/FilterLists.Agent/Infrastructure/Clients/AgentGitHubClient.cs index 3dc297eb9..86bf6e7e8 100644 --- a/src/FilterLists.Agent/Infrastructure/Clients/AgentGitHubClient.cs +++ b/src/FilterLists.Agent/Infrastructure/Clients/AgentGitHubClient.cs @@ -20,16 +20,16 @@ public class AgentGitHubClient : IAgentGitHubClient { private const string ExceptionMessageSuffix = " from the GitHub API."; private readonly GitHubClient _gitHubClient; - private readonly GitHub _gitHubOptions; + private readonly GitHubSettings _gitHubSettings; private readonly ILogger _logger; - public AgentGitHubClient(IOptions gitHubOptions, ILogger logger) + public AgentGitHubClient(IOptions gitHubSettings, ILogger logger) { - _gitHubOptions = gitHubOptions.Value; + _gitHubSettings = gitHubSettings.Value; _logger = logger; - _gitHubClient = new GitHubClient(new ProductHeaderValue(_gitHubOptions.ProductHeaderValue)) + _gitHubClient = new GitHubClient(new ProductHeaderValue(_gitHubSettings.ProductHeaderValue)) { - Credentials = new Credentials(_gitHubOptions.PersonalAccessToken) + Credentials = new Credentials(_gitHubSettings.PersonalAccessToken) }; } @@ -37,8 +37,8 @@ public async Task> GetAllIssues(RepositoryIssueRequest repo { try { - return await _gitHubClient.Issue.GetAllForRepository(_gitHubOptions.RepositoryOwner, - _gitHubOptions.Repository, repositoryIssueRequest); + return await _gitHubClient.Issue.GetAllForRepository(_gitHubSettings.RepositoryOwner, + _gitHubSettings.Repository, repositoryIssueRequest); } catch (ApiException ex) { @@ -51,7 +51,7 @@ public async Task CreateIssue(NewIssue newIssue) { try { - return await _gitHubClient.Issue.Create(_gitHubOptions.RepositoryOwner, _gitHubOptions.Repository, + return await _gitHubClient.Issue.Create(_gitHubSettings.RepositoryOwner, _gitHubSettings.Repository, newIssue); } catch (ApiException ex) @@ -65,7 +65,7 @@ public async Task UpdateIssue(int issueNumber, IssueUpdate issueUpdate) { try { - return await _gitHubClient.Issue.Update(_gitHubOptions.RepositoryOwner, _gitHubOptions.Repository, + return await _gitHubClient.Issue.Update(_gitHubSettings.RepositoryOwner, _gitHubSettings.Repository, issueNumber, issueUpdate); } catch (ApiException ex)