fix(nuget): Use executable resolver to get dotnet exe

blackducksoftware · Jun 10, 2020 · 84d5e74 · 84d5e74
1 parent 846bb26
commit 84d5e74
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/main/java/com/synopsys/integration/detect/RunBeanConfiguration.java b/src/main/java/com/synopsys/integration/detect/RunBeanConfiguration.java
@@ -223,9 +223,10 @@ public NugetInspectorResolver nugetInspectorResolver() {
         }
 
         final ExecutableRunner executableRunner = executableRunner();
-        final DotNetRuntimeFinder runtimeFinder = new DotNetRuntimeFinder(executableRunner, new File("."));
+        final DetectExecutableResolver executableResolver = detectExecutableResolver();
+        final DotNetRuntimeFinder runtimeFinder = new DotNetRuntimeFinder(executableRunner, executableResolver, directoryManager.getPermanentDirectory());
         final DotNetRuntimeManager dotNetRuntimeManager = new DotNetRuntimeManager(runtimeFinder, new DotNetRuntimeParser());
-        return new LocatorNugetInspectorResolver(detectExecutableResolver(), executableRunner, detectInfo, fullFileFinder(), installerOptions.getNugetInspectorName(), installerOptions.getPackagesRepoUrl(), locator, dotNetRuntimeManager);
+        return new LocatorNugetInspectorResolver(executableResolver, executableRunner, detectInfo, fullFileFinder(), installerOptions.getNugetInspectorName(), installerOptions.getPackagesRepoUrl(), locator, dotNetRuntimeManager);
     }
 
     @Bean()

diff --git a/...nopsys/integration/detect/tool/detector/inspectors/nuget/runtime/DotNetRuntimeFinder.java b/...nopsys/integration/detect/tool/detector/inspectors/nuget/runtime/DotNetRuntimeFinder.java
@@ -30,37 +30,49 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.synopsys.integration.detect.tool.detector.impl.DetectExecutableResolver;
 import com.synopsys.integration.detectable.detectable.exception.DetectableException;
 import com.synopsys.integration.detectable.detectable.executable.ExecutableOutput;
 import com.synopsys.integration.detectable.detectable.executable.ExecutableRunner;
 import com.synopsys.integration.detectable.detectable.executable.ExecutableRunnerException;
 
 public class DotNetRuntimeFinder {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static final String DOTNET_LIST_RUNTIMES_COMMAND = "--list-runtimes";
 
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
     private final ExecutableRunner executableRunner;
+    private final DetectExecutableResolver executableResolver;
     private final File workingDir;
 
-    public DotNetRuntimeFinder(ExecutableRunner executableRunner, File workingDir) {
+    public DotNetRuntimeFinder(final ExecutableRunner executableRunner, final DetectExecutableResolver executableResolver, final File workingDir) {
         this.executableRunner = executableRunner;
+        this.executableResolver = executableResolver;
         this.workingDir = workingDir;
     }
 
     public List<String> listAvailableRuntimes() throws DetectableException {
         try {
-            ExecutableOutput runtimesOutput = executableRunner.execute(workingDir, "dotnet", "--list-runtimes");
-            List<String> foundRuntimes = runtimesOutput.getStandardOutputAsList()
-                                             .stream()
-                                             .map(StringUtils::trimToEmpty)
-                                             .filter(StringUtils::isNotBlank)
-                                             .collect(Collectors.toList());
+            final ExecutableOutput runtimesOutput = dotnetListRuntimes();
+            final List<String> foundRuntimes = runtimesOutput.getStandardOutputAsList()
+                                                   .stream()
+                                                   .map(StringUtils::trimToEmpty)
+                                                   .filter(StringUtils::isNotBlank)
+                                                   .collect(Collectors.toList());
             logger.info("Found {} available dotnet runtimes", foundRuntimes.size());
             if (foundRuntimes.isEmpty()) {
                 throw new DetectableException("No available dotnet runtimes");
             }
             return foundRuntimes;
-        } catch (ExecutableRunnerException e) {
+        } catch (final ExecutableRunnerException e) {
             throw new DetectableException("Could not determine available dotnet runtimes", e);
         }
     }
+
+    private ExecutableOutput dotnetListRuntimes() throws DetectableException, ExecutableRunnerException {
+        final File dotnetExe = executableResolver.resolveDotNet();
+        if (dotnetExe != null) {
+            return executableRunner.execute(workingDir, dotnetExe, DOTNET_LIST_RUNTIMES_COMMAND);
+        }
+        return executableRunner.execute(workingDir, "dotnet", DOTNET_LIST_RUNTIMES_COMMAND);
+    }
 }