Skip to content

Commit d4c8f80

Browse files
RichardChen820amerjusupovic
authored andcommitted
Automatic http failover base on Srv Dns (#442)
* Automatic http failover base on Srv Dns * update failover condition * Logging messages for auto failover * Not use generic method * Remove useless constructor * Failover to TCP when response is truncated * Error handling of TCP failover * Resolve comments and add thrid party notice * Fix the tests * Fix the tess * Fix the test * Update to use DnsClient.NET * Remove unecessary code * Resolve conflict * Stop once it has been auto failovered * Update GetAvaliableClient method * Resolve comments * Resolve comments * Internalize getting dynamic client in ConfigurationClientManager * Fix format * Fix format * Resolve comments * Resolve comments * Resolve comments * Resolve comments * Resolve comments * Resolve comments * Resolve comments * Not await RefreshFallbackClients when startup * Revert non-await RefreshFallbackClients * Validate domain of Srv endpoints (#489) * Validate domain of Srv endpoints * Resolve comments * Resolve comments * Create object in using * Add the origin host to the srv lookup result * Validate endpoint by domain name (#499) * Validate endpoint by domain name * Resolve comments * Remove *-test * Fix formatResolve conflict * Use await using for IAsyncDisposible * Replace IAsyncEumerable with ValueTask<IEnumerable> * Resolve comments * Remove cancallation token * Resolve comments
1 parent 5c9155b commit d4c8f80

18 files changed

+821
-45
lines changed

NOTICE

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
NOTICES AND INFORMATION
2+
Do Not Translate or Localize
3+
4+
This software incorporates material from third parties. Microsoft makes certain
5+
open source code available at https://3rdpartysource.microsoft.com, or you may
6+
send a check or money order for US $5.00, including the product name, the open
7+
source component name, and version number, to:
8+
9+
Source Code Compliance Team
10+
Microsoft Corporation
11+
One Microsoft Way
12+
Redmond, WA 98052
13+
USA
14+
15+
Notwithstanding any other terms, you may reverse engineer this software to the
16+
extent required to debug changes to any libraries licensed under the GNU Lesser
17+
General Public License.
18+
19+
---
20+
21+
## [DnsClient.NET](https://github.com/MichaCo/DnsClient.NET)
22+
23+
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
24+
25+
26+
Apache License
27+
Version 2.0, January 2004
28+
http://www.apache.org/licenses/
29+
30+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
31+
32+
1. Definitions.
33+
34+
"License" shall mean the terms and conditions for use, reproduction,
35+
and distribution as defined by Sections 1 through 9 of this document.
36+
37+
"Licensor" shall mean the copyright owner or entity authorized by
38+
the copyright owner that is granting the License.
39+
40+
"Legal Entity" shall mean the union of the acting entity and all
41+
other entities that control, are controlled by, or are under common
42+
control with that entity. For the purposes of this definition,
43+
"control" means (i) the power, direct or indirect, to cause the
44+
direction or management of such entity, whether by contract or
45+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
46+
outstanding shares, or (iii) beneficial ownership of such entity.
47+
48+
"You" (or "Your") shall mean an individual or Legal Entity
49+
exercising permissions granted by this License.
50+
51+
"Source" form shall mean the preferred form for making modifications,
52+
including but not limited to software source code, documentation
53+
source, and configuration files.
54+
55+
"Object" form shall mean any form resulting from mechanical
56+
transformation or translation of a Source form, including but
57+
not limited to compiled object code, generated documentation,
58+
and conversions to other media types.
59+
60+
"Work" shall mean the work of authorship, whether in Source or
61+
Object form, made available under the License, as indicated by a
62+
copyright notice that is included in or attached to the work
63+
(an example is provided in the Appendix below).
64+
65+
"Derivative Works" shall mean any work, whether in Source or Object
66+
form, that is based on (or derived from) the Work and for which the
67+
editorial revisions, annotations, elaborations, or other modifications
68+
represent, as a whole, an original work of authorship. For the purposes
69+
of this License, Derivative Works shall not include works that remain
70+
separable from, or merely link (or bind by name) to the interfaces of,
71+
the Work and Derivative Works thereof.
72+
73+
"Contribution" shall mean any work of authorship, including
74+
the original version of the Work and any modifications or additions
75+
to that Work or Derivative Works thereof, that is intentionally
76+
submitted to Licensor for inclusion in the Work by the copyright owner
77+
or by an individual or Legal Entity authorized to submit on behalf of
78+
the copyright owner. For the purposes of this definition, "submitted"
79+
means any form of electronic, verbal, or written communication sent
80+
to the Licensor or its representatives, including but not limited to
81+
communication on electronic mailing lists, source code control systems,
82+
and issue tracking systems that are managed by, or on behalf of, the
83+
Licensor for the purpose of discussing and improving the Work, but
84+
excluding communication that is conspicuously marked or otherwise
85+
designated in writing by the copyright owner as "Not a Contribution."
86+
87+
"Contributor" shall mean Licensor and any individual or Legal Entity
88+
on behalf of whom a Contribution has been received by Licensor and
89+
subsequently incorporated within the Work.
90+
91+
2. Grant of Copyright License. Subject to the terms and conditions of
92+
this License, each Contributor hereby grants to You a perpetual,
93+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
94+
copyright license to reproduce, prepare Derivative Works of,
95+
publicly display, publicly perform, sublicense, and distribute the
96+
Work and such Derivative Works in Source or Object form.
97+
98+
3. Grant of Patent License. Subject to the terms and conditions of
99+
this License, each Contributor hereby grants to You a perpetual,
100+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
101+
(except as stated in this section) patent license to make, have made,
102+
use, offer to sell, sell, import, and otherwise transfer the Work,
103+
where such license applies only to those patent claims licensable
104+
by such Contributor that are necessarily infringed by their
105+
Contribution(s) alone or by combination of their Contribution(s)
106+
with the Work to which such Contribution(s) was submitted. If You
107+
institute patent litigation against any entity (including a
108+
cross-claim or counterclaim in a lawsuit) alleging that the Work
109+
or a Contribution incorporated within the Work constitutes direct
110+
or contributory patent infringement, then any patent licenses
111+
granted to You under this License for that Work shall terminate
112+
as of the date such litigation is filed.
113+
114+
4. Redistribution. You may reproduce and distribute copies of the
115+
Work or Derivative Works thereof in any medium, with or without
116+
modifications, and in Source or Object form, provided that You
117+
meet the following conditions:
118+
119+
(a) You must give any other recipients of the Work or
120+
Derivative Works a copy of this License; and
121+
122+
(b) You must cause any modified files to carry prominent notices
123+
stating that You changed the files; and
124+
125+
(c) You must retain, in the Source form of any Derivative Works
126+
that You distribute, all copyright, patent, trademark, and
127+
attribution notices from the Source form of the Work,
128+
excluding those notices that do not pertain to any part of
129+
the Derivative Works; and
130+
131+
(d) If the Work includes a "NOTICE" text file as part of its
132+
distribution, then any Derivative Works that You distribute must
133+
include a readable copy of the attribution notices contained
134+
within such NOTICE file, excluding those notices that do not
135+
pertain to any part of the Derivative Works, in at least one
136+
of the following places: within a NOTICE text file distributed
137+
as part of the Derivative Works; within the Source form or
138+
documentation, if provided along with the Derivative Works; or,
139+
within a display generated by the Derivative Works, if and
140+
wherever such third-party notices normally appear. The contents
141+
of the NOTICE file are for informational purposes only and
142+
do not modify the License. You may add Your own attribution
143+
notices within Derivative Works that You distribute, alongside
144+
or as an addendum to the NOTICE text from the Work, provided
145+
that such additional attribution notices cannot be construed
146+
as modifying the License.
147+
148+
You may add Your own copyright statement to Your modifications and
149+
may provide additional or different license terms and conditions
150+
for use, reproduction, or distribution of Your modifications, or
151+
for any such Derivative Works as a whole, provided Your use,
152+
reproduction, and distribution of the Work otherwise complies with
153+
the conditions stated in this License.
154+
155+
5. Submission of Contributions. Unless You explicitly state otherwise,
156+
any Contribution intentionally submitted for inclusion in the Work
157+
by You to the Licensor shall be under the terms and conditions of
158+
this License, without any additional terms or conditions.
159+
Notwithstanding the above, nothing herein shall supersede or modify
160+
the terms of any separate license agreement you may have executed
161+
with Licensor regarding such Contributions.
162+
163+
6. Trademarks. This License does not grant permission to use the trade
164+
names, trademarks, service marks, or product names of the Licensor,
165+
except as required for reasonable and customary use in describing the
166+
origin of the Work and reproducing the content of the NOTICE file.
167+
168+
7. Disclaimer of Warranty. Unless required by applicable law or
169+
agreed to in writing, Licensor provides the Work (and each
170+
Contributor provides its Contributions) on an "AS IS" BASIS,
171+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
172+
implied, including, without limitation, any warranties or conditions
173+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
174+
PARTICULAR PURPOSE. You are solely responsible for determining the
175+
appropriateness of using or redistributing the Work and assume any
176+
risks associated with Your exercise of permissions under this License.
177+
178+
8. Limitation of Liability. In no event and under no legal theory,
179+
whether in tort (including negligence), contract, or otherwise,
180+
unless required by applicable law (such as deliberate and grossly
181+
negligent acts) or agreed to in writing, shall any Contributor be
182+
liable to You for damages, including any direct, indirect, special,
183+
incidental, or consequential damages of any character arising as a
184+
result of this License or out of the use or inability to use the
185+
Work (including but not limited to damages for loss of goodwill,
186+
work stoppage, computer failure or malfunction, or any and all
187+
other commercial damages or losses), even if such Contributor
188+
has been advised of the possibility of such damages.
189+
190+
9. Accepting Warranty or Additional Liability. While redistributing
191+
the Work or Derivative Works thereof, You may choose to offer,
192+
and charge a fee for, acceptance of support, warranty, indemnity,
193+
or other liability obligations and/or rights consistent with this
194+
License. However, in accepting such obligations, You may act only
195+
on Your own behalf and on Your sole responsibility, not on behalf
196+
of any other Contributor, and only if You agree to indemnify,
197+
defend, and hold each Contributor harmless for any liability
198+
incurred by, or claims asserted against, such Contributor by reason
199+
of your accepting any such warranty or additional liability.
200+
201+
END OF TERMS AND CONDITIONS
202+
203+
APPENDIX: How to apply the Apache License to your work.
204+
205+
To apply the Apache License to your work, attach the following
206+
boilerplate notice, with the fields enclosed by brackets "{}"
207+
replaced with your own identifying information. (Don't include
208+
the brackets!) The text should be enclosed in the appropriate
209+
comment syntax for the file format. We also recommend that a
210+
file or class name and description of purpose be included on the
211+
same "printed page" as the copyright notice for easier
212+
identification within third-party archives.
213+
214+
Copyright {yyyy} {name of copyright owner}
215+
216+
Licensed under the Apache License, Version 2.0 (the "License");
217+
you may not use this file except in compliance with the License.
218+
You may obtain a copy of the License at
219+
220+
http://www.apache.org/licenses/LICENSE-2.0
221+
222+
Unless required by applicable law or agreed to in writing, software
223+
distributed under the License is distributed on an "AS IS" BASIS,
224+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
225+
See the License for the specific language governing permissions and
226+
limitations under the License.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public class AzureAppConfigurationOptions
3434
// Since multiple prefixes could start with the same characters, we need to trim the longest prefix first.
3535
private SortedSet<string> _keyPrefixes = new SortedSet<string>(Comparer<string>.Create((k1, k2) => -string.Compare(k1, k2, StringComparison.OrdinalIgnoreCase)));
3636

37+
/// <summary>
38+
/// Flag to indicate whether enable replica discovery.
39+
/// </summary>
40+
public bool ReplicaDiscoveryEnabled { get; set; } = true;
41+
3742
/// <summary>
3843
/// The list of connection strings used to connect to an Azure App Configuration store and its replicas.
3944
/// </summary>

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration
2424
{
25-
internal class AzureAppConfigurationProvider : ConfigurationProvider, IConfigurationRefresher
25+
internal class AzureAppConfigurationProvider : ConfigurationProvider, IConfigurationRefresher, IDisposable
2626
{
2727
private bool _optional;
2828
private bool _isInitialLoadComplete = false;
@@ -63,7 +63,7 @@ public Uri AppConfigurationEndpoint
6363

6464
try
6565
{
66-
return new Uri(ConnectionStringParser.Parse(_options.ConnectionStrings.First(), ConnectionStringParser.EndpointSection));
66+
return new Uri(ConnectionStringUtils.Parse(_options.ConnectionStrings.First(), ConnectionStringUtils.EndpointSection));
6767
}
6868
catch (FormatException) { }
6969
}
@@ -85,6 +85,11 @@ public ILoggerFactory LoggerFactory
8585
if (_loggerFactory != null)
8686
{
8787
_logger = new Logger(_loggerFactory.CreateLogger(LoggingConstants.AppConfigRefreshLogCategory));
88+
89+
if (_configClientManager is ConfigurationClientManager clientManager)
90+
{
91+
clientManager.SetLogger(_logger);
92+
}
8893
}
8994
}
9095
}
@@ -192,7 +197,7 @@ public async Task RefreshAsync(CancellationToken cancellationToken)
192197
return;
193198
}
194199

