AJ-1602: list-jobs API no longer a passthrough to Import Service #1305
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #1305 +/- ##
===========================================
- Coverage 69.34% 69.29% -0.05%
===========================================
Files 97 97
Lines 3399 3407 +8
Branches 373 368 -5
===========================================
+ Hits 2357 2361 +4
- Misses 1042 1046 +4 ☔ View full report in Codecov by Sentry. |
| "request as reported by import service")) | ||
| else if (importRequest.url.contains("its.lawsuit.time")) Future.successful(RequestComplete | ||
| (UnavailableForLegalReasons, "import service message")) | ||
| else if (importRequest.url.contains("good")) Future.successful(RequestComplete(Accepted, |
There was a problem hiding this comment.
no changes here, just IntelliJ auto-reformatting
| } | ||
| } | ||
|
|
||
| } |
There was a problem hiding this comment.
this replaces the unit tests from WorkspaceApiServiceSpec, just below
| // TODO AJ-1602: merge lists before replying | ||
| importServiceJobs | ||
| } | ||
|
|
There was a problem hiding this comment.
This is where, in future PRs, we'll do all the work of aggregating cWDS and Import Service job info
| entityServiceConstructor(FlexibleModelSchema).listJobs(workspaceNamespace, workspaceName, runningOnly, userInfo) map { respBody => | ||
| RequestComplete(OK, respBody) | ||
| } | ||
| } |
There was a problem hiding this comment.
this replaces the previous passthrough (i.e. proxy) implementation for listing jobs. Now, we make the REST call, deserialize the results, then reply with those results. This is prep for future PRs, in which we'll need to interpret the results in order to aggregate cWDS and Import Service values.
AJ-1602
The eventual goal is to query both cWDS and Import Service, ask each about their running jobs, and aggregate the results into a single response.
This PR is prep for that. Previously, the call to Import Service was a pure passthrough; Orch was blind to Import Service's results and just passed on the response. Now, in this PR, Orch can deserialize the Import Service results and is fully aware of them. We still pass on the results unchanged, but this is a necessary step for when we'll later need to aggregate results.
Have you read CONTRIBUTING.md lately? If not, do that first.
I, the developer opening this PR, do solemnly pinky swear that:
In all cases: