switch to cost range

centaur/src/main/resources/standardTestCases/recursive_imports_cost.test

@@ -19,4 +19,4 @@ metadata {
   status: Succeeded
 }
 
-cost: 0.0016
+cost: [0.0017, 0.0015]

centaur/src/main/scala/centaur/test/Test.scala

@@ -1061,22 +1061,21 @@ object Operations extends StrictLogging {
         }
     }
 
-  def getExpectedCost(workflowCost: Option[BigDecimal]): IO[BigDecimal] =
+  def getExpectedCost(workflowCost: Option[List[BigDecimal]]): IO[List[BigDecimal]] =
     workflowCost match {
-      case Some(cost) if cost == 0 => IO.raiseError(new Exception("Expected cost cannot be 0"))
+      case Some(cost) if cost(0) > cost(1) => IO.raiseError(new Exception(s"Lower bound of expected cost cannot be higher than the upper bound (${cost(0)} - ${cost(1)})"))
       case Some(cost) => IO.pure(cost)
       case None =>
-        IO.raiseError(new Exception("Expected 'cost' is required in the test config to validate the workflow cost"))
+        IO.raiseError(new Exception("Expected cost range is required in the test config to validate the workflow cost"))
     }
 
   /**
-    * Validate that the actual cost is within 10% of the expected cost
+    * Validate that the actual cost is within the expected range
     */
