From 9586b1826f20210feacfe27c471409bc2ce51c2f Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Thu, 5 Sep 2024 17:16:35 -0400 Subject: [PATCH] WX-1840 Pause intermediates/final separation (#3017) --- .../dsde/rawls/jobexec/WorkflowSubmissionActor.scala | 5 +++-- .../dsde/rawls/submissions/SubmissionsService.scala | 3 ++- .../dsde/rawls/jobexec/WorkflowSubmissionSpec.scala | 4 ++-- .../dsde/rawls/model/ExecutionModelSpec.scala | 8 ++------ .../dsde/rawls/webservice/SubmissionApiServiceSpec.scala | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/core/src/main/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionActor.scala b/core/src/main/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionActor.scala index 546fb04056..cf9748d084 100644 --- a/core/src/main/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionActor.scala +++ b/core/src/main/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionActor.scala @@ -284,8 +284,9 @@ trait WorkflowSubmission extends FutureSupport with LazyLogging with MethodWiths // Intermediate/final output separation: location 2/2 (SU-166, WX-1702) // Final outputs are moved to the directory specified // Cromwell `/outputs` endpoint and Terra data table use this location - Option(s"gs://${workspace.bucketName}/submissions/final-outputs/${submission.id}"), - Option("move"), + // Temporarily paused as of 2024-09-05 + None, + None, workspace.googleProjectId, userEmail.value, petSAEmail, diff --git a/core/src/main/scala/org/broadinstitute/dsde/rawls/submissions/SubmissionsService.scala b/core/src/main/scala/org/broadinstitute/dsde/rawls/submissions/SubmissionsService.scala index 245fceee95..c6d208c53a 100644 --- a/core/src/main/scala/org/broadinstitute/dsde/rawls/submissions/SubmissionsService.scala +++ b/core/src/main/scala/org/broadinstitute/dsde/rawls/submissions/SubmissionsService.scala @@ -163,7 +163,8 @@ object SubmissionsService { // Intermediate/final output separation: location 1/2 (SU-166, WX-1702) // All intermediate files including logs live here. // UI links to execution directory point here. - s"gs://${workspace.bucketName}/submissions/intermediates/$id" + // Temporarily paused as of 2024-09-05 + s"gs://${workspace.bucketName}/submissions/$id" } class SubmissionsService( diff --git a/core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionSpec.scala b/core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionSpec.scala index 7b39dec130..666e4b1953 100644 --- a/core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionSpec.scala +++ b/core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionSpec.scala @@ -376,8 +376,8 @@ class WorkflowSubmissionSpec(_system: ActorSystem) Some( ExecutionServiceWorkflowOptions( jes_gcs_root = s"gs://${testData.workspace.bucketName}/${testData.submission1.submissionId}", - Some(s"gs://${testData.workspace.bucketName}/submissions/final-outputs/${testData.submission1.submissionId}"), - Some("move"), + None, + None, google_project = testData.workspace.googleProjectId.value, account_name = testData.userOwner.userEmail.value, google_compute_service_account = "pet-110347448408766049948@broad-dsde-dev.iam.gserviceaccount.com", diff --git a/core/src/test/scala/org/broadinstitute/dsde/rawls/model/ExecutionModelSpec.scala b/core/src/test/scala/org/broadinstitute/dsde/rawls/model/ExecutionModelSpec.scala index c357be46b9..2516208256 100644 --- a/core/src/test/scala/org/broadinstitute/dsde/rawls/model/ExecutionModelSpec.scala +++ b/core/src/test/scala/org/broadinstitute/dsde/rawls/model/ExecutionModelSpec.scala @@ -126,8 +126,8 @@ class ExecutionModelSpec extends AnyFlatSpec with Matchers { "ExecutionServiceWorkflowOptions" should "serialize/deserialize to/from JSON" in { val test = ExecutionServiceWorkflowOptions( jes_gcs_root = "jes_gcs_root", - final_workflow_outputs_dir = Option("example_final_workflow_outputs_dir"), - final_workflow_outputs_mode = Option("example_final_workflow_outputs_mode"), + final_workflow_outputs_dir = None, + final_workflow_outputs_mode = None, google_project = "google_project", account_name = "account_name", google_compute_service_account = "account@foo.com", @@ -162,8 +162,6 @@ class ExecutionModelSpec extends AnyFlatSpec with Matchers { """ |{ | "jes_gcs_root": "jes_gcs_root", - | "final_workflow_outputs_dir": "example_final_workflow_outputs_dir", - | "final_workflow_outputs_mode": "example_final_workflow_outputs_mode", | "google_project": "google_project", | "account_name": "account_name", | "google_compute_service_account": "account@foo.com", @@ -194,8 +192,6 @@ class ExecutionModelSpec extends AnyFlatSpec with Matchers { """ |{ | "jes_gcs_root": "jes_gcs_root", - | "final_workflow_outputs_dir": "example_final_workflow_outputs_dir", - | "final_workflow_outputs_mode": "example_final_workflow_outputs_mode", | "google_project": "google_project", | "account_name": "account_name", | "google_compute_service_account": "account@foo.com", diff --git a/core/src/test/scala/org/broadinstitute/dsde/rawls/webservice/SubmissionApiServiceSpec.scala b/core/src/test/scala/org/broadinstitute/dsde/rawls/webservice/SubmissionApiServiceSpec.scala index d3d023e2a5..b15aa87aa6 100644 --- a/core/src/test/scala/org/broadinstitute/dsde/rawls/webservice/SubmissionApiServiceSpec.scala +++ b/core/src/test/scala/org/broadinstitute/dsde/rawls/webservice/SubmissionApiServiceSpec.scala @@ -1413,7 +1413,7 @@ class SubmissionApiServiceSpec extends ApiServiceSpec with TableDrivenPropertyCh status } val response = responseAs[Submission] - response.submissionRoot shouldBe s"gs://${testData.workspace.bucketName}/submissions/intermediates/${submission.submissionId}" + response.submissionRoot shouldBe s"gs://${testData.workspace.bucketName}/submissions/${submission.submissionId}" } } }