Merge pull request #10 from SimCubeLtd/dev

maybe expansion will work under bash
SimCubeLtd · Oct 1, 2022 · d07017f · d07017f
2 parents 15bb62f + 00b9769
commit d07017f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/src/SimCube.PulumiDeployments/GlobalUsings.cs b/src/SimCube.PulumiDeployments/GlobalUsings.cs
@@ -6,7 +6,6 @@
 global using System.Text.Json;
 global using System.Text.Json.Serialization;
 global using Ardalis.GuardClauses;
-global using CliWrap;
 global using FluentValidation;
 global using FluentValidation.Results;
 global using Pulumi;

diff --git a/src/SimCube.PulumiDeployments/Resources/Helm/BaseHelmChartResource.cs b/src/SimCube.PulumiDeployments/Resources/Helm/BaseHelmChartResource.cs
@@ -6,9 +6,6 @@
 public abstract class BaseHelmChartResource : ComponentResource
 {
     protected readonly CustomResourceOptions CustomResourceOptions;
-
-    private const string EnvSubstituteCommand = "envsubst";
-    private const string MoveCommand = "mv";
     public const string HelmValuesFolder = "HelmValues";
 
     protected BaseHelmChartResource(
@@ -31,21 +28,15 @@ protected string RenderYamlValues(Dictionary<string, string?> environmentalVaria
     {
         var helmValuesFile = GetHelmValuesFilePath();
 
-        Cli.Wrap(EnvSubstituteCommand)
-            .WithArguments($"< {helmValuesFile} > {helmValuesFile}.new")
-            .WithEnvironmentVariables(environmentalVariables)
-            .WithValidation(CommandResultValidation.ZeroExitCode)
-            .ExecuteAsync()
-            .GetAwaiter()
-            .GetResult();
-
-        Cli.Wrap(MoveCommand)
-            .WithArguments($"{helmValuesFile}.new {helmValuesFile}")
-            .WithEnvironmentVariables(environmentalVariables)
-            .WithValidation(CommandResultValidation.ZeroExitCode)
-            .ExecuteAsync()
-            .GetAwaiter()
-            .GetResult();
+        foreach (var environmentalVariable in environmentalVariables)
+        {
+            Environment.SetEnvironmentVariable(environmentalVariable.Key, environmentalVariable.Value);
+        }
+
+        var origin = File.ReadAllText(helmValuesFile);
+        var output = Environment.ExpandEnvironmentVariables(origin);
+
+        File.WriteAllText(helmValuesFile, output);
 
         return helmValuesFile;
     }

diff --git a/src/SimCube.PulumiDeployments/SimCube.PulumiDeployments.csproj b/src/SimCube.PulumiDeployments/SimCube.PulumiDeployments.csproj
@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
-    <PackageReference Include="CliWrap" Version="3.5.0" />
     <PackageReference Include="FluentValidation" Version="11.2.2" />
     <PackageReference Include="Pulumi.Kubernetes" Version="3.21.4" />
     <PackageReference Include="Pulumi.Command" Version="4.5.0" />