Skip to content

CTM-604: bump workbench-libs, which bumps swagger-ui - #3569

Merged
davidangb merged 5 commits into
developfrom
da_CTM-604_bump_swagger_ui
Jul 29, 2026
Merged

davidangb merged 5 commits into
developfrom
da_CTM-604_bump_swagger_ui

Conversation

@davidangb

@davidangb davidangb commented Jul 27, 2026 •

Copy link
Copy Markdown
Contributor

Ticket: https://broadworkbench.atlassian.net/browse/CTM-604

CTM-601

Bumps to latest version of workbench-libs' oauth2, to take advantage of its bump of swagger-ui. See broadinstitute/workbench-libs#1753.

Net effect is that the swagger-ui used by Rawls goes from 5.17.14 to 5.32.11. which satisfies https://broadworkbench.atlassian.net/browse/CTM-601.

val bigQueryService = mock[GoogleBigQueryService[IO]](RETURNS_SMART_NULLS)
val job = mock[Job]
when(job.getQueryResults(any())).thenReturn(createTableResult(data))
when(job.getQueryResults()).thenReturn(createTableResult(data))

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

the workbench-libs updates also carry a mockito update. This is a necessary change to be compatible with the new mockito.

The runtime code calls getQueryResults() with no arguments. The previous version of mockito matched a no-arg call to an any() call. The newer version of mockito does not match on any(), so these mocks were no longer valid and the tests failed. I'm updating the tests to be more accurate to the runtime call.

val googleApiUri = Uri.unsafeFromString(gcsConfig.getString("google-api-uri"))
val metadataNotificationConfig = NotificationCreaterConfig(pathToCredentialJson, googleApiUri)
BlazeClientBuilder[F].withExecutionContext(executionContext).resource.flatMap { httpClient =>
EmberClientBuilder.default[F].build.flatMap { httpClient =>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

the workbench-libs updates also carry an http4s update. The newer http4s uses EmberClient instead of BlazeClient, so this needs a compatibility fix. The compatibility fix carries over into Boot.scala too.

@davidangb
davidangb marked this pull request as ready for review July 28, 2026 18:10
@davidangb
davidangb merged commit 551dd09 into develop Jul 29, 2026
33 of 34 checks passed
@davidangb
davidangb deleted the da_CTM-604_bump_swagger_ui branch July 29, 2026 14:26
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