merge conflicts

broadinstitute · Nov 20, 2018 · aa1fe9c · aa1fe9c
1 parent da86abb
commit aa1fe9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/Boot.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/Boot.scala
@@ -85,33 +85,6 @@ object Boot extends IOApp with LazyLogging {
     }
   }
 
-<<<<<<< HEAD
-  private[sam] def createAppDependencies(appConfig: AppConfig, resourceTypeMap: Map[ResourceTypeName, ResourceType])(
-      implicit actorSystem: ActorSystem,
-      materializer: ActorMaterializer): cats.effect.Resource[IO, AppDependencies] =
-    for {
-      ldapConnectionPool <- createLdapConnectionPool(appConfig.directoryConfig)
-      blockingEc <- ExecutionContexts.blockingThreadPool
-      accessPolicyDao = new LdapAccessPolicyDAO(ldapConnectionPool, appConfig.directoryConfig, blockingEc)
-      directoryDAO = new LdapDirectoryDAO(ldapConnectionPool, appConfig.directoryConfig, blockingEc)
-    } yield {
-      val cloudExt: CloudExtensions = appConfig.googleConfig match {
-        case Some(config) => createGoogleCloudExt(accessPolicyDao, directoryDAO, config, resourceTypeMap)
-        case None => NoExtensions
-      }
-      createAppDependencies(
-        appConfig.swaggerConfig,
-        appConfig.emailDomain,
-        resourceTypeMap,
-        cloudExt,
-        accessPolicyDao,
-        directoryDAO
-      )
-    }
-
-  private[sam] def readFile(path: String): cats.effect.Resource[IO, FileInputStream] =
-    cats.effect.Resource.make(IO(new FileInputStream(path)))(inputStream => IO(inputStream.close()))
-
   private[sam] def createLdapConnectionPool(directoryConfig: DirectoryConfig): cats.effect.Resource[IO, LDAPConnectionPool] = {
     val dirURI = new URI(directoryConfig.directoryUrl)
     val (socketFactory, defaultPort) = dirURI.getScheme.toLowerCase match {

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/ManagedGroupRoutes.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/ManagedGroupRoutes.scala
@@ -44,8 +44,7 @@ trait ManagedGroupRoutes extends UserInfoDirectives with SecurityDirectives with
           }
         } ~ path("accessInstructions") {
           put {
-            entity(as[ManagedGroupAccessInstructions]) { accessInstructions =>
-              handleSetAccessInstructions(managedGroup, accessInstructions, userInfo)
+            entity(as[ManagedGroupAccessInstructions]) { accessInstructions => handleSetAccessInstructions(managedGroup, accessInstructions, userInfo)
             }
           } ~ get {
             handleGetAccessInstructions(managedGroup)

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/ResourceRoutes.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/ResourceRoutes.scala
@@ -220,7 +220,8 @@ trait ResourceRoutes extends UserInfoDirectives with SecurityDirectives with Sam
           Set(SamResourceActions.setPublic, SamResourceActions.setPublicPolicy(policyId.accessPolicyName)),
           userInfo.userId
         ) {
-          entity(as[Boolean]) { isPublic => complete(resourceService.setPublic(policyId, isPublic).map(_ => StatusCodes.NoContent))
+          entity(as[Boolean]) { isPublic =>
+            complete(resourceService.setPublic(policyId, isPublic).map(_ => StatusCodes.NoContent))
           }
         }
       }