Skip to content

repeat console input untill non-empty password for azkabanUpload #269

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

repeat console input untill non-empty password for azkabanUpload #269

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
15 changes: 11 additions & 4 deletions hadoop-plugin/src/main/groovy/com/linkedin/gradle/azkaban/AzkabanHelper.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,22 @@ class AzkabanHelper {
* @param shortDelay Whether or not to introduce a short delay to allow Gradle to complete writing to the console
* @return The secret password
*/
static char[] consoleSecretInput(Console console, String message, boolean shortDelay) {
static char[] consoleSecretInput(Console console, String message, boolean shortDelay, boolean retryIfEmpty = false) {
// Give Gradle time to flush the logger to the screen and write its progress log line at the
// bottom of the screen, so we can augment this line with a prompt for the input
if (shortDelay) {
sleep(500);
}

console.format(message).flush();
return console.readPassword();
char[] secretInput;
while (true) {
console.format(message).flush();
secretInput = console.readPassword();
if (!retryIfEmpty || (secretInput != null && secretInput.length > 0)) {
break;
}
}
return secretInput;
}

/**
Expand Down Expand Up @@ -455,7 +462,7 @@ class AzkabanHelper {

if (azkProject.azkabanPassword == null) {
def console = getSystemConsole();
sessionId = azkabanLogin(azkProject.azkabanUrl, azkProject.azkabanUserName, consoleSecretInput(console, " > Enter ${passwordString}: ", true));
sessionId = azkabanLogin(azkProject.azkabanUrl, azkProject.azkabanUserName, consoleSecretInput(console, " > Enter ${passwordString}: ", true, true));
} else {
logger.lifecycle("Azkaban ${passwordString}: *********");
sessionId = azkabanLogin(azkProject.azkabanUrl, azkProject.azkabanUserName, azkProject.azkabanPassword.toCharArray());
Expand Down
24 changes: 24 additions & 0 deletions hadoop-plugin/src/test/groovy/com/linkedin/gradle/azkaban/AzkabanHelperTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.junit.Test
import org.junit.rules.ExpectedException

import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*

class AzkabanHelperTest {
@Test
Expand All @@ -44,4 +45,27 @@ class AzkabanHelperTest {
expectedEx.expectMessage(AzkabanHelper.CONSOLE_EXCEPTION_MESSAGE);
AzkabanHelper.getSystemConsole();
}

// Since Console is final class, it requires `mock-maker-inline` extension to run below test.
// More details: https://github.com/mockito/mockito/wiki/What's-new-in-Mockito-2#unmockable
// Enabling this extension causes several other test cases failure. Keeping below test case commented for now.
// @Test
// void testConsoleSecretInput() {
// String consoleInputMessage = "Enter test input: "
// char[] nonEmptyInput = "test".toCharArray()
// char[] emptyInput = "".toCharArray()
// Console mockedConsole = mock(Console.class)
//
// when(mockedConsole.readPassword()).thenReturn(nonEmptyInput)
// assertEquals(AzkabanHelper.consoleSecretInput(mockedConsole, consoleInputMessage, false, false), nonEmptyInput)
//
// when(mockedConsole.readPassword()).thenReturn(nonEmptyInput)
// assertEquals(AzkabanHelper.consoleSecretInput(mockedConsole, consoleInputMessage, false, true), nonEmptyInput)
//
// when(mockedConsole.readPassword()).thenReturn(emptyInput)
// assertEquals(AzkabanHelper.consoleSecretInput(mockedConsole, consoleInputMessage, false, false), emptyInput)
//
// when(mockedConsole.readPassword()).thenReturn(emptyInput, emptyInput, nonEmptyInput)
// assertEquals(AzkabanHelper.consoleSecretInput(mockedConsole, consoleInputMessage, false, true), nonEmptyInput)
// }
}