Skip to content

Commit 290020b

Browse files
update
1 parent b44f840 commit 290020b

File tree

5 files changed

+7
-24
lines changed

5 files changed

+7
-24
lines changed

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Microsoft.Extensions.Configuration
1515
/// </summary>
1616
public static class AzureAppConfigurationExtensions
1717
{
18-
private static readonly bool _isProviderDisabled = ProviderToggleChecker.IsProviderDisabled();
18+
private static readonly bool _isProviderDisabled = EnvironmentVariableHelper.GetBoolOrDefault(EnvironmentVariableNames.AppConfigurationProviderDisabled);
1919

2020
/// <summary>
2121
/// Adds key-value data from an Azure App Configuration store to a configuration builder using its connection string.

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationHealthChecksBuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Microsoft.Extensions.DependencyInjection
1414
/// </summary>
1515
public static class AzureAppConfigurationHealthChecksBuilderExtensions
1616
{
17-
private static readonly bool _isProviderDisabled = ProviderToggleChecker.IsProviderDisabled();
17+
private static readonly bool _isProviderDisabled = EnvironmentVariableHelper.GetBoolOrDefault(EnvironmentVariableNames.AppConfigurationProviderDisabled);
1818

1919
/// <summary>
2020
/// Add a health check for Azure App Configuration to given <paramref name="builder"/>.

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationProvider.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using System.Net;
1717
using System.Net.Http;
1818
using System.Net.Sockets;
19-
using System.Security;
2019
using System.Text;
2120
using System.Threading;
2221
using System.Threading.Tasks;
@@ -143,15 +142,7 @@ public AzureAppConfigurationProvider(IConfigurationClientManager configClientMan
143142
MinRefreshInterval = RefreshConstants.DefaultRefreshInterval;
144143
}
145144

146-
// Enable request tracing if not opt-out
147-
string requestTracingDisabled = null;
148-
try
149-
{
150-
requestTracingDisabled = Environment.GetEnvironmentVariable(EnvironmentVariableNames.RequestTracingDisabled);
151-
}
152-
catch (SecurityException) { }
153-
154-
_requestTracingEnabled = bool.TryParse(requestTracingDisabled, out bool tracingDisabled) ? !tracingDisabled : true;
145+
_requestTracingEnabled = !EnvironmentVariableHelper.GetBoolOrDefault(EnvironmentVariableNames.RequestTracingDisabled);
155146

156147
if (_requestTracingEnabled)
157148
{

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/ProviderToggleChecker.cs renamed to src/Microsoft.Extensions.Configuration.AzureAppConfiguration/EnvironmentVariableHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration
99
{
10-
internal static class ProviderToggleChecker
10+
internal static class EnvironmentVariableHelper
1111
{
12-
public static bool IsProviderDisabled()
12+
public static bool GetBoolOrDefault(string variableName)
1313
{
1414
try
1515
{
16-
return bool.TryParse(Environment.GetEnvironmentVariable(EnvironmentVariableNames.AppConfigurationProviderDisabled), out bool disabled) ? disabled : false;
16+
return bool.TryParse(Environment.GetEnvironmentVariable(variableName), out bool disabled) ? disabled : false;
1717
}
1818
catch (SecurityException) { }
1919

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureManagementKeyValueAdapter.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,7 @@ public FeatureManagementKeyValueAdapter(FeatureFlagTracing featureFlagTracing)
2727
{
2828
_featureFlagTracing = featureFlagTracing ?? throw new ArgumentNullException(nameof(featureFlagTracing));
2929

30-
string fmSchemaCompatibilityDisabled = null;
31-
32-
try
33-
{
34-
fmSchemaCompatibilityDisabled = Environment.GetEnvironmentVariable(EnvironmentVariableNames.FmSchemacompatibilityDisabled);
35-
}
36-
catch (SecurityException) { }
37-
38-
_fmSchemaCompatibilityDisabled = bool.TryParse(fmSchemaCompatibilityDisabled, out bool disabled) ? disabled : false;
30+
_fmSchemaCompatibilityDisabled = EnvironmentVariableHelper.GetBoolOrDefault(EnvironmentVariableNames.FmSchemacompatibilityDisabled);
3931
}
4032

4133
public Task<IEnumerable<KeyValuePair<string, string>>> ProcessKeyValue(ConfigurationSetting setting, Uri endpoint, Logger logger, CancellationToken cancellationToken)

0 commit comments

Comments
 (0)