Fix AWS Batch spot instance detection (nextflow-io#6722)

Author: robsyme

plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchHelper.groovy

@@ -23,6 +23,7 @@ import software.amazon.awssdk.services.batch.model.DescribeJobsRequest
 import software.amazon.awssdk.services.ec2.Ec2Client
 import software.amazon.awssdk.services.ec2.model.DescribeInstancesRequest
 import software.amazon.awssdk.services.ec2.model.Instance
+import software.amazon.awssdk.services.ec2.model.InstanceLifecycleType
 import software.amazon.awssdk.services.ecs.EcsClient
 import software.amazon.awssdk.services.ecs.model.DescribeContainerInstancesRequest
 import software.amazon.awssdk.services.ecs.model.DescribeTasksRequest
@@ -171,7 +172,7 @@ class AwsBatchHelper {
     }
 
     private PriceModel getPrice(Instance instance) {
-        instance.instanceLifecycle()=='spot' ? PriceModel.spot : PriceModel.standard
+        instance.instanceLifecycle() == InstanceLifecycleType.SPOT ? PriceModel.spot : PriceModel.standard
     }
 
     CloudMachineInfo getCloudInfoByQueueAndTaskArn(String queue, String taskArn) {

plugins/nf-amazon/src/test/nextflow/cloud/aws/batch/AwsBatchHelperTest.groovy

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013-2024, Seqera Labs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package nextflow.cloud.aws.batch
+
+import nextflow.cloud.types.PriceModel
+import software.amazon.awssdk.services.batch.BatchClient
+import software.amazon.awssdk.services.ec2.model.Instance
+import software.amazon.awssdk.services.ec2.model.InstanceLifecycleType
+import spock.lang.Specification
+import spock.lang.Unroll
+
+/**
+ * Tests for AwsBatchHelper
+ *
+ * @author Rob Syme <rob.syme@seqera.io>
+ */
+class AwsBatchHelperTest extends Specification {
+
+    @Unroll
+    def 'should detect spot instance pricing model'() {
+        given:
+        def helper = new AwsBatchHelper(Mock(BatchClient), null)
+        def instance = Instance.builder()
+            .instanceLifecycle(lifecycle)
+            .build()
+
+        when:
+        def result = helper.getPrice(instance)
+
+        then:
+        result == expected
+
+        where:
+        lifecycle                       | expected
+        InstanceLifecycleType.SPOT      | PriceModel.spot
+        InstanceLifecycleType.SCHEDULED | PriceModel.standard
+        null                            | PriceModel.standard   // on-demand instances return null
+    }
+}