+
Skip to content

Conversation

svonworl
Copy link
Contributor

@svonworl svonworl commented Sep 9, 2025

Description
This PR fixes a couple of bugs in the .dockstore.yml inference code:

  • During the inference process, workflow files that are referenced from other workflow files should be eliminated from consideration as primary descriptors. This was broken, causing every workflow file (files named with the appropriate suffix, for example wdl) to be considered as the primary descriptor of an entry, creating potentially many spurious entries for helper files in the resulting .dockstore.yml. The root cause was an errant path manipulation that was probably introduced during the Path conversion. Fixed.
  • Fixes debug output which records the size of the github ref's Zip.

It also resets to the SNAPSHOT version.

Originally, this PR included a tweak that constructed a GitHub ref where a branch name was being used, avoiding some default output and maybe some extra requests. However, the unfixed code seems to [eventually?] do the right thing, and to avoid unintended consequences this late in the deploy cycle, I removed the change.

Review Instructions
Infer a .dockstore.yml for github.com/PacificBiosciences/HiFi-human-WGS-WDL and confirm that the inferred .dockstore.yml contains two entries.

Issue
https://ucsc-cgl.atlassian.net/browse/SEAB-6531

Security and Privacy

If there are any concerns that require extra attention from the security team, highlight them here and check the box when complete.

  • Security and Privacy assessed

e.g. Does this change...

  • Any user data we collect, or data location?
  • Access control, authentication or authorization?
  • Encryption features?

Please make sure that you've checked the following before submitting your pull request. Thanks!

  • Check that you pass the basic style checks and unit tests by running mvn clean install
  • Ensure that the PR targets the correct branch. Check the milestone or fix version of the ticket.
  • Follow the existing JPA patterns for queries, using named parameters, to avoid SQL injection
  • If you are changing dependencies, check the Snyk status check or the dashboard to ensure you are not introducing new high/critical vulnerabilities
  • Assume that inputs to the API can be malicious, and sanitize and/or check for Denial of Service type values, e.g., massive sizes
  • Do not serve user-uploaded binary images through the Dockstore API
  • Ensure that endpoints that only allow privileged access enforce that with the @RolesAllowed annotation
  • Do not create cookies, although this may change in the future
  • If this PR is for a user-facing feature, create and link a documentation ticket for this feature (usually in the same milestone as the linked issue). Style points if you create a documentation PR directly and link that instead.

@svonworl svonworl self-assigned this Sep 9, 2025
@svonworl svonworl changed the title Fx some .dockstore.yml inference bugs, reset version SEAB-6531: Fix some .dockstore.yml inference bugs, reset version Sep 9, 2025
@svonworl svonworl requested a review from denis-yuen September 9, 2025 03:24
Copy link

codecov bot commented Sep 9, 2025

Codecov Report

❌ Patch coverage is 60.00000% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 74.02%. Comparing base (6381975) to head (6ca0b5f).
⚠️ Report is 2 commits behind head on develop.

Files with missing lines Patch % Lines
...vice/helpers/infer/DescriptorLanguageInferrer.java 50.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #6162      +/-   ##
=============================================
- Coverage      74.03%   74.02%   -0.01%     
- Complexity      5710     5712       +2     
=============================================
  Files            397      397              
  Lines          20540    20543       +3     
  Branches        2111     2112       +1     
=============================================
+ Hits           15206    15207       +1     
- Misses          4331     4332       +1     
- Partials        1003     1004       +1     
Flag Coverage Δ
bitbuckettests 25.86% <0.00%> (-0.01%) ⬇️
hoverflytests 27.43% <0.00%> (-0.01%) ⬇️
integrationtests 56.10% <20.00%> (-0.01%) ⬇️
languageparsingtests 10.80% <0.00%> (-0.01%) ⬇️
localstacktests 21.21% <0.00%> (-0.01%) ⬇️
toolintegrationtests 29.79% <0.00%> (-0.01%) ⬇️
unit-tests_and_non-confidential-tests 26.14% <40.00%> (+<0.01%) ⬆️
workflowintegrationtests 38.85% <60.00%> (-0.01%) ⬇️

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.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link

sonarqubecloud bot commented Sep 9, 2025

}

private Optional<Path> toAbsolutePath(Path currentPath, String relativeOrAbsolutePath) {
Path parentPath = currentPath.getParent();
Copy link
Member

Choose a reason for hiding this comment

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

A little puzzled, this seems to never resolve to the previous code no matter what condition. Was this completely broken and just unnoticed?

Copy link
Member

@denis-yuen denis-yuen Sep 10, 2025

Choose a reason for hiding this comment

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

Maybe it's the same if the currentPath is the root?
In other circumstances, could use some unit tests

@svonworl svonworl merged commit b5f9fc2 into develop Sep 10, 2025
21 of 24 checks passed
@svonworl svonworl deleted the feature/seab-6531/inference-bug-fixes branch September 10, 2025 15:27
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

点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载