Updates logic that reads cli path to take into account new tool structure

Author: AndreiDinca24

src/main/java/com/uipath/uipathpackage/configuration/UiPathCliConfiguration.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.uipath.uipathpackage.actions.AddEnvironmentVariablesAction;
+import com.uipath.uipathpackage.util.Utility;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.AbortException;
 import hudson.EnvVars;
@@ -138,13 +139,8 @@ public Optional<FilePath> getCliPath(@Nonnull Launcher launcher, @Nonnull EnvVar
         PrintStream logger = launcher.getListener().getLogger();
         try {
             FilePath cliCachedPath = getCliRootCachedDirectoryPath(launcher, env, cliVersionKey);
-            Configuration configuration = cliConfigurationMap.get(cliVersionKey);
-            if (configuration.getVersion().getMajor() >= 22) {
-                cliCachedPath = cliCachedPath.child("tools").child("uipcli.dll");
-            } else {
-                /** To Support Backward compatibility cli-21.10.xxx.xxx conventions needs to be followed.*/
-                cliCachedPath = cliCachedPath.child("lib").child("net461").child("uipcli.exe");
-            }
+            cliCachedPath = Utility.getDotnetToolCliPath(cliCachedPath);
+
             if (cliCachedPath.exists()) {
                 return Optional.of(cliCachedPath);
             }

src/main/java/com/uipath/uipathpackage/util/ActualVersion.java

@@ -18,6 +18,6 @@ public int getMinor() {
     }
 
     public boolean supportsNewTelemetry() {
-        return major >= 23 && minor >= 10;
+        return major == 23 ? minor >= 10 : major > 23;
     }
 }

src/main/java/com/uipath/uipathpackage/util/Utility.java

@@ -88,7 +88,8 @@ public int execute(@Nonnull String command, @Nonnull SerializableCliOptions opti
 
         FilePath commandOptionsFile = remoteTempDir.createTextTempFile("uipcliargs", "", new JSONObject(new RunOptions(command, options)).toString());
 
-        int result = launcher.launch().cmds(this.buildCommandLine(cliPath, commandOptionsFile, envVars)).envs(envVars).stdout(listener).pwd(cliPath.getParent()).start().join();
+        String[] commandParams = new String[]{"dotnet", cliPath.getRemote(), "run", commandOptionsFile.getRemote()};
+        int result = launcher.launch().cmds(commandParams).envs(envVars).stdout(listener).pwd(cliPath.getParent()).start().join();
         if (throwExceptionOnFailure && result != 0) {
             throw new AbortException("Failed to run the command, the CLI failed with error code " + result);
         }
@@ -123,7 +124,8 @@ public  CliDetails getCliDetails(
 
         StreamTaskListener execListener = new StreamTaskListener(commandOutput, run.getCharset());
 
-        launcher.launch().cmds(this.buildVersionArgs(cliPath, envVars)).envs(envVars).stdout(execListener).pwd(cliPath.getParent()).start().join();
+        String [] commandParameters = new String[] {"dotnet", cliPath.getRemote(), "--version" };
+        launcher.launch().cmds(commandParameters).envs(envVars).stdout(execListener).pwd(cliPath.getParent()).start().join();
 
         String stdoutText = commandOutput.toString(run.getCharset().name());
 
@@ -160,8 +162,8 @@ public void validateRuntime(@Nonnull Launcher launcher, @Nonnull EnvVars envVars
 
     public FilePath extractCliApp(@Nonnull FilePath targetRootCacheDir, @Nonnull TaskListener listener, @Nonnull EnvVars env) throws IOException, InterruptedException, URISyntaxException {
         PrintStream logger = listener.getLogger();
-        ResourceBundle rb = ResourceBundle.getBundle("config");
-        FilePath targetCliPath = targetRootCacheDir.child("tools").child("uipcli.dll");
+        FilePath targetCliPath = getDotnetToolCliPath(targetRootCacheDir);
+
         if (targetCliPath.exists())
         {
             logger.println("Using previously extracted UiPath CLI from " + targetCliPath);
@@ -183,6 +185,29 @@ public FilePath extractCliApp(@Nonnull FilePath targetRootCacheDir, @Nonnull Tas
         return targetCliPath;
     }
 
+    // With support for .NET tool structure, look for uipcli.dll in tools/netX.X/any/uipcli.dll. Maintain also backward compatibility.
+    public static FilePath getDotnetToolCliPath(FilePath targetPath) throws IOException, InterruptedException {
+        FilePath uipcliToolPath;
+
+        FilePath toolsDir = targetPath.child("tools");
+        uipcliToolPath = toolsDir.child("uipcli.dll");
+
+        if(uipcliToolPath.exists()) {
+            return uipcliToolPath;
+        }
+
+        if (toolsDir.exists()) {
+            for (FilePath child : toolsDir.listDirectories()) {
+                String dirName = child.getName();
+                if (dirName.startsWith("net")) {
+                    uipcliToolPath = child.child("any").child("uipcli.dll");
+                    break;
+                }
+            }
+        }
+        return uipcliToolPath;
+    }
+
     public void downloadCli(String feedUrl,@Nonnull FilePath downloadPath, @Nonnull TaskListener listener) throws AbortException {
         PrintStream logger = listener.getLogger();
         logger.println("Downloading CLI from "+ feedUrl);
@@ -298,40 +323,6 @@ else if (strategy instanceof UnattendedJobTypeEntry)
         }
     }
 
-    private String[] buildCommandLine(FilePath cliPath, FilePath commandOptionsFile, @Nonnull EnvVars envVars) throws JsonProcessingException {
-        UiPathCliConfiguration configuration = UiPathCliConfiguration.getInstance();
-        String selectedCliVersionKey = envVars.get(UiPathCliConfiguration.SELECTED_CLI_VERSION_KEY);
-
-        if(StringUtils.isBlank(selectedCliVersionKey)) {
-            selectedCliVersionKey = configuration.getDefaultCliVersionKey();
-        }
-
-        UiPathCliConfiguration.Configuration cliConfig = configuration.getConfiguration().get(selectedCliVersionKey);
-
-        if(cliConfig.getVersion().getMajor() >= 22) {
-            return new String[] {"dotnet", cliPath.getRemote(), "run", commandOptionsFile.getRemote() };
-        }
-
-        return new String[] { cliPath.getRemote(), "run", commandOptionsFile.getRemote() };
-    }
-
-    private String[] buildVersionArgs(FilePath cliPath, @Nonnull EnvVars envVars) throws JsonProcessingException {
-        UiPathCliConfiguration configuration = UiPathCliConfiguration.getInstance();
-        String selectedCliVersionKey = envVars.get(UiPathCliConfiguration.SELECTED_CLI_VERSION_KEY);
-
-        if(StringUtils.isBlank(selectedCliVersionKey)) {
-            selectedCliVersionKey = configuration.getDefaultCliVersionKey();
-        }
-
-        UiPathCliConfiguration.Configuration cliConfig = configuration.getConfiguration().get(selectedCliVersionKey);
-
-        if(cliConfig.getVersion().getMajor() >= 22) {
-            return new String[] {"dotnet", cliPath.getRemote(), "--version" };
-        }
-
-        return new String[] { cliPath.getRemote(), "--version" };
-    }
-
     private void extractResourcesToTempFolder(FilePath tempDir, File jarfile, TaskListener listener) throws IOException, InterruptedException {
         try (JarFile archive = new JarFile(jarfile)) {
             // sort entries by name to always create folders first

stage.test.yml

@@ -53,6 +53,8 @@ stages:
           configurationName: 'JenkinsE2ETests/UiPathInstallPlatform/InstallLocalNuPkgCLI'
         - jobName: 'SuccessiveInstallPlatforms'
           configurationName: 'JenkinsE2ETests/UiPathInstallPlatform/SuccessiveInstallPlatforms'
+        - jobName: 'InstallLocalNuPkgCLINetToolFolderStructure'
+          configurationName: 'JenkinsE2ETests/UiPathInstallPlatform/InstallLocalNuPkgCLINetToolFolderStructure'
         #### UiPathPack E2E tests ###
         - jobName: 'PackGenerateVersionTypes'
           configurationName: 'JenkinsE2ETests/UiPathPack/PackGenerateVersionTypes'