Testing create-bee failures with azureconfig update

broadinstitute · Jun 6, 2024 · c26da47 · c26da47
1 parent 2513dd7
commit c26da47
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/pact4s/src/test/scala/org/broadinstitute/dsde/workbench/sam/MockTestSupport.scala b/pact4s/src/test/scala/org/broadinstitute/dsde/workbench/sam/MockTestSupport.scala
@@ -65,6 +65,7 @@ object MockTestSupport extends MockTestSupport {
   val googleServicesConfig: GoogleServicesConfig = appConfig.googleConfig.get.googleServicesConfig
   val configResourceTypes: Map[ResourceTypeName, ResourceType] = config.as[Map[String, ResourceType]]("resourceTypes").values.map(rt => rt.name -> rt).toMap
   val adminConfig: AdminConfig = config.as[AdminConfig]("admin")
+  val azureServicesConfig: Option[AzureServicesConfig] = appConfig.azureServicesConfig
   val databaseEnabled: Boolean = config.getBoolean("db.enabled")
   val databaseEnabledClue = "-- skipping tests that talk to a real database"
 
@@ -141,7 +142,11 @@ object MockTestSupport extends MockTestSupport {
     val mockManagedGroupService =
       new ManagedGroupService(mockResourceService, policyEvaluatorService, resourceTypes, policyDAO, directoryDAO, googleExt, "example.com")
     val tosService = new TosService(googleExt, directoryDAO, tosConfig)
-    val azureService = new AzureService(MockCrlService(), directoryDAO, new MockAzureManagedResourceGroupDAO)
+
+    val azureService = azureServicesConfig.map { azureConfig =>
+      new AzureService(azureConfig, MockCrlService(), directoryDAO, new MockAzureManagedResourceGroupDAO)
+    }
+
     MockSamDependencies(
       mockResourceService,
       policyEvaluatorService,
@@ -153,7 +158,7 @@ object MockTestSupport extends MockTestSupport {
       policyDAO,
       googleExt,
       FakeOpenIDConnectConfiguration,
-      azureService
+      azureService:Option[AzureService]
     )
   }
 
@@ -173,7 +178,7 @@ object MockTestSupport extends MockTestSupport {
     samDependencies.tosService,
     LiquibaseConfig("", initWithLiquibase = false),
     samDependencies.oauth2Config,
-    Some(samDependencies.azureService)
+    samDependencies.azureService
   ) with MockSamUserDirectives with GoogleExtensionRoutes {
     override val cloudExtensions: CloudExtensions = samDependencies.cloudExtensions
     override val googleExtensions: GoogleExtensions = samDependencies.cloudExtensions match {
@@ -287,7 +292,7 @@ final case class MockSamDependencies(
     policyDao: AccessPolicyDAO,
     cloudExtensions: CloudExtensions,
     oauth2Config: OpenIDConnectConfiguration,
-    azureService: AzureService
+    azureService: Option[AzureService]
 )
 
 object ConnectedTest extends Tag("connected test")
diff --git a/pact4s/src/test/scala/org/broadinstitute/dsde/workbench/sam/provider/SamProviderSpec.scala b/pact4s/src/test/scala/org/broadinstitute/dsde/workbench/sam/provider/SamProviderSpec.scala
@@ -192,7 +192,7 @@ class SamProviderSpec
       accessPolicyDAO,
       googleExt,
       FakeOpenIDConnectConfiguration,
-      azureService
+      Option(azureService)
     )
 
   override def beforeAll(): Unit = {

diff --git a/src/test/scala/org/broadinstitute/dsde/workbench/sam/api/TestSamRoutes.scala b/src/test/scala/org/broadinstitute/dsde/workbench/sam/api/TestSamRoutes.scala
@@ -109,6 +109,8 @@ class TestSamTosEnabledRoutes(
 
 object TestSamRoutes {
   val defaultUserInfo = Generator.genWorkbenchUserGoogle.sample.get
+  val config = ConfigFactory.load()
+  val appConfig = AppConfig.readConfig(config)
 
   object SamResourceActionPatterns {
     val config = ConfigFactory.load()
@@ -237,7 +239,7 @@ object TestSamRoutes {
       user,
       tosService = mockTosService,
       cloudExtensions = cloudXtns,
-      azureService = Some(azureService)
+      azureService = Option(azureService)
     )
   }
 }