Skip to content

Commit af67ea3

Browse files
authored
Fix file config directory name in config (#5777)
1 parent dc43825 commit af67ea3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/Aspire.Dashboard/DashboardWebApplication.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public DashboardWebApplication(
110110
}
111111

112112
// Allow for a user specified config directory on disk (e.g. for Docker secrets). Throw an error if the specified directory doesn't exist.
113-
if (builder.Configuration[DashboardConfigNames.DashboardFileConfigDirectory.ConfigKey] is { Length: > 0 } fileConfigDirectory)
113+
if (builder.Configuration[DashboardConfigNames.DashboardFileConfigDirectoryName.ConfigKey] is { Length: > 0 } fileConfigDirectory)
114114
{
115115
builder.Configuration.AddKeyPerFile(directoryPath: fileConfigDirectory, optional: false, reloadOnChange: true);
116116
}

src/Shared/DashboardConfigNames.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ internal static class DashboardConfigNames
1010
public static readonly ConfigName DashboardOtlpHttpUrlName = new("DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL");
1111
public static readonly ConfigName DashboardUnsecuredAllowAnonymousName = new("DOTNET_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS");
1212
public static readonly ConfigName DashboardConfigFilePathName = new("DOTNET_DASHBOARD_CONFIG_FILE_PATH");
13+
public static readonly ConfigName DashboardFileConfigDirectoryName = new("DOTNET_DASHBOARD_FILE_CONFIG_DIRECTORY");
1314
public static readonly ConfigName ResourceServiceUrlName = new("DOTNET_RESOURCE_SERVICE_ENDPOINT_URL");
1415

15-
public static readonly ConfigName DashboardFileConfigDirectory = new("Dashboard:FileConfigDirectory", "DASHBOARD__FILECONFIGDIRECTORY");
1616
public static readonly ConfigName DashboardOtlpAuthModeName = new("Dashboard:Otlp:AuthMode", "DASHBOARD__OTLP__AUTHMODE");
1717
public static readonly ConfigName DashboardOtlpPrimaryApiKeyName = new("Dashboard:Otlp:PrimaryApiKey", "DASHBOARD__OTLP__PRIMARYAPIKEY");
1818
public static readonly ConfigName DashboardOtlpSecondaryApiKeyName = new("Dashboard:Otlp:SecondaryApiKey", "DASHBOARD__OTLP__SECONDARYAPIKEY");

tests/Aspire.Dashboard.Tests/Integration/StartupTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public async Task Configuration_FileConfigDirectoryDoesExist_Success()
9393
try
9494
{
9595
var config = new ConfigurationManager()
96-
.AddInMemoryCollection(new Dictionary<string, string?> { [DashboardConfigNames.DashboardFileConfigDirectory.ConfigKey] = fileConfigDirectory.FullName })
96+
.AddInMemoryCollection(new Dictionary<string, string?> { [DashboardConfigNames.DashboardFileConfigDirectoryName.ConfigKey] = fileConfigDirectory.FullName })
9797
.Build();
9898
WebApplicationBuilder? localBuilder = null;
9999
Action<WebApplicationBuilder> webApplicationBuilderConfigAction = builder =>
@@ -126,7 +126,7 @@ public async Task Configuration_FileConfigDirectoryReloadsChanges_Success()
126126
try
127127
{
128128
var config = new ConfigurationManager()
129-
.AddInMemoryCollection(new Dictionary<string, string?> { [DashboardConfigNames.DashboardFileConfigDirectory.ConfigKey] = fileConfigDirectory.FullName })
129+
.AddInMemoryCollection(new Dictionary<string, string?> { [DashboardConfigNames.DashboardFileConfigDirectoryName.ConfigKey] = fileConfigDirectory.FullName })
130130
.Build();
131131
WebApplicationBuilder? localBuilder = null;
132132
Action<WebApplicationBuilder> webApplicationBuilderConfigAction = builder =>
@@ -165,7 +165,7 @@ public async Task Configuration_FileConfigDirectoryDoesntExist_Error()
165165
await using var app = IntegrationTestHelpers.CreateDashboardWebApplication(testOutputHelper,
166166
data =>
167167
{
168-
data[DashboardConfigNames.DashboardFileConfigDirectory.ConfigKey] = fileConfigDirectory;
168+
data[DashboardConfigNames.DashboardFileConfigDirectoryName.ConfigKey] = fileConfigDirectory;
169169
});
170170
});
171171

0 commit comments

Comments
 (0)