diff --git a/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstall.scala b/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstall.scala index 4394774d687..fd1e36a7632 100644 --- a/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstall.scala +++ b/http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstall.scala @@ -94,7 +94,6 @@ class CromwellRunnerAppInstall[F[_]](config: CromwellRunnerAppConfig, raw"relay.path=${params.relayPath.renderString}", // persistence configs - raw"persistence.storageResourceGroup=${params.cloudContext.managedResourceGroupName.value}", raw"persistence.storageAccount=${params.landingZoneResources.storageAccountName.value}", raw"persistence.blobContainer=${storageContainer.name.value}", raw"persistence.leoAppInstanceName=${params.app.appName.value}", 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 index efe1245e72d..34cfc2b220d 100644 --- 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 @@ -44,11 +44,6 @@ class WorkflowsAppInstall[F[_]](config: WorkflowsAppConfig, for { ctx <- ev.ask - // Resolve batch account in Azure - batchAccount <- azureBatchService.getBatchAccount(params.landingZoneResources.batchAccountName, - params.cloudContext - ) - // Resolve application insights in Azure applicationInsightsComponent <- azureApplicationInsightsService.getApplicationInsights( params.landingZoneResources.applicationInsightsName, @@ -82,27 +77,18 @@ class WorkflowsAppInstall[F[_]](config: WorkflowsAppConfig, values = List( // azure resources configs - raw"config.resourceGroup=${params.cloudContext.managedResourceGroupName.value}", - raw"config.batchAccountKey=${batchAccount.getKeys().primary}", - raw"config.batchAccountName=${params.landingZoneResources.batchAccountName.value}", - raw"config.batchNodesSubnetId=${params.landingZoneResources.batchNodesSubnetName.value}", raw"config.drsUrl=${drsConfig.url}", - raw"config.landingZoneId=${params.landingZoneResources.landingZoneId}", - raw"config.subscriptionId=${params.cloudContext.subscriptionId.value}", - raw"config.region=${params.landingZoneResources.region}", raw"config.applicationInsightsConnectionString=${applicationInsightsComponent.connectionString()}", // relay configs raw"relay.path=${params.relayPath.renderString}", // persistence configs - raw"persistence.storageResourceGroup=${params.cloudContext.managedResourceGroupName.value}", raw"persistence.storageAccount=${params.landingZoneResources.storageAccountName.value}", raw"persistence.blobContainer=${storageContainer.name.value}", raw"persistence.leoAppInstanceName=${params.app.appName.value}", raw"persistence.workspaceManager.url=${params.config.wsmConfig.uri.renderString}", raw"persistence.workspaceManager.workspaceId=${params.workspaceId.value}", - raw"persistence.workspaceManager.containerResourceId=${storageContainer.resourceId.value.toString}", // identity configs raw"workloadIdentity.serviceAccountName=${params.ksaName.value}", diff --git a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstallSpec.scala b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstallSpec.scala index 06b42b4374e..4a4cf924863 100644 --- a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstallSpec.scala +++ b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstallSpec.scala @@ -43,7 +43,6 @@ class CromwellRunnerAppInstallSpec extends BaseAppInstallSpec { s"config.region=${azureRegion}," + "config.applicationInsightsConnectionString=applicationInsightsConnectionString," + "relay.path=https://relay.com/app," + - "persistence.storageResourceGroup=mrg," + "persistence.storageAccount=storage," + "persistence.blobContainer=sc-container," + "persistence.leoAppInstanceName=app1," + diff --git a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/WorkflowsAppInstallSpec.scala b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/WorkflowsAppInstallSpec.scala index 962370f2cd4..9929879e783 100644 --- a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/WorkflowsAppInstallSpec.scala +++ b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/app/WorkflowsAppInstallSpec.scala @@ -32,23 +32,14 @@ class WorkflowsAppInstallSpec extends BaseAppInstallSpec { val overrides = workflowsAppInstall.buildHelmOverrideValues(params) overrides.unsafeRunSync()(cats.effect.unsafe.IORuntime.global).asString shouldBe - "config.resourceGroup=mrg," + - "config.batchAccountKey=batchKey," + - "config.batchAccountName=batch," + - "config.batchNodesSubnetId=subnet1," + s"config.drsUrl=${ConfigReader.appConfig.drs.url}," + - "config.landingZoneId=5c12f64b-f4ac-4be1-ae4a-4cace5de807d," + - "config.subscriptionId=sub," + - s"config.region=${azureRegion}," + "config.applicationInsightsConnectionString=applicationInsightsConnectionString," + "relay.path=https://relay.com/app," + - "persistence.storageResourceGroup=mrg," + "persistence.storageAccount=storage," + "persistence.blobContainer=sc-container," + "persistence.leoAppInstanceName=app1," + s"persistence.workspaceManager.url=${ConfigReader.appConfig.azure.wsm.uri.renderString}," + s"persistence.workspaceManager.workspaceId=${workspaceId.value}," + - s"persistence.workspaceManager.containerResourceId=${storageContainer.resourceId.value.toString}," + "workloadIdentity.serviceAccountName=ksa-1," + "sam.url=https://sam.dsde-dev.broadinstitute.org/," + "leonardo.url=https://leo-dummy-url.org," +