Skip to content

CORE-308: reuse okhttp client for Leo DAO #3235

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 26, 2025
Merged

CORE-308: reuse okhttp client for Leo DAO #3235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions core/src/main/scala/org/broadinstitute/dsde/rawls/dataaccess/HttpLeonardoDAO.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.broadinstitute.dsde.rawls.dataaccess

import okhttp3.{Dispatcher, Protocol}
import org.broadinstitute.dsde.rawls.config.LeonardoConfig
import org.broadinstitute.dsde.rawls.model.GoogleProjectId
import org.broadinstitute.dsde.workbench.client.leonardo.ApiClient
Expand All @@ -11,24 +12,34 @@ import scala.jdk.CollectionConverters._

class HttpLeonardoDAO(leonardoConfig: LeonardoConfig) extends LeonardoDAO {

private val okHttpClient = {
val dispatcher = new Dispatcher()
new ApiClient().getHttpClient.newBuilder
.protocols(Seq(Protocol.HTTP_1_1).asJava)
.dispatcher(dispatcher)
.build()
}

protected def getApiClient(accessToken: String): ApiClient = {
val leoApiClient = new ApiClient(okHttpClient)
leoApiClient.setBasePath(leonardoConfig.baseUrl)
leoApiClient.setAccessToken(accessToken)

leoApiClient
}

private def getAppsV2LeonardoApi(accessToken: String): AppsApi = {
val apiClient = new ApiClient()
apiClient.setAccessToken(accessToken)
apiClient.setBasePath(leonardoConfig.baseUrl)
val apiClient = getApiClient(accessToken)
new AppsApi(apiClient)
}

private def getResourcesLeonardoApi(accessToken: String) = {
val apiClient = new ApiClient()
apiClient.setAccessToken(accessToken)
apiClient.setBasePath(leonardoConfig.baseUrl)
val apiClient = getApiClient(accessToken)
new ResourcesApi(apiClient)
}

private def getRuntimesV2LeonardoApi(accessToken: String): RuntimesApi = {
val apiClient = new ApiClient()
apiClient.setAccessToken(accessToken)
apiClient.setBasePath(leonardoConfig.baseUrl)
val apiClient = getApiClient(accessToken)
new RuntimesApi(apiClient)
}
override def deleteApps(token: String, workspaceId: UUID, deleteDisk: Boolean) =
Expand Down
Loading