CORE-69: Minor and patch updates - billing-profile-manager-client to …

…0.1.602-SNAPSHOT - sentry-logback to 7.20.1 - mysql-connector-j to 9.2.0 - cats-core to 2.13.0 - scalafmt-core to 3.8.6 (#3174) * CORE-69: Update billing-profile-manager-client from 0.1.600-SNAPSHOT to 0.1.602-SNAPSHOT * CORE-69: Update mysql-connector-j from 9.1.0 to 9.2.0 * CORE-69: Update sentry-logback from 7.20.0 to 7.20.1 * CORE-69: Update scalafmt-core from 3.8.5 to 3.8.6 * Reformat with scalafmt 3.8.6 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.8.6' to .git-blame-ignore-revs * CORE-69: Update cats-core from 2.12.0 to 2.13.0
broadinstitute · Jan 27, 2025 · badb0c6 · badb0c6
1 parent 5d63e1d
commit badb0c6
Show file tree

Hide file tree

Showing 23 changed files with 113 additions and 200 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -35,3 +35,6 @@ f5916aefb603a97498617785baa46bf5cf9e3164
 
 # Scala Steward: Reformat with scalafmt 3.8.4
 1381b307683c6b0a9db4e2fe94a5819b520d7253
+
+# Scala Steward: Reformat with scalafmt 3.8.6
+00ab6a6678505b83488ace234e7b98c855b0e19a
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.8.5
+version = 3.8.6
 align = none
 align.openParenCallSite = true
 align.openParenDefnSite = true

diff --git a/...src/test/scala/org/broadinstitute/dsde/rawls/dataaccess/HttpExecutionServiceDAOSpec.scala b/...src/test/scala/org/broadinstitute/dsde/rawls/dataaccess/HttpExecutionServiceDAOSpec.scala
@@ -63,7 +63,7 @@ class HttpExecutionServiceDAOSpec
     super.afterAll()
   }
 
-  "HttpExecutionServiceDAO" should "submit workflows" in {
+  "HttpExecutionServiceDAO" should "submit workflows" in
     withStatsD {
       val submitResult =
         test.submitWorkflows(WdlSource("wdl"), Seq("input1", "input2"), None, None, None, userInfo).futureValue
@@ -83,9 +83,8 @@ class HttpExecutionServiceDAOSpec
                                                                                Option(Subsystems.Cromwell)
       ))
     }
-  }
 
-  it should "query for status" in {
+  it should "query for status" in
     withStatsD {
       val result = test.status("foo", userInfo).futureValue
       result.status shouldBe "Running"
@@ -97,9 +96,8 @@ class HttpExecutionServiceDAOSpec
                                                                                Option(Subsystems.Cromwell)
       ))
     }
-  }
 
-  it should "query for metadata" in {
+  it should "query for metadata" in
     withStatsD {
       val result =
         test.callLevelMetadata("8afafe21-2b70-4180-a565-748cb573e10c", MetadataParams(), userInfo).futureValue
@@ -112,9 +110,8 @@ class HttpExecutionServiceDAOSpec
                                                                                Option(Subsystems.Cromwell)
       ))
     }
-  }
 
-  it should "query for outputs" in {
+  it should "query for outputs" in
     withStatsD {
       val result = test.outputs("69d1d92f-3895-4a7b-880a-82535e9a096e", userInfo).futureValue
       result.id shouldBe "this_workflow_exists"
@@ -127,9 +124,8 @@ class HttpExecutionServiceDAOSpec
                                                                                Option(Subsystems.Cromwell)
       ))
     }
-  }
 
-  it should "query for logs" in {
+  it should "query for logs" in
     withStatsD {
       val result = test.logs("8afafe21-2b70-4180-a565-748cb573e10c", userInfo).futureValue
       result.id shouldBe "8afafe21-2b70-4180-a565-748cb573e10c"
@@ -142,9 +138,8 @@ class HttpExecutionServiceDAOSpec
                                                                                Option(Subsystems.Cromwell)
       ))
     }
-  }
 
-  it should "abort workflows" in {
+  it should "abort workflows" in
     withStatsD {
       val result = test.abort("workflowA", userInfo).futureValue
       result.isSuccess shouldBe true
@@ -158,9 +153,8 @@ class HttpExecutionServiceDAOSpec
                                                                                Option(Subsystems.Cromwell)
       ))
     }
-  }
 
-  it should "get labels and patch labels" in {
+  it should "get labels and patch labels" in
     withStatsD {
       val labels = Map("key1" -> "val1", "key2" -> "val2")
 
@@ -177,7 +171,6 @@ class HttpExecutionServiceDAOSpec
           expectedHttpRequestMetrics("patch", "api.workflows.v1.redacted.labels", 200, 1, Option(Subsystems.Cromwell))
       )
     }
