From 9a416c37331a5abed120f40423db1e92a107360b Mon Sep 17 00:00:00 2001 From: Phill Morton Date: Thu, 28 Sep 2023 10:01:39 +0100 Subject: [PATCH] Apply feedback from github build --- src/Microsoft.Tye.Hosting/TokenReplacement.cs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.Tye.Hosting/TokenReplacement.cs b/src/Microsoft.Tye.Hosting/TokenReplacement.cs index 2c6db262..a4def812 100644 --- a/src/Microsoft.Tye.Hosting/TokenReplacement.cs +++ b/src/Microsoft.Tye.Hosting/TokenReplacement.cs @@ -22,19 +22,18 @@ namespace Microsoft.Tye.Hosting { throw new InvalidOperationException($"No available substitutions found for token '{token}'."); } - - text = selectedBinding.Value.text; + if (selectedBinding.Value.text == null) continue; + text = selectedBinding.Value.text; + var selectedBindingtokens = GetTokens(selectedBinding.Value.text); - foreach (var bindingtoken in selectedBindingtokens) { - var replacement = ReplaceValues(bindingtoken,selectedBinding.Value.binding, bindings); + var replacement = ReplaceValues(bindingtoken, selectedBinding.Value.binding, bindings); text = text.Replace(bindingtoken, replacement); } } - return text; } @@ -118,12 +117,6 @@ namespace Microsoft.Tye.Hosting _ => null, }; } - - static string? GetEnvironmentVariable(EffectiveBinding binding, string key) - { - var envVar = binding.Env.FirstOrDefault(e => string.Equals(e.Name, key, StringComparison.OrdinalIgnoreCase)); - return envVar?.Value; - } } private static string? ResolveToken(string token, EffectiveBinding binding, List bindings)