Fix GCPBATCH backend naming in configuration specs and additional con…

…figs in test config.
broadinstitute · Nov 25, 2024 · d636287 · d636287
1 parent 6311a45
commit d636287
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/...src/test/scala/cromwell/backend/google/batch/actors/GcpBatchInitializationActorSpec.scala b/...src/test/scala/cromwell/backend/google/batch/actors/GcpBatchInitializationActorSpec.scala
@@ -139,7 +139,7 @@ object GcpBatchInitializationActorSpec {
       |  // This is the maximum polling interval (in seconds):
       |  maximum-polling-interval = 600
       |
-      |  batch {
+      |  GCPBATCH {
       |  // A reference to an auth defined in the `google` stanza at the top.
       |  // This auth is used to create jobs and manipulate auth JSONs.
       |     auth = "application-default"

diff --git a/...test/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributesSpec.scala b/...test/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributesSpec.scala
@@ -29,7 +29,7 @@ class GcpBatchConfigurationAttributesSpec
   it should "parse correct Batch config" in {
     val backendConfig = ConfigFactory.parseString(configString())
 
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
     gcpBatchAttributes.project should be("myProject")
     gcpBatchAttributes.executionBucket should be("gs://myBucket")
     gcpBatchAttributes.maxPollingInterval should be(600)
@@ -42,7 +42,7 @@ class GcpBatchConfigurationAttributesSpec
 
     val backendConfig = ConfigFactory.parseString(configString(customContent = "preemptible = 3"))
 
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
     gcpBatchAttributes.project should be("myProject")
     gcpBatchAttributes.executionBucket should be("gs://myBucket")
     gcpBatchAttributes.maxPollingInterval should be(600)
@@ -61,7 +61,7 @@ class GcpBatchConfigurationAttributesSpec
       """.stripMargin
 
     val backendConfig = ConfigFactory.parseString(configString(customContent = customContent))
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
 
     gcpBatchAttributes.batchRequestTimeoutConfiguration.readTimeoutMillis.get.value should be(100.hours.toMillis.toInt)
     gcpBatchAttributes.batchRequestTimeoutConfiguration.connectTimeoutMillis.get.value should be(
@@ -82,23 +82,23 @@ class GcpBatchConfigurationAttributesSpec
       """.stripMargin
 
     val backendConfig = ConfigFactory.parseString(configString(customContent = customContent))
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
 
     gcpBatchAttributes.batchRequestTimeoutConfiguration should be(BatchRequestTimeoutConfiguration(None, None))
   }
 
   it should "parse batch-timeout" in {
 
     val backendConfig = ConfigFactory.parseString(configString(customContent = "batch-timeout = 3 days"))
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
 
     gcpBatchAttributes.batchTimeout should be(3.days)
   }
 
   it should "parse an undefined batch-timeout" in {
 
     val backendConfig = ConfigFactory.parseString(configString())
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
 
     gcpBatchAttributes.batchTimeout should be(7.days)
   }
@@ -107,27 +107,27 @@ class GcpBatchConfigurationAttributesSpec
 
     val backendConfig = ConfigFactory.parseString(configString(batch = """compute-service-account = "testing" """))
 
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
     gcpBatchAttributes.computeServiceAccount should be("testing")
   }
 
   it should "parse localization-attempts" in {
 
     val backendConfig = ConfigFactory.parseString(configString(batch = "localization-attempts = 31380"))
 
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
     gcpBatchAttributes.gcsTransferConfiguration.transferAttempts.value should be(31380)
   }
 
   it should "parse logs-policy = CLOUD_LOGGING" in {
     val backendConfig = ConfigFactory.parseString(configString(batch = "logs-policy = CLOUD_LOGGING"))
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
     gcpBatchAttributes.logsPolicy should be(GcpBatchLogsPolicy.CloudLogging)
   }
 
   it should "parse logs-policy = PATH" in {
     val backendConfig = ConfigFactory.parseString(configString(batch = "logs-policy = PATH"))
-    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+    val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
     gcpBatchAttributes.logsPolicy should be(GcpBatchLogsPolicy.Path)
   }
 
@@ -136,7 +136,7 @@ class GcpBatchConfigurationAttributesSpec
       "Google Cloud Batch configuration is not valid: Errors:\nUnrecognized logs policy entry: INVALID. Supported strategies are CLOUD_LOGGING and PATH."
     val backendConfig = ConfigFactory.parseString(configString(batch = "logs-policy = INVALID"))
     val ex = intercept[IllegalArgumentException] {
-      GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+      GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
     }
 
     ex.getMessage should be(expected)
@@ -238,7 +238,7 @@ class GcpBatchConfigurationAttributesSpec
     it should s"parse virtual-private-cloud $description" in {
 
       val backendConfig = ConfigFactory.parseString(configString(customConfig))
-      val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+      val gcpBatchAttributes = GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
       gcpBatchAttributes.virtualPrivateCloudConfiguration should be(vpcConfig)
     }
   }
@@ -248,7 +248,7 @@ class GcpBatchConfigurationAttributesSpec
 
       val backendConfig = ConfigFactory.parseString(configString(customConfig))
       val exception = intercept[IllegalArgumentException with MessageAggregation] {
-        GcpBatchConfigurationAttributes(googleConfig, backendConfig, "batch")
+        GcpBatchConfigurationAttributes(googleConfig, backendConfig, "GCPBATCH")
       }
       exception.errorMessages.toList should be(errorMessages)
     }
