Merge pull request AzureCosmosDB#20 from AzureCosmosDB/develop

Updating settings file loading behavior

Author: codingbandit

Core/Cosmos.DataTransfer.Core/Cosmos.DataTransfer.Core.csproj

@@ -27,6 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="appsettings.Development.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="migrationsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

Core/Cosmos.DataTransfer.Core/Program.cs

@@ -49,8 +49,19 @@ public static async Task<int> Main(string[] args)
         var parser = cmdlineBuilder.UseHost(_ => Host.CreateDefaultBuilder(args),
             builder =>
             {
-                builder.ConfigureAppConfiguration(cfg =>
+                builder.ConfigureAppConfiguration((hostContext, cfg) =>
                 {
+                    var exeFolder = AppContext.BaseDirectory;
+                    var appsettings = Path.Combine(exeFolder, "appsettings.json");
+                    if (File.Exists(appsettings))
+                    {
+                        cfg.AddJsonFile(appsettings);
+                    }
+                    var appsettingsEnv = Path.Combine(exeFolder, $"appsettings.{hostContext.HostingEnvironment.EnvironmentName}.json");
+                    if (File.Exists(appsettingsEnv))
+                    {
+                        cfg.AddJsonFile(appsettingsEnv);
+                    }
                     cfg.AddUserSecrets<Program>();
                 }).ConfigureServices((hostContext, services) =>
                 {

Core/Cosmos.DataTransfer.Core/RunCommand.cs

@@ -179,8 +179,9 @@ private IConfiguration BuildSettingsConfiguration(IConfiguration configuration,
                 IConfigurationBuilder configurationBuilder = new ConfigurationBuilder();
                 if (!string.IsNullOrEmpty(settingsPath) && File.Exists(settingsPath))
                 {
-                    _logger.LogInformation("Settings loading from file at configured path '{FilePath}'.", settingsPath);
-                    configurationBuilder = configurationBuilder.AddJsonFile(settingsPath);
+                    var fullFilePath = Path.GetFullPath(settingsPath);
+                    _logger.LogInformation("Settings loading from file at configured path '{FilePath}'.", fullFilePath);
+                    configurationBuilder = configurationBuilder.AddJsonFile(fullFilePath);
                 }
                 else if (promptForFile)
                 {
@@ -189,8 +190,9 @@ private IConfiguration BuildSettingsConfiguration(IConfiguration configuration,
                     cancellationToken.ThrowIfCancellationRequested();
                     if (!string.IsNullOrWhiteSpace(path))
                     {
-                        _logger.LogInformation("Settings loading from file at entered path '{FilePath}'.", settingsPath);
-                        configurationBuilder = configurationBuilder.AddJsonFile(path);
+                        var fullFilePath = Path.GetFullPath(path);
+                        _logger.LogInformation("Settings loading from file at entered path '{FilePath}'.", fullFilePath);
+                        configurationBuilder = configurationBuilder.AddJsonFile(fullFilePath);
                     }
                 }
 

Core/Cosmos.DataTransfer.Core/appsettings.Development.json

@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting": "Warning"
+    }
+  },
+  "ExtensionsPath": null,
+  "SettingsPath": "migrationsettings.json"
+}

Core/Cosmos.DataTransfer.Core/appsettings.json

@@ -6,29 +6,5 @@
     }
   },
   "ExtensionsPath": null,
-  "SettingsPath": "migrationsettings.json",
-  "JsonSourceSettings": {
-  },
-  "JsonSinkSettings": {
-  },
-  "Cosmos-NoSqlSourceSettings": {
-    "ConnectionString": "<Add in User Secrets>"
-  },
-  "Cosmos-NoSqlSinkSettings": {
-    "ConnectionString": "<Add in User Secrets>"
-  },
-  "MongoSourceSettings": {
-  },
-  "MongoSinkSettings": {
-  },
-  "AzureTableAPISourceSettings": {
-  },
-  "AzureTableAPISinkSettings": {
-  },
-  "SqlServerSourceSettings": {
-    "ConnectionString": "<Add in User Secrets>"
-  },
-  "SqlServerSinkSettings": {
-    "ConnectionString": "<Add in User Secrets>"
-  }
+  "SettingsPath": "migrationsettings.json"
 }