Testing create-bee failures

broadinstitute · Jun 5, 2024 · daaecca · daaecca
1 parent 4e7b4b2
commit daaecca
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/main/resources/sam.conf b/src/main/resources/sam.conf
@@ -184,7 +184,7 @@ admin {
 azureServices {
   azureEnabled = ${?AZURE_ENABLED}
   allowManagedIdentityUserCreation = ${?AZURE_ALLOW_MANAGED_IDENTITY_USER_CREATION}
-  azureServiceCatalogAppsEnabled = ${?AZURE_SERVICE_CATALOG_APPS_ENABLED}
+
   authorizedUserKey = "authorizedTerraUser";
   managedAppTypeServiceCatalog = "ServiceCatalog";
   managedAppWorkloadClientId = ${?AZURE_MANAGED_APP_WORKLOAD_CLIENT_ID}

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/config/AppConfig.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/config/AppConfig.scala
@@ -174,7 +174,7 @@ object AppConfig {
         if (azureEnabled) {
           Option(
             AzureServicesConfig(
-              config.getBoolean("azureServiceCatalogAppsEnabled"),
+              // config.getBoolean("azureServiceCatalogAppsEnabled"),
               config.getString("authorizedUserKey"),
               config.getString("managedAppTypeServiceCatalog"),
               config.getString("managedAppWorkloadClientId"),

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/config/AzureServicesConfig.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/config/AzureServicesConfig.scala
@@ -3,7 +3,7 @@ package org.broadinstitute.dsde.workbench.sam.config
 final case class ManagedAppPlan(name: String, publisher: String, authorizedUserKey: String) {}
 
 final case class AzureServicesConfig(
-    azureServiceCatalogAppsEnabled: Boolean,
+    // azureServiceCatalogAppsEnabled: Boolean,
     authorizedUserKey: String,
     managedAppTypeServiceCatalog: String,
     managedAppWorkloadClientId: String,

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
@@ -209,7 +209,7 @@ object TestSamRoutes {
     val mockStatusService = new StatusService(directoryDAO, cloudXtns)
     val defaultManagedAppPlan: ManagedAppPlan = ManagedAppPlan("mock-plan", "mock-publisher", "mock-auth-user-key")
     val mockAzureServicesConfig = AzureServicesConfig(
-      azureServiceCatalogAppsEnabled = false,
+      // azureServiceCatalogAppsEnabled = false,
       "mock-auth-user-key",
       "mock-kind",
       "mock-managedapp-workload-clientid",

diff --git a/...scala/org/broadinstitute/dsde/workbench/sam/service/UserServiceSpecs/CreateUserSpec.scala b/...scala/org/broadinstitute/dsde/workbench/sam/service/UserServiceSpecs/CreateUserSpec.scala
@@ -81,7 +81,7 @@ class CreateUserSpec extends UserServiceTestTraits {
             cloudExtensions,
             Seq.empty,
             defaultTosService,
-            Some(AzureServicesConfig(azureServiceCatalogAppsEnabled = false, "", "", "", "", "", "", Seq.empty, allowManagedIdentityUserCreation = true))
+            Some(AzureServicesConfig("", "", "", "", "", "", Seq.empty, allowManagedIdentityUserCreation = true))
           )
 
         // Act
@@ -295,7 +295,7 @@ class CreateUserSpec extends UserServiceTestTraits {
             cloudExtensions,
             Seq.empty,
             defaultTosService,
-            Some(AzureServicesConfig(azureServiceCatalogAppsEnabled = false, "", "", "", "", "", "", Seq.empty, allowManagedIdentityUserCreation = false))
+            Some(AzureServicesConfig("", "", "", "", "", "", Seq.empty, allowManagedIdentityUserCreation = false))
           )
 
         // Act and Assert