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.

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

SDK-368: SDK should prompt for the database logins again if invalid logins were entered #324

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

mherman22
Copy link
Member

@mherman22 mherman22 commented Jan 8, 2025

Description of what I changed

Issue I worked on

see https://openmrs.atlassian.net/browse/SDK-368

Screenshot(s)

sdkpasswordattempts

Checklist: I completed these to help reviewers :)

  • My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • I ran mvn clean install right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute the above command

  • All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

@mherman22 mherman22 requested a review from wikumChamith January 8, 2025 12:02
Copy link
Member

@mseaton mseaton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks like a nice improvement to me. I do think it would be ideal if we could keep all of the prompting in the wizard itself, and of course the URL could also be wrong, not just the username and password, so giving a chance to fix that might also be worthwhile (eg. maybe the wrong database name was used, or maybe the wrong database option was chosen). I'm happy enough to see this get committed as is, and leave that for another day if needed though.

@mseaton mseaton requested a review from ibacher January 8, 2025 14:18
@wikumChamith
Copy link
Member

@mherman22 I see the error message even the first time SDK prompts for credentials. Can we avoid that?

Database connection failed (attempt 1 of 3): Invalid database credentials. Please check your username and password.

@wikumChamith
Copy link
Member

wikumChamith commented Jan 8, 2025

We should also implement this to when we are connecting to an existing docker container:

public void promptForDockerizedDb(Server server, DockerHelper dockerHelper, String dockerHost)
throws MojoExecutionException {
promptForDockerHostIfMissing(dockerHelper, dockerHost);
String containerId = prompt(
"Please specify your container id/name/label (you can get it using command `docker ps -a`)");
String username = prompt("Please specify DB username");
String password = promptForPassword("Please specify DB password");
String defaultDbUri = getDefaultDbUri(server, dockerHelper);
String dbUri = promptForValueIfMissingWithDefault(
"Please specify database uri (-D%s)", server.getDbUri(), "dbUri", defaultDbUri);
if (dbUri.startsWith("jdbc:mysql:")) {
server.setDbDriver(SDKConstants.DRIVER_MYSQL_OLD);
dbUri = addMySQLParamsIfMissing(dbUri);
}
dbUri = dbUri.replace(DBNAME_URL_VARIABLE, server.getServerId());
server.setDbUri(dbUri);
server.setDbUser(username);
server.setDbPassword(password);
server.setContainerId(containerId);
dockerHelper.runDbContainer(containerId, server.getDbUri(), username, password);
}

@wikumChamith
Copy link
Member

@mherman22 I see the error message even the first time SDK prompts for credentials. Can we avoid that?

Database connection failed (attempt 1 of 3): Invalid database credentials. Please check your username and password.

Sorry this was an issue on my side :)

@ibacher ibacher merged commit eabdcbd into openmrs:master Jan 8, 2025
2 checks passed
@mherman22
Copy link
Member Author

This all looks like a nice improvement to me. I do think it would be ideal if we could keep all of the prompting in the wizard itself, and of course the URL could also be wrong, not just the username and password, so giving a chance to fix that might also be worthwhile (eg. maybe the wrong database name was used, or maybe the wrong database option was chosen). I'm happy enough to see this get committed as is, and leave that for another day if needed though.

I'm working on a followup commit for this

@mherman22 mherman22 deleted the SDK-368 branch January 9, 2025 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants