Address pr comments

DataBiosphere · Jan 28, 2025 · a209d3e · a209d3e
1 parent 9f228c7
commit a209d3e
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 14 deletions.
diff --git a/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellAppInstall.scala b/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellAppInstall.scala
@@ -8,7 +8,11 @@ import org.broadinstitute.dsde.workbench.leonardo.app.AppInstall.getAzureDatabas
 import org.broadinstitute.dsde.workbench.leonardo.{AppContext, WsmControlledDatabaseResource}
 import org.broadinstitute.dsde.workbench.leonardo.app.Database.ControlledDatabase
 import org.broadinstitute.dsde.workbench.leonardo.auth.SamAuthProvider
-import org.broadinstitute.dsde.workbench.leonardo.config.{AzureEnvironmentConverter, CoaAppConfig}
+import org.broadinstitute.dsde.workbench.leonardo.config.{
+  AzureEnvironmentConverter,
+  AzureHostingModeConfig,
+  CoaAppConfig
+}
 import org.broadinstitute.dsde.workbench.leonardo.dao._
 import org.broadinstitute.dsde.workbench.leonardo.http._
 import org.broadinstitute.dsde.workbench.leonardo.util.AppCreationException
@@ -71,7 +75,15 @@ class CromwellAppInstall[F[_]](config: CoaAppConfig,
 
     // Get the pet userToken
     tokenOpt <- samDao.getCachedArbitraryPetAccessToken(params.app.auditInfo.creator)
-    userToken <- F.pure(tokenOpt.getOrElse("")) // Empty token when running on Azure.
+    userToken <- ConfigReader.appConfig.azure.hostingModeConfig.enabled match {
+      case false =>
+        F.fromOption(
+          tokenOpt,
+          AppCreationException(s"Pet not found for user ${params.app.auditInfo.creator}", Some(ctx.traceId))
+        )
+      case true =>
+        F.pure("") // No pet user token in Azure.
+    }
 
     values = List(
       // azure resources configs

diff --git a/.../main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstall.scala b/.../main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstall.scala
@@ -96,7 +96,15 @@ class CromwellRunnerAppInstall[F[_]](config: CromwellRunnerAppConfig,
 
       // Get the pet userToken
       tokenOpt <- samDao.getCachedArbitraryPetAccessToken(params.app.auditInfo.creator)
-      userToken <- F.pure(tokenOpt.getOrElse("")) // Empty token when running on Azure.
+      userToken <- ConfigReader.appConfig.azure.hostingModeConfig.enabled match {
+        case false =>
+          F.fromOption(
+            tokenOpt,
+            AppCreationException(s"Pet not found for user ${params.app.auditInfo.creator}", Some(ctx.traceId))
+          )
+        case true =>
+          F.pure("") // No pet user token in Azure.
+      }
 
       values = List(
         // azure resources configs

diff --git a/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/WdsAppInstall.scala b/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/WdsAppInstall.scala
@@ -62,7 +62,15 @@ class WdsAppInstall[F[_]](config: WdsAppConfig,
 
       // Get the pet userToken
       tokenOpt <- samDao.getCachedArbitraryPetAccessToken(params.app.auditInfo.creator)
-      userToken <- F.pure(tokenOpt.getOrElse("")) // Empty token when running on Azure.
+      userToken <- ConfigReader.appConfig.azure.hostingModeConfig.enabled match {
+        case false =>
+          F.fromOption(
+            tokenOpt,
+            AppCreationException(s"Pet not found for user ${params.app.auditInfo.creator}", Some(ctx.traceId))
+          )
+        case true =>
+          F.pure("") // No pet user token in Azure.
+      }
 
       valuesList =
         List(

diff --git a/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/WorkflowsAppInstall.scala b/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/WorkflowsAppInstall.scala
@@ -69,7 +69,15 @@ class WorkflowsAppInstall[F[_]](config: WorkflowsAppConfig,
 
       // Get the pet userToken
       tokenOpt <- samDao.getCachedArbitraryPetAccessToken(params.app.auditInfo.creator)
-      userToken <- F.pure(tokenOpt.getOrElse("")) // Empty token when running on Azure.
+      userToken <- ConfigReader.appConfig.azure.hostingModeConfig.enabled match {
+        case false =>
+          F.fromOption(
+            tokenOpt,
+            AppCreationException(s"Pet not found for user ${params.app.auditInfo.creator}", Some(ctx.traceId))
+          )
+        case true =>
+          F.pure("") // No pet user token in Azure.
+      }
 
       values =
         List(

diff --git a/...n/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/LeoAppServiceInterp.scala b/...n/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/LeoAppServiceInterp.scala
@@ -163,6 +163,7 @@ final class LeoAppServiceInterp[F[_]: Parallel](config: AppServiceConfig,
       // Retrieve parent workspaceId for the google project
       parentWorkspaceId <- samService.lookupWorkspaceParentForGoogleProject(userInfo.accessToken.token, googleProject)
 
+      // Leo email used to give permissions when running in Azure.
       leoToken <- authProvider.getLeoAuthToken
       leoEmail <- samService.getUserEmail(leoToken)
       notifySamAndCreate = for {

diff --git a/...src/main/scala/org/broadinstitute/dsde/workbench/leonardo/monitor/LeoMetricsMonitor.scala b/...src/main/scala/org/broadinstitute/dsde/workbench/leonardo/monitor/LeoMetricsMonitor.scala
@@ -167,11 +167,22 @@ class LeoMetricsMonitor[F[_]](config: LeoMetricsMonitorConfig,
               appDAO.isProxyAvailable(project, app.appName, serviceName, ctx.traceId)
             case CloudContext.Azure(_) =>
               for {
-                tokenOpt <- samDAO.getCachedArbitraryPetAccessToken(app.auditInfo.creator)
-                token <- F.fromOption(
-                  tokenOpt,
-                  AppCreationException(s"Pet not found for user ${app.auditInfo.creator}", Some(ctx.traceId))
-                )
+                token <- ConfigReader.appConfig.azure.hostingModeConfig.enabled match {
+                  case false =>
+                    for {
+                      tokenOpt <- samDAO.getCachedArbitraryPetAccessToken(app.auditInfo.creator)
+                      token <- F.fromOption(
+                        tokenOpt,
+                        AppCreationException(s"Pet not found for user ${app.auditInfo.creator}", Some(ctx.traceId))
+                      )
+                    } yield token
+                  case true =>
+                    for {
+                      leoAuth <- samDAO.getLeoAuthToken
+                      token = leoAuth.credentials.toString().split(" ")(1)
+                    } yield token
+                }
+
                 authHeader = Authorization(Credentials.Token(AuthScheme.Bearer, token))
                 relayPath = Uri
                   .unsafeFromString(baseUri.asString) / s"${app.appName.value}-${app.workspaceId.map(_.value.toString).getOrElse("")}"

diff --git a/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/monitor/MonitorAtBoot.scala b/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/monitor/MonitorAtBoot.scala
@@ -18,6 +18,7 @@ import org.broadinstitute.dsde.workbench.leonardo.monitor.LeoPubsubMessage.{
   DeleteAppMessage,
   DeleteAppV2Message
 }
+import org.broadinstitute.dsde.workbench.leonardo.util.AppCreationException
 import org.broadinstitute.dsde.workbench.model.{TraceId, WorkbenchEmail}
 import org.broadinstitute.dsde.workbench.openTelemetry.OpenTelemetryMetrics
 import org.typelevel.log4cats.Logger
@@ -222,8 +223,7 @@ class MonitorAtBoot[F[_]](publisherQueue: Queue[F, LeoPubsubMessage],
                       appContext.traceId
                     )
                   )
-                  leoAuth <- samDAO.getLeoAuthToken
-                  token = leoAuth.credentials.toString().split(" ")(1)
+                  token <- getAuthToken(app.auditInfo.creator)
                   workspaceDescOpt <- wsmClientProvider.getWorkspace(
                     token,
                     workspaceId
@@ -266,8 +266,7 @@ class MonitorAtBoot[F[_]](publisherQueue: Queue[F, LeoPubsubMessage],
                                               appContext.traceId
                                             )
                 )
-                leoAuth <- samDAO.getLeoAuthToken
-                token = leoAuth.credentials.toString().split(" ")(1)
+                token <- getAuthToken(app.auditInfo.creator)
                 workspaceDescOpt <- wsmClientProvider.getWorkspace(
                   token,
                   workspaceId
@@ -443,6 +442,26 @@ class MonitorAtBoot[F[_]](publisherQueue: Queue[F, LeoPubsubMessage],
         )
       case x => F.raiseError(MonitorAtBootException(s"Unexpected status for runtime ${runtime.id}: ${x}", traceId))
     }
+
+  private def getAuthToken(creator: WorkbenchEmail)(implicit
+    ev: Ask[F, TraceId]
+  ): F[String] =
+    ConfigReader.appConfig.azure.hostingModeConfig.enabled match {
+      case false =>
+        for {
+          traceId <- ev.ask
+          tokenOpt <- samDAO.getCachedArbitraryPetAccessToken(creator)
+          token <- F.fromOption(
+            tokenOpt,
+            MonitorAtBootException(s"Pet not found for user ${creator}", traceId)
+          )
+        } yield token
+      case true =>
+        for {
+          leoAuth <- samDAO.getLeoAuthToken
+          token = leoAuth.credentials.toString().split(" ")(1)
+        } yield token
+    }
 }
 
 final case class RuntimeToMonitor(