-  def validateCost(actualCost: BigDecimal, expectedCost: BigDecimal): IO[Unit] = {
-    val costDiff = (actualCost - expectedCost).abs / expectedCost
-    if (costDiff > 0.1) {
+  def validateCost(actualCost: BigDecimal, expectedCost: List[BigDecimal]): IO[Unit] = {
+    if (expectedCost(0) > actualCost || actualCost > expectedCost(1)) {
       IO.raiseError(
-        new Exception(s"Expected cost $expectedCost but got $actualCost, which is outside the 10% threshold")
+        new Exception(s"Expected cost within range ${expectedCost(0)} - ${expectedCost(1)} but got $actualCost")
       )
     } else {
       IO.unit

centaur/src/main/scala/centaur/test/formulas/TestFormulas.scala

@@ -113,25 +113,6 @@ object TestFormulas extends StrictLogging {
     _ <- validateDirectoryContentsCounts(workflowDefinition, submittedWorkflow, metadata)
   } yield SubmitResponse(submittedWorkflow)
 
-  def runWorkflowTwiceAndCache(
-    workflowDefinition: Workflow
-  )(implicit cromwellTracker: Option[CromwellTracker]): Test[SubmittedWorkflow] =
-    for {
-      _ <- checkDescription(workflowDefinition, validityExpectation = Option(true))
-      _ <- timingVerificationNotSupported(workflowDefinition.maximumAllowedTime)
-      firstWF <- runSuccessfulWorkflow(workflowDefinition)
-      secondWf <- runSuccessfulWorkflow(workflowDefinition.secondRun)
-      _ <- printHashDifferential(firstWF, secondWf)
-      metadata <- fetchAndValidateNonSubworkflowMetadata(secondWf, workflowDefinition, Option(firstWF.id.id))
-      _ <- fetchAndValidateJobManagerStyleMetadata(secondWf,
-                                                   workflowDefinition,
-                                                   prefetchedOriginalNonSubWorkflowMetadata = None
-      )
-      _ = cromwellTracker.track(metadata)
-      _ <- validateNoCacheMisses(secondWf, metadata, workflowDefinition)
-      _ <- validateDirectoryContentsCounts(workflowDefinition, secondWf, metadata)
-    } yield secondWf
-
   def runWorkflowTwiceExpectingCaching(
     workflowDefinition: Workflow,
     checkCost: Boolean = false

centaur/src/main/scala/centaur/test/workflow/Workflow.scala

@@ -26,7 +26,7 @@ final case class Workflow private (testName: String,
                                    skipDescribeEndpointValidation: Boolean,
                                    submittedWorkflowTracker: SubmittedWorkflowTracker,
                                    maximumAllowedTime: Option[FiniteDuration],
-                                   cost: Option[BigDecimal] = None
+                                   cost: Option[List[BigDecimal]] = None
 ) {
 
   def toWorkflowSubmission: WorkflowSingleSubmission = WorkflowSingleSubmission(
@@ -95,7 +95,7 @@ object Workflow {
         val validateDescription: Boolean = conf.get[Boolean]("skipDescribeEndpointValidation").valueOrElse(false)
 
         val maximumTime: Option[FiniteDuration] = conf.get[Option[FiniteDuration]]("maximumTime").value
-        val cost: Option[BigDecimal] = conf.get[Option[BigDecimal]]("cost").value
+        val cost: Option[List[BigDecimal]] = conf.get[Option[List[BigDecimal]]]("cost").value
 
         (files, directoryContentCheckValidation, metadata, retryTestFailuresErrorOr) mapN {
           (f, d, m, retryTestFailures) =>

docs/developers/Centaur.md

@@ -76,8 +76,8 @@ metadata {
   "failures.0.causedBy": "BetweenKeyboardAndChairException"
 }
 
-// Optional, the expected cost of running the workflow
-cost: 0.0000
+// Optional, the expected cost range of running the workflow
+cost:[ 0.0000, 0.0001 ]
 
 filesystemcheck: "local" // possible values: "local", "gcs". Used in conjunction with outputExpectations to define files we expect to exist after running this workflow.
 outputExpectations: {
@@ -110,8 +110,8 @@ In case the absolute path the cromwell root is used (for example: `/home/my_user
 In case testing of the caching is required `<<CACHE_HIT_UUID>>` can be used. 
 The testFormat should be `runtwiceexpectingcallcaching`. To verify that the cost is 0 when using call-caching the testFormat should be `runtwiceexpectingcallcachingnocost`
 
-The cost is optional. If supplied, Centaur will retrieve the cost of the successfully completed workflow and compare it to the cost supplied. 
-The expected range is within 10% of the estimated cost. If evaluating the cost, the test format must be `WorkflowSuccessAndVerifyCost` and the call-caching option must be disabled for that test (example can be found in the `recursive_imports_cost.test`)
+The cost is optional. If supplied, Centaur will retrieve the cost of the successfully completed workflow and compare it to the cost range supplied. 
+If evaluating the cost, the test format must be `WorkflowSuccessAndVerifyCost` and the call-caching option must be disabled for that test (example can be found in the `recursive_imports_cost.test`)
 
 
 ## Centaur Test Types

src/ci/resources/build_application.inc.conf

@@ -59,10 +59,10 @@ services.MetadataService.config.metadata-write-statistics {
   sub-workflow-bundling = true
 }
 
- services.GcpCostCatalogService.config {
-      enabled = true
-      catalogExpirySeconds = 86400
-  }
+services.GcpCostCatalogService.config {
+  enabled = true
+  catalogExpirySeconds = 86400
+}
 
 # Make the shutdown timeout conspicuously long, so that if it hangs, it is an obvious problem in CI.
 # See https://github.com/broadinstitute/cromwell/issues/2575

src/ci/resources/gcp_batch_application.inc.conf.ctmpl

@@ -60,9 +60,10 @@ services {
   }
    GcpCostCatalogService {
       class = "cromwell.services.cost.GcpCostCatalogService"
-      config {
-        enabled = true
-        catalogExpirySeconds = 86400
+          config {
+            enabled = true
+            catalogExpirySeconds = 86400
+          }
       }
 }
 

src/ci/resources/papi_application.inc.conf.ctmpl

@@ -58,6 +58,13 @@ services {
 	  google-auth-name = "service_account"
 	}
   }
+   GcpCostCatalogService {
+      class = "cromwell.services.cost.GcpCostCatalogService"
+          config {
+            enabled = true
+            catalogExpirySeconds = 86400
+          }
+      }
 }
 
 filesystems.drs.global.config.resolver.url = "https://drshub.dsde-dev.broadinstitute.org/api/v4/drs/resolve"

src/ci/resources/papi_v2beta_application.conf

@@ -103,7 +103,7 @@ services {
         # metadata does not convert non-Strings to Strings since that key will always contain boolean values.
         metadata-keys-to-sanitize-utf8mb4 = ["submittedFiles:workflow", "commandLine", "outputs:metadata_type_validation.validate_boolean.boolean_output"]
     }
-     GcpCostCatalogService.config {
+     GcpCostCatalogService {
           enabled = true
           catalogExpirySeconds = 86400
       }