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

AJ-1496: remove /api/duos/consent/orsp/{orspId} API #1249

Merged
merged 9 commits into from
Dec 4, 2023

Conversation

davidangb
Copy link
Contributor

@davidangb davidangb commented Nov 30, 2023

The Consent service has removed the ability to look up an ORSP id and return the data use restrictions for that ORSP id. The API that Orch used to call for this now returns a 404 all the time.

Thus, this PR removes the call from Orch to Consent for this lookup, and removes Orch's own /api/duos/consent/orsp/{orspId} API. Technically, removing this API would be a breaking change. However, since Consent will always return a 404, if Orch kept its API alive it would also always return a 404. Instead, let's remove the API entirely … which will also return a 404.

By removing the call from Orch to Consent for this lookup, Orch can subsequently delete a whole bunch of code and unit tests. In fact, Orch can even remove Consent as a subsystem from its /status API.

Once this merges and is stable, I will follow up sometime after with a PR to remove the consent url from Orch's config: https://github.com/broadinstitute/terra-helmfile/blob/0935fb0a1fd3494fd2d7bfc09f4ada55c981fa27/charts/firecloudorch/templates/config/_conf.tpl#L344


Have you read CONTRIBUTING.md lately? If not, do that first.

I, the developer opening this PR, do solemnly pinky swear that:

  • I've followed the instructions if I've made any changes to the API, especially if they're breaking changes
  • I've updated the RC_XXX release ticket with any manual steps required to release this change
  • I've updated the FISMA documentation if I've made any security-related changes, including auth, encryption, or auditing

In all cases:

  • Get two thumbsworth of review and PO signoff if necessary
  • Verify all tests go green
  • Squash and merge; you can delete your branch after this unless it's for a hotfix. In that case, don't delete it!
  • Test this change deployed correctly and works on dev environment after deployment

Copy link

codecov bot commented Nov 30, 2023

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (91ad97a) 69.94% compared to head (b985a68) 69.36%.

❗ Current head b985a68 differs from pull request most recent head 113e7e8. Consider uploading reports for the commit 113e7e8 to get more accurate results

Files Patch % Lines
...scala/org/broadinstitute/dsde/firecloud/Boot.scala 0.00% 1 Missing ⚠️
...titute/dsde/firecloud/service/LibraryService.scala 75.00% 1 Missing ⚠️
.../dsde/firecloud/webservice/LibraryApiService.scala 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1249      +/-   ##
===========================================
- Coverage    69.94%   69.36%   -0.59%     
===========================================
  Files          101       97       -4     
  Lines         3500     3401      -99     
  Branches       371      381      +10     
===========================================
- Hits          2448     2359      -89     
+ Misses        1052     1042      -10     

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

}
Future.successful(annotatedWorkspaces map { w => indexableDocument(w, parentMap, ontologyDAO) })
Copy link
Contributor Author

Choose a reason for hiding this comment

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

changes in this class are the only real functional changes. Previously, we called consentDAO.getRestriction(orspId) if an ORSP id was present, and the remainder of the code was dedicated to handling the responses. Now, since that call will never succeed, the code is much simplified.

@davidangb
Copy link
Contributor Author

martha didn't start in automation tests. Jenkins retest.

@davidangb
Copy link
Contributor Author

martha didn't start again. Is this a persistent problem? Jenkins retest.

@davidangb davidangb changed the title AJ-1488 remove /api/duos/consent/orsp/{orspId} API AJ-1496: remove /api/duos/consent/orsp/{orspId} API Dec 1, 2023
@davidangb
Copy link
Contributor Author

Jenkins retest.

@davidangb
Copy link
Contributor Author

Jenkins retest

@davidangb davidangb marked this pull request as ready for review December 1, 2023 20:08
@jladieu
Copy link
Contributor

jladieu commented Dec 1, 2023

Delightful red diff. B-B-B-Bonus multiplier 💰 💰 💰 💰 for deleting Scala.

(sorry Scala)

Copy link
Contributor

@jladieu jladieu left a comment

Choose a reason for hiding this comment

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

Sorry I meant to approve this first time around and just left an cheerleading comment instead! Rectified.

@davidangb davidangb merged commit e97a85f into develop Dec 4, 2023
9 checks passed
@davidangb davidangb deleted the da_AJ-1488_removeOrsp branch December 4, 2023 15:43
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.

3 participants