-  }
 
   it should "get the version" in
     withStatsD {

diff --git a/...broadinstitute/dsde/rawls/entities/datarepo/DataRepoEntityProviderQueryEntitiesSpec.scala b/...broadinstitute/dsde/rawls/entities/datarepo/DataRepoEntityProviderQueryEntitiesSpec.scala
@@ -236,11 +236,10 @@ class DataRepoEntityProviderQueryEntitiesSpec
     assertResult("term filtering not supported by this provider.")(ex.getMessage)
   }
 
-  ignore should "fail if user is a workspace Reader but did not specify a billing project (canCompute?)" in {
+  ignore should "fail if user is a workspace Reader but did not specify a billing project (canCompute?)" in
     // we haven't implemented the runtime logic for this because we don't have PO input,
     // so we don't know exactly what to unit test
     fail("not implemented in runtime code yet")
-  }
 
   it should "fail if snapshot has no tables in data repo" in {
     val provider = createTestProvider(snapshotModel = createSnapshotModel(List.empty[TableModel]))

diff --git a/...st/scala/org/broadinstitute/dsde/rawls/entities/datarepo/DataRepoEntityProviderSpec.scala b/...st/scala/org/broadinstitute/dsde/rawls/entities/datarepo/DataRepoEntityProviderSpec.scala
@@ -182,11 +182,10 @@ class DataRepoEntityProviderSpec
     }
   }
 
-  ignore should "fail if user is a workspace Reader but did not specify a billing project (canCompute?)" in {
+  ignore should "fail if user is a workspace Reader but did not specify a billing project (canCompute?)" in
     // we haven't implemented the runtime logic for this because we don't have PO input,
     // so we don't know exactly what to unit test
     fail("not implemented in runtime code yet")
-  }
 
   it should "fail if snapshot table not found in data repo's response" in {
     val provider = createTestProvider() // default behavior returns three rows

diff --git a/core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/SubmissionMonitorSpec.scala b/core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/SubmissionMonitorSpec.scala
@@ -1735,7 +1735,7 @@ class SubmissionMonitorSpec(_system: ActorSystem)
     }
   }
 
-  it should "handleStatusResponses and fail workflows that have invalid output expressions" in {
+  it should "handleStatusResponses and fail workflows that have invalid output expressions" in
     withDefaultTestDatabase { dataSource: SlickDataSource =>
       runAndWait {
         withWorkspaceContext(testData.workspace) { context =>
@@ -1797,7 +1797,6 @@ class SubmissionMonitorSpec(_system: ActorSystem)
         ).get.status
       }
     }
-  }
 
   it should "fail workflows that exceed the configured workspace attribute maximum" in withDefaultTestDatabase {
     dataSource: SlickDataSource =>

diff --git a/core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/SubmissionSpec.scala b/core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/SubmissionSpec.scala
@@ -1100,7 +1100,7 @@ class SubmissionSpec(_system: ActorSystem)
     )
   }
 
