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

docs(schema): Fix the JSON schema for the repository configuration #9847

Merged
merged 2 commits into from
Jan 28, 2025

Conversation

MarcelBochtler
Copy link
Member

By reusing the analyzer configuration schema, the properties incorrectly used camel case notation, change it to snake case.

While at it, remove the Sw360Configuration from the schema, which is not part of the analyzer configuration model.

Resolves #7680

Copy link

codecov bot commented Jan 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.37%. Comparing base (9fde78b) to head (8dbd425).
Report is 9 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #9847      +/-   ##
============================================
+ Coverage     68.12%   68.37%   +0.25%     
- Complexity     1293     1328      +35     
============================================
  Files           250      250              
  Lines          8843     8918      +75     
  Branches        918      935      +17     
============================================
+ Hits           6024     6098      +74     
+ Misses         2432     2431       -1     
- Partials        387      389       +2     
Flag Coverage Δ
funTest-docker 65.14% <ø> (ø)
funTest-non-docker 33.54% <ø> (+0.18%) ⬆️
test-ubuntu-24.04 35.76% <ø> (-0.02%) ⬇️
test-windows-2022 35.73% <ø> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@MarcelBochtler MarcelBochtler force-pushed the reporitory-config-json-schema branch 2 times, most recently from f6a1b04 to cdb4c94 Compare January 28, 2025 19:56
@MarcelBochtler MarcelBochtler marked this pull request as ready for review January 28, 2025 19:57
@MarcelBochtler MarcelBochtler requested a review from a team as a code owner January 28, 2025 19:57
@MarcelBochtler MarcelBochtler enabled auto-merge (rebase) January 28, 2025 19:57
analyzer:
package_managers:
Gradle:
must_run_after:
Copy link
Member

Choose a reason for hiding this comment

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

Just to double-check: In my global config.yml I use mustRunAfter and it works. And that's exactly the (confusing) point, that the syntax is different between config.yml and .ort.yml, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct.

Copy link
Member Author

Choose a reason for hiding this comment

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

The tests now also cover the two cases:
allow_dynamic_versions in the added analyzer-repository-configuration.ort.yml file,
and allowDynamicVersions in the reference.yml file.

By reusing the analyzer configuration schema, the properties incorrectly
used camel-case notation, change it to snake-case.

While at it, remove the `Sw360Configuration` from the schema, which is
not part of the analyzer configuration model.

Resolves #7680.

Signed-off-by: Marcel Bochtler <[email protected]>
@MarcelBochtler MarcelBochtler force-pushed the reporitory-config-json-schema branch from cdb4c94 to 8dbd425 Compare January 28, 2025 21:21
@MarcelBochtler MarcelBochtler merged commit b7410dc into main Jan 28, 2025
26 checks passed
@MarcelBochtler MarcelBochtler deleted the reporitory-config-json-schema branch January 28, 2025 22:01
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.

JSON schema validation for .ort.yml expects camel case instead of snake case in analyzer property
2 participants