Merge branch 'zhiyuanliang/afd' of https://github.com/Azure/AppConfiguration-DotnetProvider into zhiyuanliang/afd

Author: zhiyuanliang-ms

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Afd/AfdConfigurationClientManager.cs

@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Azure;
 using System;
 using System.Collections.Generic;
+
 namespace Microsoft.Extensions.Configuration.AzureAppConfiguration.Afd
 {
     internal class AfdConfigurationClientManager : IConfigurationClientManager

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

@@ -433,7 +433,6 @@ public AzureAppConfigurationOptions Connect(IEnumerable<Uri> endpoints, TokenCre
             }
 
             Credential = credential ?? throw new ArgumentNullException(nameof(credential));
-
             Endpoints = endpoints;
             ConnectionStrings = null;
             return this;
@@ -450,6 +449,11 @@ public AzureAppConfigurationOptions ConnectAzureFrontDoor(Uri endpoint)
                 throw new InvalidOperationException(ErrorMessages.ConnectionConflict);
             }
 
+            if (IsAfdUsed)
+            {
+                throw new InvalidOperationException(ErrorMessages.AfdConnectionConflict);
+            }
+
             if (endpoint == null)
             {
                 throw new ArgumentNullException(nameof(endpoint));
@@ -459,9 +463,7 @@ public AzureAppConfigurationOptions ConnectAzureFrontDoor(Uri endpoint)
 
             Endpoints = new List<Uri>() { endpoint };
             ConnectionStrings = null;
-
             IsAfdUsed = true;
-
             return this;
         }
 

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

@@ -370,8 +370,13 @@ await ExecuteWithFailOverPolicyAsync(clients, async (client) =>
                             watchedIndividualKvChangeDetectedTime = new Dictionary<KeyValueIdentifier, DateTimeOffset>();
 
                             data = await LoadSelected(client, kvEtags, ffEtags, _options.Selectors, ffKeys, false, cancellationToken).ConfigureAwait(false);
-                            watchedIndividualKvs = await LoadKeyValuesRegisteredForRefresh(client, data, watchedIndividualKvChangeDetectedTime, cancellationToken).ConfigureAwait(false);
-                            if (data != null && watchedIndividualKvs != null && !_isLastRefreshAborted)
+
+                            if (!_isLastRefreshAborted)
+                            {
+                                watchedIndividualKvs = await LoadKeyValuesRegisteredForRefresh(client, data, watchedIndividualKvChangeDetectedTime, cancellationToken).ConfigureAwait(false);
+                            }
+
+                            if (!_isLastRefreshAborted)
                             {
                                 logInfoBuilder.AppendLine(LogHelper.BuildConfigurationUpdatedMessage());
                             }
@@ -893,6 +898,7 @@ await ExecuteWithFailOverPolicyAsync(
                 _kvEtags = kvEtags;
                 _ffEtags = ffEtags;
                 _watchedIndividualKvs = watchedIndividualKvs;
+                _watchedIndividualKvChangeDetectedTime = watchedIndividualKvChangeDetectedTime;
                 _ffKeys = ffKeys;
             }
         }
@@ -1130,7 +1136,7 @@ await CallWithRequestTracing(async () =>
                 }
 
                 // If the key-value was found, store it for updating the settings
-                if (watchedKv != null)
+                if (watchedKv != null && existingSettings != null)
                 {
                     watchedIndividualKvs[watchedKeyLabel] = new ConfigurationSetting(watchedKv.Key, watchedKv.Value, watchedKv.Label, watchedKv.ETag);
 
@@ -1184,7 +1190,8 @@ private async Task<bool> RefreshIndividualKvWatchers(
 
                 KeyValueChange change = default;
 
-                // if fail to get, the default DateTimeOffset.MinValue will be used
+                // Unless initial load failed, _watchedIndividualKvChangeDetectedTime should always have an entry for the watched key-label
+                // If fail to get, lastChangeDetectedTime will be DateTimeOffset.MinValue by default
                 _watchedIndividualKvChangeDetectedTime.TryGetValue(watchedKeyLabel, out DateTimeOffset lastChangeDetectedTime);
 
                 //
@@ -1300,7 +1307,8 @@ private void SetRequestTracingOptions()
                 IsKeyVaultConfigured = _options.IsKeyVaultConfigured,
                 IsKeyVaultRefreshConfigured = _options.IsKeyVaultRefreshConfigured,
                 FeatureFlagTracing = _options.FeatureFlagTracing,
-                IsLoadBalancingEnabled = _options.LoadBalancingEnabled
+                IsLoadBalancingEnabled = _options.LoadBalancingEnabled,
+                IsAfdUsed = _options.IsAfdUsed
             };
         }
 

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

@@ -47,7 +47,7 @@ public IConfigurationProvider Build(IConfigurationBuilder builder)
 
                     if (clientFactory != null)
                     {
-                        throw new InvalidOperationException(ErrorMessages.AfdCustomClientOptionsUnsupported);
+                        throw new InvalidOperationException(ErrorMessages.AfdCustomClientFactoryUnsupported);
                     }
 
                     options.ClientOptions.AddPolicy(new AfdPolicy(), HttpPipelinePosition.PerRetry);

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Constants/ErrorMessages.cs

@@ -15,7 +15,8 @@ internal class ErrorMessages
         public const string SnapshotReferencePropertyMissing = "Invalid snapshot reference format for key '{0}' (label: '{1}'). The '{2}' property is required.";
         public const string SnapshotInvalidComposition = "{0} for the selected snapshot with name '{1}' must be 'key', found '{2}'.";
         public const string ConnectionConflict = "Cannot connect to both Azure App Configuration and Azure Front Door at the same time.";
+        public const string AfdConnectionConflict = "Cannot connect to multiple Azure Front Doors.";
         public const string AfdLoadBalancingUnsupported = "Load balancing is not supported when connecting to Azure Front Door.";
-        public const string AfdCustomClientOptionsUnsupported = "Custom client options are not supported when connecting to Azure Front Door.";
+        public const string AfdCustomClientFactoryUnsupported = "Custom client factory is not supported when connecting to Azure Front Door.";
     }
 }

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

@@ -3,7 +3,6 @@
 //
 using Azure;
 using Azure.Data.AppConfiguration;
-using Microsoft.Extensions.Configuration.AzureAppConfiguration;
 using Microsoft.Extensions.Configuration.AzureAppConfiguration.Models;
 using System;
 using System.Collections.Generic;
@@ -120,6 +119,8 @@ public static async Task<Page<ConfigurationSetting>> GetPageChange(this Configur
                 {
                     return page;
                 }
+
+                i++;
             }
 
             return null;

tests/Tests.AzureAppConfiguration/Azure.Core.Testing/MockResponse.cs

@@ -13,15 +13,17 @@ public class MockResponse : Response
     {
         private readonly Dictionary<string, List<string>> _headers = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
 
-        public MockResponse(int status, string reasonPhrase = null)
+        public MockResponse(int status, string etag = null, DateTimeOffset? date = null, string reasonPhrase = null)
         {
             Status = status;
             ReasonPhrase = reasonPhrase;
 
             if (status == 200)
             {
-                AddHeader(new HttpHeader(HttpHeader.Names.ETag, "\"" + Guid.NewGuid().ToString() + "\""));
+                AddHeader(new HttpHeader(HttpHeader.Names.ETag, "\"" + (etag ?? Guid.NewGuid().ToString()) + "\""));
             }
+
+            AddHeader(new HttpHeader(HttpHeader.Names.XMsDate, date?.ToString() ?? DateTimeOffset.UtcNow.ToString()));
         }
 
         public override int Status { get; }