-  it should "set the correct root path for a submission given the SeparateSubmissionFinalOutputsSetting is true" in {
+  it should "set the correct root path for a submission given the SeparateSubmissionFinalOutputsSetting is true" in
     workspaceSettingSubmissionTest(SeparateSubmissionFinalOutputs = true) { submissionsService =>
       val submissionRq = SubmissionRequest(
         methodConfigurationNamespace = "dsde",
@@ -1119,9 +1119,8 @@ class SubmissionSpec(_system: ActorSystem)
 
       submissionData.submissionRoot should include("intermediates")
     }
-  }
 
-  it should "set the correct root path for a submission given the SeparateSubmissionFinalOutputsSetting is false" in {
+  it should "set the correct root path for a submission given the SeparateSubmissionFinalOutputsSetting is false" in
     workspaceSettingSubmissionTest(SeparateSubmissionFinalOutputs = false) { submissionsService =>
       val submissionRq = SubmissionRequest(
         methodConfigurationNamespace = "dsde",
@@ -1140,7 +1139,6 @@ class SubmissionSpec(_system: ActorSystem)
 
       submissionData.submissionRoot should not include "intermediates"
     }
-  }
 
   it should "create data repo submission" in {
     val tableData = List.fill(3)(UUID.randomUUID().toString).map(rowId => rowId -> s"value $rowId").toMap
@@ -1539,7 +1537,7 @@ class SubmissionSpec(_system: ActorSystem)
     }
   }
 
-  it should "report error when data reference exists with entity name" in {
+  it should "report error when data reference exists with entity name" in
     dataRepoSubmissionTest(Map.empty) { (submissionsService, methodConfig, snapshotId) =>
       val submissionRq = SubmissionRequest(
         methodConfigurationNamespace = methodConfig.namespace,
@@ -1558,9 +1556,8 @@ class SubmissionSpec(_system: ActorSystem)
       ex.errorReport.causes should have length 1
       ex.errorReport.causes.head.message shouldBe "Your method config defines a data reference and an entity name. Running on a submission on a single entity in a data reference is not yet supported."
     }
-  }
 
-  it should "report error when data reference points to unknown snapshot" in {
+  it should "report error when data reference points to unknown snapshot" in
     dataRepoSubmissionTest(Map.empty) { (submissionsService, methodConfig, snapshotId) =>
       runAndWait(
         methodConfigurationQuery.upsert(minimalTestData.workspace,
@@ -1584,7 +1581,6 @@ class SubmissionSpec(_system: ActorSystem)
       ex.errorReport.statusCode shouldBe Option(StatusCodes.NotFound)
       ex.errorReport.message shouldBe "Reference name unknown does not exist in workspace myNamespace/myWorkspace."
     }
-  }
 
   it should "report error when root entity type does not refer to a table in the snapshot" in
     dataRepoSubmissionTest(Map.empty) { (submissionsService, methodConfig, snapshotId) =>

diff --git a/...t/scala/org/broadinstitute/dsde/rawls/monitor/CloneWorkspaceFileTransferMonitorSpec.scala b/...t/scala/org/broadinstitute/dsde/rawls/monitor/CloneWorkspaceFileTransferMonitorSpec.scala
@@ -52,7 +52,7 @@ class CloneWorkspaceFileTransferMonitorSpec(_system: ActorSystem)
   ) =
     system.actorOf(CloneWorkspaceFileTransferMonitor.props(dataSource, mockGcsDAO, 1 second, 1 second))
 
-  "CloneWorkspaceFileTransferMonitor" should "eventually copy files from the source bucket to the destination bucket" in {
+  "CloneWorkspaceFileTransferMonitor" should "eventually copy files from the source bucket to the destination bucket" in
     withEmptyTestDatabase { dataSource: SlickDataSource =>
       val billingProject = RawlsBillingProject(defaultBillingProjectName,
                                                CreationStatuses.Ready,
@@ -148,9 +148,8 @@ class CloneWorkspaceFileTransferMonitorSpec(_system: ActorSystem)
 
       system.stop(actor)
     }
-  }
 
-  it should "continue trying to transfer files when receiving 403s from Google while listing objects" in {
+  it should "continue trying to transfer files when receiving 403s from Google while listing objects" in
     withEmptyTestDatabase { dataSource: SlickDataSource =>
       val billingProject = RawlsBillingProject(defaultBillingProjectName,
                                                CreationStatuses.Ready,
@@ -237,9 +236,8 @@ class CloneWorkspaceFileTransferMonitorSpec(_system: ActorSystem)
 
       system.stop(actor)
     }
-  }
 
-  it should "continue trying to transfer files when receiving 403s from Google while copying objects" in {
+  it should "continue trying to transfer files when receiving 403s from Google while copying objects" in
     withEmptyTestDatabase { dataSource: SlickDataSource =>
       val billingProject = RawlsBillingProject(defaultBillingProjectName,
                                                CreationStatuses.Ready,
@@ -338,7 +336,6 @@ class CloneWorkspaceFileTransferMonitorSpec(_system: ActorSystem)
 
       system.stop(actor)
     }
-  }
 
   it should "continue trying to copy the files until all copies succeed" in {
     withEmptyTestDatabase { dataSource: SlickDataSource =>

diff --git a/core/src/test/scala/org/broadinstitute/dsde/rawls/monitor/HealthMonitorSpec.scala b/core/src/test/scala/org/broadinstitute/dsde/rawls/monitor/HealthMonitorSpec.scala
@@ -58,9 +58,8 @@ class HealthMonitorSpec
     sub -> SubsystemStatus(false, Option(List(s"""{"$sub": "is unhappy"}""")))
   }).toMap
 
-  "HealthMonitor" should "start with unknown status for all subsystems" in {
+  "HealthMonitor" should "start with unknown status for all subsystems" in
     checkCurrentStatus(newHealthMonitorActor(), false, unknowns = AllSubsystems)
-  }
 
   it should "return ok status for all subsystems" in {
     val actor = newHealthMonitorActor()

diff --git a/core/src/test/scala/org/broadinstitute/dsde/rawls/submissions/SubmissionValidationSpec.scala b/core/src/test/scala/org/broadinstitute/dsde/rawls/submissions/SubmissionValidationSpec.scala
@@ -43,7 +43,7 @@ class SubmissionValidationSpec extends AnyFlatSpec with Matchers with TableDrive
     )
   )
 
-  it should "validate perWorkflowCostCap" in {
+  it should "validate perWorkflowCostCap" in
     forAll(perWorkflowCostCapValidations) { (_, value, expectedErrors) =>
       val submission =
         SubmissionRequest("name", "namespace", None, None, None, false, false, perWorkflowCostCap = value)
@@ -62,9 +62,8 @@ class SubmissionValidationSpec extends AnyFlatSpec with Matchers with TableDrive
         }
       }
     }
-  }
 
-  it should "validate workflowFailureMode" in {
+  it should "validate workflowFailureMode" in
     forAll(
       Table(
         ("WorkflowFailureMode value", "valid value"),
@@ -95,7 +94,6 @@ class SubmissionValidationSpec extends AnyFlatSpec with Matchers with TableDrive
         errors.head.message should include(workflowFailureMode.getOrElse("None"))
       }
     }
-  }
 
   behavior of "entity name and type validation"