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

Remove dockstore-webservice dependency #470

Merged
merged 6 commits into from
Jun 22, 2023

Conversation

kathy-t
Copy link
Contributor

@kathy-t kathy-t commented Jun 16, 2023

Description
Companion webservice PR dockstore/dockstore#5562

This PR removes the dockstore-webservice dependency by only using things from dockstore-common. Note that the metrics-aggegator still uses the dockstore-webservice with the test scope.

I also removed all javax dependencies because I didn't see any imports for them. Looks like javax imports were deleted in #468 when we removed the jenkins functionality. This will remove the need for dockstore/dockstore#5527.

Review Instructions
Tests should pass and the metricsaggregator and tooltester should still be functional. Can try running a command for both the metrics aggregator and tooltester to make sure the JAR works. For the metrics aggregator, could submit validation data using a simple CSV file containing data for one workflow. For the tooltester, could upload metrics.

Issue
dockstore/dockstore#5528
https://ucsc-cgl.atlassian.net/browse/DOCK-2404

Security
If there are any concerns that require extra attention from the security team, highlight them here.

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 in the project that you have modified (until https://ucsc-cgl.atlassian.net/browse/SEAB-5300 adds multi-module support properly)
  • Ensure that the PR targets the correct branch. Check the milestone or fix version of the ticket.
  • If you are changing dependencies, check with dependabot to ensure you are not introducing new high/critical vulnerabilities
  • 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.

@kathy-t kathy-t self-assigned this Jun 16, 2023
@codecov
Copy link

codecov bot commented Jun 16, 2023

Codecov Report

Patch coverage has no change and project coverage change: -22.52 ⚠️

Comparison is base (190f032) 49.52% compared to head (5c73e09) 27.00%.

❗ Current head 5c73e09 differs from pull request most recent head 732770d. Consider uploading reports for the commit 732770d to get more accurate results

Additional details and impacted files
@@              Coverage Diff               @@
##             develop     #470       +/-   ##
==============================================
- Coverage      49.52%   27.00%   -22.52%     
+ Complexity       183      106       -77     
==============================================
  Files             22       22               
  Lines           1480     1481        +1     
  Branches         127      128        +1     
==============================================
- Hits             733      400      -333     
- Misses           704     1055      +351     
+ Partials          43       26       -17     
Flag Coverage Δ
metricsaggregator ?
toolbackup ?
tooltester ?

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

Impacted Files Coverage Δ
...e/metricsaggregator/MetricsAggregatorS3Client.java 0.00% <ø> (-81.40%) ⬇️
.../metricsaggregator/client/cli/CommandLineArgs.java 0.00% <ø> (-100.00%) ⬇️
...aggregator/client/cli/MetricsAggregatorClient.java 0.00% <ø> (-69.31%) ⬇️
...re/metricsaggregator/helper/AggregationHelper.java 87.14% <ø> (-5.72%) ⬇️
...ava/io/dockstore/tooltester/client/cli/Client.java 25.56% <ø> (ø)
...ckstore/tooltester/runWorkflow/WorkflowRunner.java 0.00% <0.00%> (ø)
...e/tooltester/runWorkflow/WorkflowRunnerConfig.java 0.00% <0.00%> (ø)

... and 7 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@denis-yuen denis-yuen left a comment

Choose a reason for hiding this comment

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

Likely ok, but will return after reviewing webservice PR

THIRD-PARTY-LICENSES.txt Show resolved Hide resolved
<!-- used by toolbackup <exclude>javax.annotation:javax.annotation-api</exclude> -->
<!-- still used by tooltester <exclude>javax.activation:activation</exclude> -->
<!-- still used by tooltester <exclude>javax.ws.rs:javax.ws.rs-api</exclude> -->
<exclude>javax.annotation:javax.annotation-api</exclude>
Copy link
Member

Choose a reason for hiding this comment

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

Nice

toolbackup/pom.xml Outdated Show resolved Hide resolved
Copy link
Member

@denis-yuen denis-yuen left a comment

Choose a reason for hiding this comment

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

After the other one of course

@kathy-t kathy-t marked this pull request as draft June 20, 2023 16:00
@kathy-t
Copy link
Contributor Author

kathy-t commented Jun 20, 2023

I found a problem when running the tooltester and metrics aggregator so I removed reviewers and made this PR a draft. Will re-request reviews when it's ready again

@kathy-t kathy-t marked this pull request as ready for review June 21, 2023 17:09
@kathy-t
Copy link
Contributor Author

kathy-t commented Jun 21, 2023

When running the metrics aggregator and tool tester locally, they failed. Turns out they need the org.glassfish.jersey.inject:jersey-hk2 dependency to run. Disclaimer: I only tested the metrics aggregator and tooltester commands, not the toolbackup, but it seems like we currently don't use it.

I ran into a null pointer exception when running workflows on AGC using the tooltester so I added a null check.

Copy link
Member

@denis-yuen denis-yuen left a comment

Choose a reason for hiding this comment

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

Thanks for checking for runtime errors, those can be pretty annoying to track down since they don't show up in tests

<artifactId>jackson-module-jaxb-annotations</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
Copy link
Member

Choose a reason for hiding this comment

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

🥳

@@ -170,12 +170,14 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.11.83</version>
Copy link
Member

Choose a reason for hiding this comment

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

Can use a property for these two to hint to a future developer that either these two are upgraded at once or more likely, deleted at the same time

@@ -169,37 +166,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
Copy link
Member

Choose a reason for hiding this comment

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

👍

@sonarcloud
Copy link

sonarcloud bot commented Jun 22, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@kathy-t
Copy link
Contributor Author

kathy-t commented Jun 22, 2023

Updated the dockstore-core dependency to a tag. Build failed because of the new cwlavro version in the webservice, so I updated the pom to use the cwlavro dependencies from the bom

@kathy-t kathy-t requested a review from denis-yuen June 22, 2023 18:03
@kathy-t kathy-t merged commit cdb0c1c into develop Jun 22, 2023
@kathy-t kathy-t deleted the feature/5528/remove-webservice-dep branch June 22, 2023 20:40
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