Merge pull request #209 from NoxOrg/bugfix/yaml-variables

fixed yaml variable in script defaults
NoxOrg · Apr 2, 2024 · 4fc99d6 · 4fc99d6
2 parents d535b38 + 047f61f
commit 4fc99d6
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/Nox.Cli.Plugins/Nox.Cli.Plugin.Console/ConsolePromptSchema_v1.cs b/src/Nox.Cli.Plugins/Nox.Cli.Plugin.Console/ConsolePromptSchema_v1.cs
@@ -1,7 +1,6 @@
 using Nox.Cli.Abstractions;
 using Nox.Cli.Abstractions.Exceptions;
 using Nox.Cli.Abstractions.Extensions;
-using Nox.Cli.Helpers;
 using Nox.Cli.Plugin.Console.JsonSchema;
 using RestSharp;
 using Spectre.Console;
@@ -550,17 +549,16 @@ private void AppendKey(string yamlSpacing, string key)
     {
         if (_defaults?.ContainsKey(key) ?? false)
         {
-            var defaultValue = _defaults[key];
-            var match = _yamlVariableRegex.Match(defaultValue.ToString()!); 
-            if (match.Success)
+            var defaultValue = _defaults[key].ToString() ?? "";
+            var match = _yamlVariableRegex.Match(defaultValue); 
+            while (match.Success)
             {
                 var variableValue = _responses[match.Groups["variable"].ToString()].ToString();
-                return (T)Convert.ChangeType(defaultValue.ToString()!.Replace(match.Groups[0].ToString(), variableValue), typeof(T));
-            }
-            else
-            {
-                return (T)Convert.ChangeType(defaultValue, typeof(T));    
+                defaultValue = defaultValue.Replace(match.Groups[0].ToString(), variableValue);
+                match = _yamlVariableRegex.Match(defaultValue); 
             }
+            return (T)Convert.ChangeType(defaultValue, typeof(T))!;
+
         }
 
         return default;