From 56760591c2ef74bfba1c41097a9806f0b7bf3d61 Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Wed, 16 Apr 2025 11:33:44 +0800 Subject: [PATCH 1/4] fix format --- .../ConfigurationSettingPageExtensions.cs | 4 ++-- .../FeatureManagement/FeatureFlagOptions.cs | 1 + .../IConfigurationSettingPageIterator.cs | 4 ++-- .../FeatureManagementTests.cs | 11 +++++++++-- .../KeyVaultReferenceTests.cs | 8 ++++++-- tests/Tests.AzureAppConfiguration/RefreshTests.cs | 12 +++++++++--- 6 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/ConfigurationSettingPageExtensions.cs b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/ConfigurationSettingPageExtensions.cs index aba7684b..ad69330d 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/ConfigurationSettingPageExtensions.cs +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/ConfigurationSettingPageExtensions.cs @@ -1,5 +1,5 @@ -using Azure.Data.AppConfiguration; -using Azure; +using Azure; +using Azure.Data.AppConfiguration; using System.Collections.Generic; namespace Microsoft.Extensions.Configuration.AzureAppConfiguration diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagOptions.cs b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagOptions.cs index 26390762..f5076025 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagOptions.cs +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagOptions.cs @@ -41,6 +41,7 @@ internal TimeSpan RefreshInterval [Obsolete("The " + nameof(CacheExpirationInterval) + " property is deprecated and will be removed in a future release. " + "Please use the new " + nameof(SetRefreshInterval) + " method instead. " + "Note that the usage has changed, but the functionality remains the same.")] + [Obsolete] public TimeSpan CacheExpirationInterval { get { return _refreshInterval; } diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/IConfigurationSettingPageIterator.cs b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/IConfigurationSettingPageIterator.cs index 08c95751..7bbc3ded 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/IConfigurationSettingPageIterator.cs +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/IConfigurationSettingPageIterator.cs @@ -1,5 +1,5 @@ -using Azure.Data.AppConfiguration; -using Azure; +using Azure; +using Azure.Data.AppConfiguration; using System.Collections.Generic; namespace Microsoft.Extensions.Configuration.AzureAppConfiguration diff --git a/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs b/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs index d96e9e39..225d8bd7 100644 --- a/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs +++ b/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs @@ -731,6 +731,7 @@ public async Task WatchesFeatureFlags() } [Fact] + [Obsolete] public async Task WatchesFeatureFlagsUsingCacheExpirationInterval() { var featureFlags = new List { _kv }; @@ -874,6 +875,7 @@ public async Task SkipRefreshIfRefreshIntervalHasNotElapsed() } [Fact] + [Obsolete] public async Task SkipRefreshIfCacheNotExpired() { var featureFlags = new List { _kv }; @@ -1174,7 +1176,9 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) if (newSetting != null) copy.Add(TestHelpers.CloneSetting(newSetting)); return new MockAsyncPageable(copy); - }; + } + + ; var testClient = mockClient.Object; @@ -1199,6 +1203,7 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) } [Fact] + [Obsolete] public void AlternateValidFeatureFlagFormats() { var mockResponse = new Mock(); @@ -1215,7 +1220,9 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) if (newSetting != null) copy.Add(TestHelpers.CloneSetting(newSetting)); return new MockAsyncPageable(copy); - }; + } + + ; var testClient = mockClient.Object; diff --git a/tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs b/tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs index 274bfe7f..23e8787e 100644 --- a/tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs +++ b/tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs @@ -982,7 +982,9 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) if (newSetting != null) copy.Add(TestHelpers.CloneSetting(newSetting)); return new MockAsyncPageable(copy); - }; + } + + ; var testClient = mockClient.Object; @@ -1028,7 +1030,9 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) if (newSetting != null) copy.Add(TestHelpers.CloneSetting(newSetting)); return new MockAsyncPageable(copy); - }; + } + + ; var testClient = mockClient.Object; diff --git a/tests/Tests.AzureAppConfiguration/RefreshTests.cs b/tests/Tests.AzureAppConfiguration/RefreshTests.cs index e64b5184..695039cd 100644 --- a/tests/Tests.AzureAppConfiguration/RefreshTests.cs +++ b/tests/Tests.AzureAppConfiguration/RefreshTests.cs @@ -320,7 +320,9 @@ Response GetIfChanged(ConfigurationSetting setting, bool o foreach (var setting in keyValueCollection) { copy.Add(TestHelpers.CloneSetting(setting)); - }; + } + + ; return new MockAsyncPageable(copy); }); @@ -392,7 +394,9 @@ Response GetIfChanged(ConfigurationSetting setting, bool o foreach (var setting in keyValueCollection) { copy.Add(TestHelpers.CloneSetting(setting)); - }; + } + + ; return new MockAsyncPageable(copy); }); @@ -461,7 +465,9 @@ public async Task RefreshTests_SingleServerCallOnSimultaneousMultipleRefresh() foreach (var setting in keyValueCollection) { copy.Add(TestHelpers.CloneSetting(setting)); - }; + } + + ; return new MockAsyncPageable(copy, operationDelay); }); From 029104367c8c814e641431787a6ebb689de32daa Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Wed, 16 Apr 2025 11:36:43 +0800 Subject: [PATCH 2/4] fix format --- .../FeatureManagement/FeatureFlagOptions.cs | 1 - tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs | 4 ---- tests/Tests.AzureAppConfiguration/RefreshTests.cs | 6 ------ 3 files changed, 11 deletions(-) diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagOptions.cs b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagOptions.cs index f5076025..26390762 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagOptions.cs +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/FeatureManagement/FeatureFlagOptions.cs @@ -41,7 +41,6 @@ internal TimeSpan RefreshInterval [Obsolete("The " + nameof(CacheExpirationInterval) + " property is deprecated and will be removed in a future release. " + "Please use the new " + nameof(SetRefreshInterval) + " method instead. " + "Note that the usage has changed, but the functionality remains the same.")] - [Obsolete] public TimeSpan CacheExpirationInterval { get { return _refreshInterval; } diff --git a/tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs b/tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs index 23e8787e..3e856a1b 100644 --- a/tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs +++ b/tests/Tests.AzureAppConfiguration/KeyVaultReferenceTests.cs @@ -984,8 +984,6 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) return new MockAsyncPageable(copy); } - ; - var testClient = mockClient.Object; foreach (ConfigurationSetting setting in _invalidJsonKvCollection) @@ -1032,8 +1030,6 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) return new MockAsyncPageable(copy); } - ; - var testClient = mockClient.Object; foreach (ConfigurationSetting setting in _validJsonKvCollection) diff --git a/tests/Tests.AzureAppConfiguration/RefreshTests.cs b/tests/Tests.AzureAppConfiguration/RefreshTests.cs index 695039cd..c27a48ff 100644 --- a/tests/Tests.AzureAppConfiguration/RefreshTests.cs +++ b/tests/Tests.AzureAppConfiguration/RefreshTests.cs @@ -322,8 +322,6 @@ Response GetIfChanged(ConfigurationSetting setting, bool o copy.Add(TestHelpers.CloneSetting(setting)); } - ; - return new MockAsyncPageable(copy); }); @@ -396,8 +394,6 @@ Response GetIfChanged(ConfigurationSetting setting, bool o copy.Add(TestHelpers.CloneSetting(setting)); } - ; - return new MockAsyncPageable(copy); }); @@ -467,8 +463,6 @@ public async Task RefreshTests_SingleServerCallOnSimultaneousMultipleRefresh() copy.Add(TestHelpers.CloneSetting(setting)); } - ; - return new MockAsyncPageable(copy, operationDelay); }); From 2a25023cf37bb56cda8fda385178cacef41a89da Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Wed, 16 Apr 2025 12:53:07 +0800 Subject: [PATCH 3/4] fix format --- tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs b/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs index 225d8bd7..18f3b329 100644 --- a/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs +++ b/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs @@ -1178,8 +1178,6 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) return new MockAsyncPageable(copy); } - ; - var testClient = mockClient.Object; foreach (ConfigurationSetting setting in _invalidFormatFeatureFlagCollection) From 79ef7ad00dd05f18afb05d4e67fa95ba7087eb74 Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Wed, 16 Apr 2025 12:55:42 +0800 Subject: [PATCH 4/4] fix format --- .../AzureAppConfigurationOptions.cs | 10 +++++----- .../FeatureManagementTests.cs | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationOptions.cs b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationOptions.cs index db3b6c3d..67e8e993 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationOptions.cs +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationOptions.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. // using Azure.Core; -using Azure.Core.Pipeline; +using Azure.Core.Pipeline; using Azure.Data.AppConfiguration; using Microsoft.Extensions.Configuration.AzureAppConfiguration.AzureKeyVault; using Microsoft.Extensions.Configuration.AzureAppConfiguration.Extensions; @@ -11,7 +11,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net.Http; +using System.Net.Http; using System.Threading.Tasks; namespace Microsoft.Extensions.Configuration.AzureAppConfiguration @@ -25,7 +25,7 @@ public class AzureAppConfigurationOptions private const int MaxRetries = 2; private static readonly TimeSpan MaxRetryDelay = TimeSpan.FromMinutes(1); private static readonly TimeSpan NetworkTimeout = TimeSpan.FromSeconds(10); - private static readonly KeyValueSelector DefaultQuery = new KeyValueSelector { KeyFilter = KeyFilter.Any, LabelFilter = LabelFilter.Null }; + private static readonly KeyValueSelector DefaultQuery = new KeyValueSelector { KeyFilter = KeyFilter.Any, LabelFilter = LabelFilter.Null }; private List _individualKvWatchers = new List(); private List _ffWatchers = new List(); @@ -514,9 +514,9 @@ private static ConfigurationClientOptions GetDefaultClientOptions() clientOptions.Retry.Mode = RetryMode.Exponential; clientOptions.AddPolicy(new UserAgentHeaderPolicy(), HttpPipelinePosition.PerCall); clientOptions.Transport = new HttpClientTransport(new HttpClient() - { + { Timeout = NetworkTimeout - }); + }); return clientOptions; } diff --git a/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs b/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs index 18f3b329..2f935381 100644 --- a/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs +++ b/tests/Tests.AzureAppConfiguration/FeatureManagementTests.cs @@ -1220,8 +1220,6 @@ MockAsyncPageable GetTestKeys(SettingSelector selector, CancellationToken ct) return new MockAsyncPageable(copy); } - ; - var testClient = mockClient.Object; foreach (ConfigurationSetting setting in _validFormatFeatureFlagCollection)