diff --git a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala index 3d9bde7282..5f661096f5 100644 --- a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala +++ b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/api/GcpBatchRequestFactoryImpl.scala @@ -242,8 +242,6 @@ class GcpBatchRequestFactoryImpl()(implicit gcsTransferConfiguration: GcsTransfe val logsPolicy = data.gcpBatchParameters.batchAttributes.logsPolicy match { case GcpBatchLogsPolicy.CloudLogging => LogsPolicy.newBuilder.setDestination(Destination.CLOUD_LOGGING).build - case GcpBatchLogsPolicy.Path => - ??? } val googleLabels = data.createParameters.googleLabels.map(l => Label(l.key, l.value)) diff --git a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributes.scala b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributes.scala index e62166805a..a6e6272f4c 100644 --- a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributes.scala +++ b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributes.scala @@ -227,7 +227,6 @@ object GcpBatchConfigurationAttributes val logsPolicy: ErrorOr[GcpBatchLogsPolicy] = validate { backendConfig.as[Option[String]]("batch.logs-policy").getOrElse("CLOUD_LOGGING") match { case "CLOUD_LOGGING" => GcpBatchLogsPolicy.CloudLogging - case "PATH" => GcpBatchLogsPolicy.Path case other => throw new IllegalArgumentException( s"Unrecognized logs policy entry: $other. Supported strategies are CLOUD_LOGGING and PATH." diff --git a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/GcpBatchLogsPolicy.scala b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/GcpBatchLogsPolicy.scala index bcc8fab8d1..d43714e495 100644 --- a/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/GcpBatchLogsPolicy.scala +++ b/supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/models/GcpBatchLogsPolicy.scala @@ -4,5 +4,4 @@ sealed trait GcpBatchLogsPolicy extends Product with Serializable object GcpBatchLogsPolicy { case object CloudLogging extends GcpBatchLogsPolicy - case object Path extends GcpBatchLogsPolicy } diff --git a/supportedBackends/google/batch/src/test/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributesSpec.scala b/supportedBackends/google/batch/src/test/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributesSpec.scala index e245e23a01..20f0a4f482 100644 --- a/supportedBackends/google/batch/src/test/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributesSpec.scala +++ b/supportedBackends/google/batch/src/test/scala/cromwell/backend/google/batch/models/GcpBatchConfigurationAttributesSpec.scala @@ -137,12 +137,6 @@ class GcpBatchConfigurationAttributesSpec 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") - gcpBatchAttributes.logsPolicy should be(GcpBatchLogsPolicy.Path) - } - it should "reject invalid logs-policy" in { val expected = "Google Cloud Batch configuration is not valid: Errors:\nUnrecognized logs policy entry: INVALID. Supported strategies are CLOUD_LOGGING and PATH."