Skip to content

Installer connection string, default to appsettings.Development.json #20321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −3
Open

Installer connection string, default to appsettings.Development.json #20321

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b52e1e
Attempt to add connection string to appsettings.Development.json duri…
callumbwhyte Oct 1, 2025
317bc54
Correct provider reference
callumbwhyte Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
/// <inheritdoc />
public async Task RemoveConnectionStringAsync()
{
JsonConfigurationProvider? provider = GetJsonConfigurationProvider(UmbracoConnectionStringPath);
// attempt to get the Development configuration, fallback to default
JsonConfigurationProvider? provider = GetJsonConfigurationProvider("Development", UmbracoConnectionStringPath) ?? GetJsonConfigurationProvider(requiredKey: UmbracoConnectionStringPath);

JsonNode? jsonNode = await GetJsonNodeAsync(provider);

Expand All @@ -52,7 +53,9 @@
/// <inheritdoc />
public async Task SaveConnectionStringAsync(string connectionString, string? providerName)
{
JsonConfigurationProvider? provider = GetJsonConfigurationProvider();
// attempt to get the Development configuration, fallback to default
JsonConfigurationProvider? provider = GetJsonConfigurationProvider("Development") ?? GetJsonConfigurationProvider();

JsonNode? node = await GetJsonNodeAsync(provider);

if (node is null)
Expand Down Expand Up @@ -237,7 +240,7 @@
}
}

private JsonConfigurationProvider? GetJsonConfigurationProvider(string? requiredKey = null)
private JsonConfigurationProvider? GetJsonConfigurationProvider(string? environment = null, string? requiredKey = null)
{
if (_configuration is not IConfigurationRoot configurationRoot)
{
Expand All @@ -247,6 +250,7 @@
foreach (IConfigurationProvider provider in configurationRoot.Providers)
{
if (provider is JsonConfigurationProvider jsonConfigurationProvider &&
(environment is null || provider.Source.Path.EndsWith($"appsettings.{environment}.json")) &&

Check warning on line 253 in src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs

View check run for this annotation

CodeScene Delta Analysis / CodeScene Code Health Review (main)

❌ Getting worse: Complex Conditional 

GetJsonConfigurationProvider increases from 1 complex conditionals with 2 branches to 1 complex conditionals with 4 branches, threshold = 2. A complex conditional is an expression inside a branch (e.g. if, for, while) which consists of multiple, logical operators such as AND/OR. The more logical operators in an expression, the more severe the code smell.
(requiredKey is null || provider.TryGet(requiredKey, out _)))
{
return jsonConfigurationProvider;
Expand Down
Loading