cleanup

broadinstitute · Nov 14, 2024 · c52fbd6 · c52fbd6
1 parent 67026ef
commit c52fbd6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/core/src/main/scala/org/broadinstitute/dsde/rawls/fastpass/FastPassServiceImpl.scala b/core/src/main/scala/org/broadinstitute/dsde/rawls/fastpass/FastPassServiceImpl.scala
@@ -527,12 +527,9 @@ class FastPassServiceImpl(protected val ctx: RawlsRequestContext,
                                 organizationRoles: Set[String],
                                 expiration: OffsetDateTime
   )(implicit dataAccess: DataAccess): ReadWriteAction[Unit] = {
-    val rolesToWrite =
-      (userAndPets.petEmails.map((_, IamMemberTypes.ServiceAccount)).toSeq :+ (userAndPets.userEmail,
-                                                                               userAndPets.userType
-      )).flatMap { case (email, memberType) =>
-        organizationRoles.map(r => (email, memberType, r))
-      }
+    val rolesToWrite = userAndPets.toSeq.flatMap { case (email, memberType) =>
+      organizationRoles.map(r => (email, memberType, r))
+    }
     DBIO.seq(rolesToWrite.map { case (email, memberType, role) =>
       val fastPassGrant = FastPassGrant.newFastPassGrant(
         workspaceId,

diff --git a/core/src/test/scala/org/broadinstitute/dsde/rawls/fastpass/FastPassServiceSpec.scala b/core/src/test/scala/org/broadinstitute/dsde/rawls/fastpass/FastPassServiceSpec.scala
@@ -693,8 +693,7 @@ class FastPassServiceSpec
       ArgumentMatchers.eq(IamMemberTypes.ServiceAccount),
       ArgumentMatchers.eq(Set(services.terraBucketWriterRole)),
       ArgumentMatchers.eq(false),
-      ArgumentMatchers.eq(Some(GoogleProject(testData.workspace.googleProjectId.value))
-      )
+      ArgumentMatchers.eq(Some(GoogleProject(testData.workspace.googleProjectId.value)))
     )
   }