-
Notifications
You must be signed in to change notification settings - Fork 496
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Use IConfiguration This change removes the `IEnvironmentVariables` abstraction, replacing it and usages with `IConfiguration` from the framework. The built-in `IConfiguration` system is more flexible, allowing configuration values to come from various other sources. * Remove MockConfiguration class * Use IConfiguration in ApplicationExecutor
- Loading branch information
1 parent
762ec09
commit 73004d9
Showing
13 changed files
with
166 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Diagnostics.CodeAnalysis; | ||
| using Microsoft.Extensions.Configuration; | ||
|
|
||
| namespace Aspire; | ||
|
|
||
| internal static class IConfigurationExtensions | ||
| { | ||
| /// <summary> | ||
| /// Gets the named configuration value as a boolean. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// Parses <c>true</c> and <c>false</c>, along with integer values (where non-zero is <see langword="true"/>). | ||
| /// </remarks> | ||
| /// <param name="configuration">The <see cref="IConfiguration"/> this method extends.</param> | ||
| /// <param name="key">The configuration key.</param> | ||
| /// <returns>The parsed value, or <see langword="null"/> if no value exists or it couldn't be parsed.</returns> | ||
| public static bool? GetBool(this IConfiguration configuration, string key) | ||
| { | ||
| var value = configuration[key]; | ||
|
|
||
| if (value is null or []) | ||
| { | ||
| return null; | ||
| } | ||
| else if (bool.TryParse(value, out var b)) | ||
| { | ||
| return b; | ||
| } | ||
| else if (int.TryParse(value, out var i)) | ||
| { | ||
| return i != 0; | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Gets the named configuration value as a boolean. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// Parses <c>true</c> and <c>false</c>, along with <c>1</c> and <c>0</c>. | ||
| /// </remarks> | ||
| /// <param name="configuration">The <see cref="IConfiguration"/> this method extends.</param> | ||
| /// <param name="key">The configuration key.</param> | ||
| /// <param name="defaultValue">A default value, for when the configuration value is unspecified or white space.</param> | ||
| /// <returns></returns> | ||
| public static bool GetBool(this IConfiguration configuration, string key, bool defaultValue) | ||
| { | ||
| return configuration.GetBool(key) ?? defaultValue; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Parses a configuration value into a <see cref="Uri"/> object. | ||
| /// </summary> | ||
| /// <param name="configuration">The <see cref="IConfiguration"/> this method extends.</param> | ||
| /// <param name="key">The configuration key.</param> | ||
| /// <param name="defaultValue">A default value, for when the configuration value is unspecified or white space. May be <see langword="null"/>.</param> | ||
| /// <returns>The parsed value, or the default value if specified and parsing failed. Returns <see langword="null"/> if <paramref name="defaultValue"/> is <see langword="null"/> and parsing failed.</returns> | ||
| /// <exception cref="InvalidOperationException">The configuration value could not be accessed, or contained incorrectly formatted data.</exception> | ||
| [return: NotNullIfNotNull(nameof(defaultValue))] | ||
| public static Uri? GetUri(this IConfiguration configuration, string key, Uri? defaultValue = null) | ||
| { | ||
| try | ||
| { | ||
| var uri = configuration[key]; | ||
|
|
||
| if (string.IsNullOrWhiteSpace(uri)) | ||
| { | ||
| return defaultValue; | ||
| } | ||
| else | ||
| { | ||
| return new Uri(uri, UriKind.Absolute); | ||
| } | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| throw new InvalidOperationException($"Error parsing URIs from configuration value '{key}'.", ex); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Parses a configuration value's semicolon-delimited value into an array of <see cref="Uri"/> objects. | ||
| /// </summary> | ||
| /// <param name="configuration">The <see cref="IConfiguration"/> this method extends.</param> | ||
| /// <param name="key">The configuration key.</param> | ||
| /// <param name="defaultValue">A default value, for when the configuration value is unspecified or white space. May be <see langword="null"/>.</param> | ||
| /// <returns>The parsed values, or the default value if specified and parsing failed. Returns <see langword="null"/> if <paramref name="defaultValue"/> is <see langword="null"/> and parsing failed.</returns> | ||
| /// <exception cref="InvalidOperationException">The configuration value could not be accessed, or contained incorrectly formatted data.</exception> | ||
| [return: NotNullIfNotNull(nameof(defaultValue))] | ||
| public static Uri[]? GetUris(this IConfiguration configuration, string key, Uri? defaultValue = null) | ||
| { | ||
| try | ||
| { | ||
| var uris = configuration[key]; | ||
|
|
||
| if (string.IsNullOrWhiteSpace(uris)) | ||
| { | ||
| return defaultValue switch | ||
| { | ||
| not null => [defaultValue], | ||
| null => null | ||
| }; | ||
| } | ||
| else | ||
| { | ||
| return uris | ||
| .Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) | ||
| .Select(url => new Uri(url, UriKind.Absolute)) | ||
| .ToArray(); | ||
| } | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| throw new InvalidOperationException($"Error parsing URIs from configuration value '{key}'.", ex); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.