From 7edc0c5565cf7cc455a84d489fcbf07aeb8ad4fb Mon Sep 17 00:00:00 2001
From: Einar Omang <einar@omang.com>
Date: Wed, 10 Jun 2020 08:37:59 +0200
Subject: [PATCH] Make TryReadConfig call GenerateDefaults

Also change GenerateDefaults test to fit with this
---
 Cognite.Config/Configuration.cs          | 15 +++++++++++----
 ExtractorUtils.Test/ConfigurationTest.cs |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Cognite.Config/Configuration.cs b/Cognite.Config/Configuration.cs
index 331eccaf..016f53a8 100644
--- a/Cognite.Config/Configuration.cs
+++ b/Cognite.Config/Configuration.cs
@@ -96,7 +96,8 @@ public static int GetVersionFromString(string yaml)
 
         /// <summary>
         /// Try to read a configuration object of type <typeparamref name="T"/> from the provided <paramref name="yaml"/>
-        /// string. Matching the configuration object version with the versions provided in <paramref name="acceptedConfigVersions"/>
+        /// string. Matching the configuration object version with the versions provided in <paramref name="acceptedConfigVersions"/>.
+        /// Also calls GenerateDefaults() on the retrieved configuration object after reading.
         /// </summary>
         /// <param name="yaml">String containing a yaml configuration</param>
         /// <param name="acceptedConfigVersions">Accepted versions</param>
@@ -108,13 +109,17 @@ public static T TryReadConfigFromString<T>(string yaml, params int[] acceptedCon
         {
             int configVersion = ConfigurationUtils.GetVersionFromString(yaml);
             CheckVersion(configVersion, acceptedConfigVersions);
-            return ConfigurationUtils.ReadString<T>(yaml);
+
+            var config = ConfigurationUtils.ReadString<T>(yaml);
+            config.GenerateDefaults();
+            return config;
         }
 
         /// <summary>
         /// Try to read a configuration object of type <typeparamref name="T"/> from the yaml file located in
         /// the provided <paramref name="path"/>. Matching the configuration object version with the versions 
-        /// provided in <paramref name="acceptedConfigVersions"/>
+        /// provided in <paramref name="acceptedConfigVersions"/>.
+        /// Also calls GenerateDefaults() on the retrieved configuration object after reading.
         /// </summary>
         /// <param name="path">Path to the yml file</param>
         /// <param name="acceptedConfigVersions">Accepted versions</param>
@@ -127,7 +132,9 @@ public static T TryReadConfigFromFile<T>(string path, params int[] acceptedConfi
             int configVersion = ConfigurationUtils.GetVersionFromFile(path);
             CheckVersion(configVersion, acceptedConfigVersions);
 
-            return ConfigurationUtils.Read<T>(path);
+            var config = ConfigurationUtils.Read<T>(path);
+            config.GenerateDefaults();
+            return config;
         }
 
         /// <summary>
diff --git a/ExtractorUtils.Test/ConfigurationTest.cs b/ExtractorUtils.Test/ConfigurationTest.cs
index 8e745265..500b0274 100644
--- a/ExtractorUtils.Test/ConfigurationTest.cs
+++ b/ExtractorUtils.Test/ConfigurationTest.cs
@@ -158,7 +158,7 @@ public static void TestEmptyVersion()
         public static void TestGenerateDefaults()
         {
             var yaml = "version: 0";
-            var conf = ConfigurationUtils.TryReadConfigFromString<TestBaseConfig>(yaml);
+            var conf = ConfigurationUtils.ReadString<TestBaseConfig>(yaml);
             Assert.Null(conf.Cognite);
             Assert.Null(conf.Logger);
             Assert.Null(conf.Metrics);