@@ -266,7 +266,7 @@ class GcpBatchConfigurationAttributesSpec
         """.stripMargin)
 
     val exception = intercept[IllegalArgumentException with MessageAggregation] {
-      GcpBatchConfigurationAttributes(googleConfig, nakedConfig, "batch")
+      GcpBatchConfigurationAttributes(googleConfig, nakedConfig, "GCPBATCH")
     }
     val errorsList = exception.errorMessages.toList
     errorsList should contain("String: 2: No configuration setting found for key 'project'")
@@ -282,7 +282,7 @@ class GcpBatchConfigurationAttributesSpec
        |   root = "gs://myBucket"
        |   maximum-polling-interval = 600
        |   $customContent
-       |   batch {
+       |   GCPBATCH {
        |     // A reference to an auth defined in the `google` stanza at the top.  This auth is used to create
        |     // Pipelines and manipulate auth JSONs.
        |     auth = "mock"
@@ -325,7 +325,7 @@ class GcpBatchConfigurationAttributesSpec
 
     val backendConfig = ConfigFactory.parseString(configString())
 
-    val validation = GcpBatchConfigurationAttributes.validateReferenceDiskManifestConfigs(backendConfig, "batch")
+    val validation = GcpBatchConfigurationAttributes.validateReferenceDiskManifestConfigs(backendConfig, "GCPBATCH")
 
     validation shouldBe None.validNel
   }
@@ -336,7 +336,7 @@ class GcpBatchConfigurationAttributesSpec
 
     val backendConfig = ConfigFactory.parseString(configString(customContent = manifestConfig))
 
-    val validation = GcpBatchConfigurationAttributes.validateReferenceDiskManifestConfigs(backendConfig, "batch")
+    val validation = GcpBatchConfigurationAttributes.validateReferenceDiskManifestConfigs(backendConfig, "GCPBATCH")
 
     validation shouldBe Option(List.empty).validNel
   }
@@ -373,7 +373,7 @@ class GcpBatchConfigurationAttributesSpec
         |]
         |""".stripMargin
     val backendConfig = ConfigFactory.parseString(configString(manifestConfig))
-    val validation = GcpBatchConfigurationAttributes.validateReferenceDiskManifestConfigs(backendConfig, "batch")
+    val validation = GcpBatchConfigurationAttributes.validateReferenceDiskManifestConfigs(backendConfig, "GCPBATCH")
     val manifests: List[ManifestFile] = validation.toEither.toOption.get.get
 
     manifests shouldBe List(
@@ -442,7 +442,7 @@ class GcpBatchConfigurationAttributesSpec
     badValues foreach { badValue =>
       val customContent = s""""reference-disk-localization-manifests" = $badValue"""
       val backendConfig = ConfigFactory.parseString(configString(customContent))
-      val validation = GcpBatchConfigurationAttributes.validateReferenceDiskManifestConfigs(backendConfig, "batch")
+      val validation = GcpBatchConfigurationAttributes.validateReferenceDiskManifestConfigs(backendConfig, "GCPBATCH")
       validation.isInvalid shouldBe true
     }
   }

diff --git a/...batch/src/test/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationSpec.scala b/...batch/src/test/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationSpec.scala
@@ -60,7 +60,7 @@ class GcpBatchConfigurationSpec
       |  // This is the maximum polling interval (in seconds):
       |  maximum-polling-interval = 600
       |
-      |  batch {
+      |  GCPBATCH {
       |  // A reference to an auth defined in the `google` stanza at the top.
       |  // This auth is used to create jobs and manipulate auth JSONs.
       |     auth = "application-default"

diff --git a/...google/batch/src/test/scala/cromwell/backend/google/batch/models/GcpBatchTestConfig.scala b/...google/batch/src/test/scala/cromwell/backend/google/batch/models/GcpBatchTestConfig.scala
@@ -47,7 +47,7 @@ object GcpBatchTestConfig {
       |project = "my-cromwell-workflows"
       |root = "gs://my-cromwell-workflows-bucket"
       |
-      |batch {
+      |GCPBATCH {
       |  auth = "application-default"
       |}
       |
@@ -84,7 +84,7 @@ object GcpBatchTestConfig {
        |backend {
        |  default = "batch"
        |  providers {
-       |    batch {
+       |    GCPBATCH {
        |      actor-factory = "cromwell.backend.google.batch.GcpBatchBackendLifecycleActorFactory"
        |      config {
        |      $BatchBackendConfigString
@@ -108,7 +108,7 @@ object GcpBatchTestConfig {
     Await.result(BatchBackendConfigurationDescriptor.pathBuilders(WorkflowOptions.empty), 5.seconds)
   val googleConfiguration: GoogleConfiguration = GoogleConfiguration(BatchGlobalConfig)
   val batchAttributes: GcpBatchConfigurationAttributes =
-    GcpBatchConfigurationAttributes(googleConfiguration, BatchBackendConfig, "batch")
+    GcpBatchConfigurationAttributes(googleConfiguration, BatchBackendConfig, "GCPBATCH")
   val gcpBatchConfiguration =
     new GcpBatchConfiguration(BatchBackendConfigurationDescriptor, googleConfiguration, batchAttributes)
 }