Skip to content

Commit

Permalink
HPCC4J-642 DFSClient FileUtilityTest failing due to credential prompt…
Browse files Browse the repository at this point in the history 
…ing (#751)

Signed-off-by: James McMullan [email protected]
  • Loading branch information
@jpmcmu
jpmcmu authored Dec 16, 2024
1 parent 2a40e65 commit 85161dd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
14 changes: 10 additions & 4 deletions dfsclient/src/main/java/org/hpccsystems/dfs/client/FileUtility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,19 @@ private static String[] getCredentials(CommandLine cmd)
{
Console console = System.console();

boolean nonInteractive = cmd.hasOption("non_interactive");

String user = cmd.getOptionValue("user");
boolean userIsEmpty = user == null || user.isEmpty();
if (userIsEmpty)
if (userIsEmpty && !nonInteractive)
{
user = new String(console.readLine("Enter username: "));
userIsEmpty = user == null || user.isEmpty();
}

String pass = cmd.getOptionValue("pass");
boolean passIsEmpty = pass == null || pass.isEmpty();
if (!userIsEmpty && passIsEmpty)
if (!userIsEmpty && passIsEmpty & !nonInteractive)
{
pass = new String(console.readPassword("Enter password for " + user + ": "));
}
Expand Down Expand Up @@ -551,6 +553,7 @@ private static Options getReadOptions()
options.addOption("format", true, "Specifies the output format to be used when writing files to disk. Defaults to Thor files.");
options.addOption("num_threads", true, "Specifies the number of parallel to use to perform operations.");
options.addOption("out", true, "Specifies the directory that the files should be written to.");
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");

options.addOption(Option.builder("read")
.argName("files")
Expand All @@ -571,6 +574,7 @@ private static Options getReadTestOptions()
options.addOption("pass", true, "Specifies the password used to connect. Defaults to null.");
options.addOption("num_threads", true, "Specifies the number of parallel to use to perform operations.");
options.addOption("access_expiry_seconds", true, "Access token expiration seconds.");
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");

options.addOption(Option.builder("file_parts")
.argName("_file_parts")
Expand All @@ -590,6 +594,7 @@ private static Options getCopyOptions()
options.addRequiredOption("dest_cluster", "Destination Cluster Name", true, "Specifies the name of the cluster to write files back to.");
options.addOption("dest_url", "Destination Cluster URL", true, "Specifies the URL of the ESP to write to.");
options.addOption("num_threads", true, "Specifies the number of parallel to use to perform operations.");
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");

options.addOption(Option.builder("copy")
.argName("files")
Expand All @@ -611,6 +616,7 @@ private static Options getWriteOptions()
options.addOption("dest_url", "Destination Cluster URL", true, "Specifies the URL of the ESP to write to.");
options.addRequiredOption("dest_cluster", "Destination Cluster Name", true, "Specifies the name of the cluster to write files back to.");
options.addOption("num_threads", true, "Specifies the number of parallel to use to perform operations.");
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");

options.addOption(Option.builder("write")
.argName("files")
Expand Down Expand Up @@ -1738,14 +1744,14 @@ private static void performCopy(String[] args, TaskContext context)
{
String readArgs[] = {"-read", srcFile, "-url", srcURL,
"-format", "thor", "-user", user, "-pass", pass,
"-out", "tmp-read"};
"-out", "tmp-read", "-non_interactive"};

performRead(readArgs, context);

String writeArgs[] = {"-write", "tmp-read" + File.separator + srcFile.replace(':', '_') + "*" + " " + destFile,
"-url", srcURL, "-dest_url", destURL,
"-dest_cluster", destClusterName,
"-user", user, "-pass", pass };
"-user", user, "-pass", pass, "-non_interactive"};

performWrite(writeArgs, context);
}
Expand Down
8 changes: 4 additions & 4 deletions dfsclient/src/test/java/org/hpccsystems/dfs/client/FileUtilityTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void thorFileTests()
{
{
String readArgs[] = {"-read", "benchmark::integer::20kb", "-url", this.connString,
"-format", "thor", "-user", this.hpccUser, "-pass", this.hpccPass };
"-format", "thor", "-user", this.hpccUser, "-pass", this.hpccPass, "-non_interactive" };

JSONArray results = FileUtility.run(readArgs);
JSONObject result = results.optJSONObject(0);
Expand All @@ -58,7 +58,7 @@ public void thorFileTests()

{
String readArgs[] = {"-read_test", "benchmark::integer::20kb", "-url", this.connString,
"-user", this.hpccUser, "-pass", this.hpccPass, "-file_parts", "1" };
"-user", this.hpccUser, "-pass", this.hpccPass, "-file_parts", "1", "-non_interactive" };

JSONArray results = FileUtility.run(readArgs);
JSONObject result = results.optJSONObject(0);
Expand All @@ -72,7 +72,7 @@ public void thorFileTests()
String copyArgs[] = {"-copy", "benchmark::integer::20kb benchmark::integer::20kb-copy",
"-url", this.connString, "-dest_url", this.connString,
"-dest_cluster", this.thorClusterFileGroup,
"-user", this.hpccUser, "-pass", this.hpccPass };
"-user", this.hpccUser, "-pass", this.hpccPass, "-non_interactive" };

JSONArray results = FileUtility.run(copyArgs);
JSONObject result = results.optJSONObject(0);
Expand All @@ -87,7 +87,7 @@ public void thorFileTests()
String writeArgs[] = {"-write", localDir + "benchmark__integer__20kb* benchmark::integer::20kb_write",
"-url", this.connString, "-dest_url", this.connString,
"-dest_cluster", this.thorClusterFileGroup,
"-user", this.hpccUser, "-pass", this.hpccPass };
"-user", this.hpccUser, "-pass", this.hpccPass, "-non_interactive" };

JSONArray results = FileUtility.run(writeArgs);
JSONObject result = results.optJSONObject(0);
Expand Down

0 comments on commit 85161dd

Please sign in to comment.