updated HelmExecutionBuilder workingDirectory to use PWD instead of n…

…ew File('.') from FileUtils Signed-off-by: Jeromy Cannon <[email protected]>
hashgraph · Sep 21, 2023 · b70956c · b70956c
1 parent ebaf816
commit b70956c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 65 deletions.
diff --git a/fullstack-base-api/src/main/java/com/hedera/fullstack/base/api/util/FileUtils.java b/fullstack-base-api/src/main/java/com/hedera/fullstack/base/api/util/FileUtils.java
diff --git a/fullstack-base-api/src/test/java/com/hedera/fullstack/base/api/test/util/FileUtilsTest.java b/fullstack-base-api/src/test/java/com/hedera/fullstack/base/api/test/util/FileUtilsTest.java
diff --git a/...client/src/main/java/com/hedera/fullstack/helm/client/execution/HelmExecutionBuilder.java b/...client/src/main/java/com/hedera/fullstack/helm/client/execution/HelmExecutionBuilder.java
@@ -17,8 +17,8 @@
 package com.hedera.fullstack.helm.client.execution;
 
 import com.hedera.fullstack.base.api.collections.KeyValuePair;
-import com.hedera.fullstack.base.api.util.FileUtils;
 import com.hedera.fullstack.helm.client.HelmConfigurationException;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.*;
@@ -83,10 +83,10 @@ public HelmExecutionBuilder(final Path helmExecutable) {
         this.positionals = new ArrayList<>();
         this.flags = new ArrayList<>();
         this.environmentVariables = new HashMap<>();
-        this.workingDirectory = FileUtils.getWorkingPath();
 
-        // TODO: for workingDirectory use system environment pwd (if null: else helm executable path)
-        // System.getenv("PWD"), check for empty string or null
+        String workingDirectory = System.getenv("PWD");
+        this.workingDirectory =
+                workingDirectory == null ? this.helmExecutable.getParent() : new File(workingDirectory).toPath();
     }
 
     /**