Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC4J-642 DFSClient FileUtilityTest failing due to credential prompting #778

Merged
merged 1 commit into from
Dec 17, 2024
Merged

HPCC4J-642 DFSClient FileUtilityTest failing due to credential prompting #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions dfsclient/src/main/java/org/hpccsystems/dfs/client/FileUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,17 +335,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 @@ -642,6 +644,7 @@ private static Options getReadOptions()
options.addOption("socket_timeout_seconds", true, "Sets the socket operation timeout in seconds.");
options.addOption("connection_startup_limit", true, "Specifies the maximum number of connections to startup concurrently."
+ " useful in cases where starting up connections too quickly can overwhelm intermediate processes.");
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");

options.addOption(Option.builder("read")
.argName("files")
Expand Down Expand Up @@ -672,6 +675,7 @@ private static Options getReadTestOptions()
options.addOption("socket_timeout_seconds", true, "Sets the socket operation timeout in seconds.");
options.addOption("connection_startup_limit", true, "Specifies the maximum number of connections to startup concurrently."
+ " useful in cases where starting up connections too quickly can overwhelm intermediate processes.");
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 @@ -697,6 +701,7 @@ private static Options getCopyOptions()
options.addOption("socket_timeout_seconds", true, "Sets the socket operation timeout in seconds.");
options.addOption("connection_startup_limit", true, "Specifies the maximum number of connections to startup concurrently."
+ " useful in cases where starting up connections too quickly can overwhelm intermediate processes.");
options.addOption("non_interactive", false, "Disables prompting for credentials if they are not provided.");

options.addOption(Option.builder("copy")
.argName("files")
Expand All @@ -721,6 +726,7 @@ private static Options getWriteOptions()
options.addOption("socket_timeout_seconds", true, "Sets the socket operation timeout in seconds.");
options.addOption("connection_startup_limit", true, "Specifies the maximum number of connections to startup concurrently."
+ " useful in cases where starting up connections too quickly can overwhelm intermediate processes.");
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 @@ -1962,14 +1968,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 Expand Up @@ -2280,4 +2286,4 @@ public static void main(String[] args)

return;
}
}
}
8 changes: 4 additions & 4 deletions dfsclient/src/test/java/org/hpccsystems/dfs/client/FileUtilityTest.java
View file
Open in desktop
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
Loading