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-332: Correct the O3 Versions displayed during setup of an instance #285

Merged
merged 4 commits into from
Aug 28, 2024

Conversation

mherman22
Copy link
Member

@mherman22 mherman22 commented Aug 20, 2024

Description of what I changed

Issue I worked on

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

screenshot(s)

Screenshot from 2024-08-20 11-41-09

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 ibacher August 20, 2024 08:46
@mherman22 mherman22 changed the title SDK-332: Correct the O3 Versions during setup of an instance SDK-332: Correct the O3 Versions displayed during setup of an instance Aug 20, 2024
for (ArtifactVersion version : versionsHelper.getAllVersions(artifact, MAX_OPTIONS_SIZE)) {
optionsMap.put(String.format(optionTemplate, version.toString()), artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + version);

Artifact artifact = new Artifact("referenceapplication-distro", "3.0.0-beta.21", "org.openmrs.distro", "zip");
Copy link
Member

Choose a reason for hiding this comment

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

Is there any reason not to just use 3.0.0 here?

Comment on lines 72 to 73
versions.removeIf(version -> "3.1.0-SNAPSHOT".equals(version.toString()));
versions.removeIf(version -> "3.0.0-SNAPSHOT".equals(version.toString()));
Copy link
Member

Choose a reason for hiding this comment

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

This looks like it will require continuous maintenance. Is there any way we can automate this, i.e., drop any -SNAPSHOT versions that are < the first non-SNAPSHOT version?

Copy link
Member Author

Choose a reason for hiding this comment

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

Makes sense, lemi make the change

Copy link
Member Author

Choose a reason for hiding this comment

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

done!

Comment on lines 72 to 73
versions.removeIf(version -> "3.1.0-SNAPSHOT".equals(version.toString()));
versions.removeIf(version -> "3.0.0-SNAPSHOT".equals(version.toString()));
Copy link
Member

Choose a reason for hiding this comment

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

Ooh... I don't exactly like doing this because we'd need to constantly maintain this. Is there a way we can write some logic that would

Copy link
Member Author

Choose a reason for hiding this comment

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

done!

@mherman22 mherman22 requested a review from ibacher August 26, 2024 08:05
@@ -782,11 +782,11 @@ private Map<String, String> getDistroVersionsOptionsMap(Set<String> versions, Ve
* @return A LinkedHashMap containing the generated options map.
*/
private Map<String, String> getO3VersionsOptionsMap(VersionsHelper versionsHelper,
String optionTemplate) {
String optionTemplate) {
Copy link
Member

Choose a reason for hiding this comment

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

Could we undo the change to this line?

Copy link
Member Author

Choose a reason for hiding this comment

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

next commit?

@ibacher ibacher merged commit 1747463 into openmrs:master Aug 28, 2024
2 checks passed
@mherman22 mherman22 deleted the sdk332 branch August 29, 2024 19:05
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.

2 participants