Skip to content

LocalConfigurationDirectory should not use Paths.WorkingDirectoryRoot but Directory.GetCurrentDirectory() #1991

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

Merged
merged 2 commits into from
Oct 2, 2025
+14 −7
Merged

LocalConfigurationDirectory should not use Paths.WorkingDirectoryRoot but Directory.GetCurrentDirectory() #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67aadcb
LocalConfigurationDirectory should not use Paths.WorkingDirectoryRoot…
Mpdreamz Oct 2, 2025
baaf66f
save local should path as is, restored defaulting to local (with spot…
Mpdreamz Oct 2, 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
19 changes: 13 additions & 6 deletions src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,18 @@ public ConfigurationFileProvider(
// fileSystem.Directory.Exists(LocalConfigurationDirectory)
// ? ConfigurationSource.Local : ConfigurationSource.Embedded
// );


// Using Embedded as default for now
ConfigurationSource = configurationSource ?? ConfigurationSource.Embedded;

if (configurationSource is { } source)
ConfigurationSource = source;
else
{
string[] spotChecks = ["navigation.yml", "versions.yml", "products.yml", "assembler.yml"];
Copy link
Member

@reakaleek reakaleek Oct 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should legacy-url-mappsings.yml also be included in this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a spot check. The build will fail if it can't actually read all the files.

var defaultSource =
fileSystem.Directory.Exists(LocalConfigurationDirectory)
&& spotChecks.All(f => fileSystem.File.Exists(Path.Combine(LocalConfigurationDirectory, f)))
? ConfigurationSource.Local
: ConfigurationSource.Embedded;
ConfigurationSource = defaultSource;
}

if (ConfigurationSource == ConfigurationSource.Local && !fileSystem.Directory.Exists(LocalConfigurationDirectory))
throw new Exception($"Required directory form {nameof(ConfigurationSource)}.{nameof(ConfigurationSource.Local)} directory {LocalConfigurationDirectory} does not exist.");
Expand Down Expand Up @@ -216,7 +223,7 @@ private StreamReader GetEmbeddedStream(string fileName)
}

public static string AppDataConfigurationDirectory { get; } = Path.Combine(Paths.ApplicationData.FullName, "config-clone", "config");
public static string LocalConfigurationDirectory { get; } = Path.Combine(Paths.WorkingDirectoryRoot.FullName, "config");
public static string LocalConfigurationDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "config");

private static string GetLocalPath(string file) => Path.Combine(LocalConfigurationDirectory, file);
private static string GetAppDataPath(string file) => Path.Combine(AppDataConfigurationDirectory, file);
Expand Down
2 changes: 1 addition & 1 deletion src/services/Elastic.Documentation.Assembler/Configuration/ConfigurationCloneService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Cancel ctx
{
var checkoutFolder = fs.DirectoryInfo.New(ConfigurationFileProvider.AppDataConfigurationDirectory).Parent;
if (saveLocal)
checkoutFolder = fs.DirectoryInfo.New(ConfigurationFileProvider.LocalConfigurationDirectory).Parent;
checkoutFolder = fs.DirectoryInfo.New(ConfigurationFileProvider.LocalConfigurationDirectory);
if (checkoutFolder is null)
{
collector.EmitGlobalError($"Unable to find checkout folder {checkoutFolder}");
Expand Down
Loading