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

Clarify how source ordinal applies with an active profile #782

Merged

Conversation

poikilotherm
Copy link
Contributor

Closes #781

This pull request tries to rephrase parts of the profile on property level spec to clarify how ordinal of sources and the profiled vs. unprofiled values work together.

@eclipse-microprofile-bot
Copy link
Contributor

Can one of the admins verify this patch?

@Emily-Jiang
Copy link
Member

@poikilotherm you need to sign ECA form first. Please click on the Details above and follow instructions there.

@poikilotherm
Copy link
Contributor Author

@poikilotherm you need to sign ECA form first. Please click on the Details above and follow instructions there.

Was already on it 😉 Successfully signed and re-validated just now.

Please let me know what you think about the extended spec. Thank you very much for looking into this @Emily-Jiang !

@Emily-Jiang
Copy link
Member

Thank you @poikilotherm for the PR! Can you also add a couple of sentence on the spec to state the behavior?

@poikilotherm
Copy link
Contributor Author

Thank you @poikilotherm for the PR! Can you also add a couple of sentence on the spec to state the behavior?

Hi @Emily-Jiang thanks for the feedback. Unfortunately, I'm not sure what you are referring to? Is there some other place in the spec that I should edit besides the profile details that needed clarification? Any hints are much appreciated!

@Emily-Jiang
Copy link
Member

Thank you @poikilotherm for the PR! Can you also add a couple of sentence on the spec to state the behavior?

Hi @Emily-Jiang thanks for the feedback. Unfortunately, I'm not sure what you are referring to? Is there some other place in the spec that I should edit besides the profile details that needed clarification? Any hints are much appreciated!

Sorry for not being clear. I have added more detailed thoughts inline. Will you be able to take at this PR?

@poikilotherm
Copy link
Contributor Author

@Emily-Jiang thank you for your additional feedback!

I rephrased a little as you suggested. Please let me know if this is better now.

I already worked on adding a new TCK test locally, but struggeling to find a property not altered by other tests, so it can be used here. Will continue coding, maybe push something preliminary, too, so y'all could have a look.

A config source with higher ordinal should still override a profiled
value from a lower ordinal source with a non-profiled property name.
@poikilotherm
Copy link
Contributor Author

poikilotherm commented Jun 29, 2023

@Emily-Jiang @radcortez @smillidge I just added the new TCK test to this PR.

If you want to see it in action, I took notes how to execute the test in addition to the others: https://notes.desy.de/iDjhL8UESlO-_RGNKLDRZQ

As expected, Payara fails to be spec compliant, while SmallRye is compliant.

@Emily-Jiang
Copy link
Member

@poikilotherm can you address the above comments so that I can merge your PR?

@poikilotherm
Copy link
Contributor Author

@poikilotherm can you address the above comments so that I can merge your PR?

Please excuse my slow response time @Emily-Jiang - I'm on vacation. Applied changes as requested. Thank you again for looking into this!

Copy link
Member

@Emily-Jiang Emily-Jiang left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you @poikilotherm for your contribution!

@Emily-Jiang
Copy link
Member

@poikilotherm Can you fix the following format issue?

The GHA failed to execute goal net.revelc.code.formatter:formatter-maven-plugin:2.22.0:validate (default-cli) on project microprofile-config-tck: File '/home/runner/work/microprofile-config/microprofile-config/tck/src/main/java/org/eclipse/microprofile/config/tck/profile/OverrideConfigProfileTest.java' has not been previously formatted. Please format file (for example by invoking mvn -f tck net.revelc.code.formatter:formatter-maven-plugin:2.22.0:format) and commit before running validation!

@poikilotherm
Copy link
Contributor Author

@Emily-Jiang done! 😄

@Emily-Jiang
Copy link
Member

I will squash and merge your PR @poikilotherm and deal with the format with a separate PR if the build still fails.

@Emily-Jiang Emily-Jiang merged commit 652461f into eclipse:master Jul 13, 2023
@poikilotherm poikilotherm deleted the 781-profile-override-clarification branch July 13, 2023 09:05
@poikilotherm
Copy link
Contributor Author

Thank you very much @Emily-Jiang !

Much appreciated! Glad this is fixed now.

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.

Spec of precedence for sources when using profiles seems vague
4 participants