195-
IEnumerable<ConfigurationClient> availableClients = _configClientManager.GetAvailableClients(utcNow);
200+
IEnumerable<ConfigurationClient> availableClients = _configClientManager.GetAvailableClients();
196201

197202
if (!availableClients.Any())
198203
{
@@ -358,7 +363,6 @@ await CallWithRequestTracing(
358363
adapter.InvalidateCache(change.Current);
359364
}
360365
}
361-
362366
}
363367
else
364368
{
@@ -1126,5 +1130,10 @@ private void EnsureFeatureManagementVersionInspected()
11261130
}
11271131
}
11281132
}
1133+
1134+
public void Dispose()
1135+
{
1136+
(_configClientManager as ConfigurationClientManager)?.Dispose();
1137+
}
11291138
}
11301139
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ public IConfigurationProvider Build(IConfigurationBuilder builder)
3636
}
3737
else if (options.ConnectionStrings != null)
3838
{
39-
clientManager = new ConfigurationClientManager(options.ConnectionStrings, options.ClientOptions);
39+
clientManager = new ConfigurationClientManager(options.ConnectionStrings, options.ClientOptions, options.ReplicaDiscoveryEnabled);
4040
}
4141
else if (options.Endpoints != null && options.Credential != null)
4242
{
43-
clientManager = new ConfigurationClientManager(options.Endpoints, options.Credential, options.ClientOptions);
43+
clientManager = new ConfigurationClientManager(options.Endpoints, options.Credential, options.ClientOptions, options.ReplicaDiscoveryEnabled);
4444
}
4545
else
4646
{

0 commit comments

Comments
 (0)