ID-1301 talk to ecm for nih username (Round 2) #1407
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…broadinstitute/firecloud-orchestration into tl_ID-1301_talk_to_ecm_for_nih_username
tlangs
commented
Aug 7, 2024
| @@ -112,7 +112,7 @@ start_server () { | |||
| --network=fc-orch \ | |||
| -e JAVA_OPTS="$DOCKER_JAVA_OPTS" \ | |||
| sbtscala/scala-sbt:eclipse-temurin-jammy-17.0.10_7_1.10.1_2.13.14 \ | |||
| sbt \~reStart | |||
| bash -c "git config --global --add safe.directory /app && sbt \~reStart" | |||
There was a problem hiding this comment.
This fixes a
[info] loading settings for project root from build.sbt ...
fatal: detected dubious ownership in repository at '/app'
To add an exception for this directory, call:
git config --global --add safe.directory /app
error
tlangs
commented
Aug 7, 2024
Comment on lines
+17
to
+19
| val excludeSpring = ExclusionRule(organization = "org.springframework") | ||
| val excludeSpringBoot = ExclusionRule(organization = "org.springframework.boot") | ||
| val excludeSpringJcl = ExclusionRule(organization = "org.springframework", name = "spring-jcl") |
There was a problem hiding this comment.
Exclusions to resolve assembly merge clashes, and also to reduce the jar size
tlangs
commented
Aug 7, 2024
| @@ -50,9 +54,11 @@ object Dependencies { | |||
| excludeGuava("org.broadinstitute.dsde.workbench" %% "workbench-util" % s"0.10-$workbenchLibsHash"), | |||
| "org.broadinstitute.dsde.workbench" %% "workbench-google2" % s"0.36-$workbenchLibsHash", | |||
| "org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % s"0.7-$workbenchLibsHash", | |||
| "org.broadinstitute.dsde.workbench" %% "sam-client" % "0.1-ef83073", | |||
| "org.broadinstitute.dsde.workbench" %% "sam-client" % "v0.0.263", | |||
tlangs
commented
Aug 7, 2024
|
|
||
| import scala.concurrent.Future | ||
|
|
||
| class DisabledExternalCredsDAO extends ExternalCredsDAO with LazyLogging { |
There was a problem hiding this comment.
This is needed so that Orch can run in BEEs. In the future, we'll need to get ECM to run in BEEs so that swat tests can pass without Thurloe.
tlangs
commented
Aug 7, 2024
| @@ -50,6 +50,14 @@ class HttpSamDAO( implicit val system: ActorSystem, val materializer: Materializ | |||
| authedRequestToObject[UserIdInfo](Get(samGetUserIdsUrl.format(URLEncoder.encode(email.value, UTF_8.name)))) | |||
| } | |||
|
|
|||
| // Sam's API only allows for 1000 user to be fetched at one time | |||
| override def getUsersForIds(samUserIds: Seq[WorkbenchUserId])(implicit userInfo: WithAccessToken): Future[Seq[WorkbenchUserInfo]] = Future.sequence { | |||
There was a problem hiding this comment.
New Sam API to resolve a list of users from user ids.
Ghost-in-a-Jar
approved these changes
Aug 7, 2024
samanehsan
reviewed
Aug 8, 2024
| @@ -2,6 +2,7 @@ package org.broadinstitute.dsde.firecloud.model | |||
|
|
|||
| import akka.http.scaladsl.model.headers.OAuth2BearerToken | |||
|
|
|||
| import java.time.OffsetDateTime | |||
There was a problem hiding this comment.
Do we still need this import?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://broadworkbench.atlassian.net/browse/ID-1301
First PR caused Dev to be unable to load NIH Account status, so it was reverted. Trying again.
Getting ready for ECM to replace Thurloe for NIH Account linking. For now, we'll need to talk to both, since links last for 30 days. Once everything is deployed to prod and has been out for a while, we should be able to safely delete the Thurloe code.
Have you read CONTRIBUTING.md lately? If not, do that first.
I, the developer opening this PR, do solemnly pinky swear that:
In all cases: