Fix config validation warnings for Seqera executor options [ci fast]

Make ExecutorOpts implement ConfigScope and remove @ConfigOption from
the executor field in SeqeraConfig so nested config options are properly
discovered by the config validator.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>

Author: pditommaso

docs/executor.md

@@ -455,12 +455,14 @@ By default, a gp3 volume with 325 MiB/s throughput is used (Fusion recommended s
 
 ```groovy
 seqera {
-    machineRequirement {
-        diskAllocation = 'task'    // Per-task EBS volume (default)
-        diskType = 'ebs/io1'       // Use provisioned IOPS SSD
-        diskIops = 10000           // Required for io1/io2
-        diskThroughputMiBps = 500  // Throughput for gp3 volumes
-        diskEncrypted = true       // Enable KMS encryption
+    executor {
+        machineRequirement {
+            diskAllocation = 'task'    // Per-task EBS volume (default)
+            diskType = 'ebs/io1'       // Use provisioned IOPS SSD
+            diskIops = 10000           // Required for io1/io2
+            diskThroughputMiBps = 500  // Throughput for gp3 volumes
+            diskEncrypted = true       // Enable KMS encryption
+        }
     }
 }
 ```
@@ -473,8 +475,10 @@ To use instance storage instead of per-task EBS volumes:
 
 ```groovy
 seqera {
-    machineRequirement {
-        diskAllocation = 'node'    // Use instance storage
+    executor {
+        machineRequirement {
+            diskAllocation = 'node'    // Use instance storage
+        }
     }
 }
 ```

docs/reference/config.md

@@ -1498,56 +1498,63 @@ The following settings are available:
 *Preview feature: may change in a future release.*
 :::
 
-The `seqera` scope allows you to configure the interactions with the Seqera scheduler service for the {ref}`seqera-executor`.
+The `seqera` scope allows you to configure the interactions with Seqera services.
+
+### `executor`
+
+The `seqera.executor` scope configures the Seqera scheduler service for the {ref}`seqera-executor`.
 
 The following settings are available:
 
-`seqera.endpoint`
+`seqera.executor.endpoint`
 : The Seqera scheduler service endpoint URL (required).
 
-`seqera.region`
+`seqera.executor.region`
 : The AWS region for task execution (default: `'eu-central-1'`).
 
-`seqera.machineRequirement.arch`
+`seqera.executor.labels`
+: Custom labels to apply to AWS resources for cost tracking and resource organization. Labels are propagated to ECS tasks, capacity providers, and EC2 instances.
+
+`seqera.executor.machineRequirement.arch`
 : The CPU architecture for task execution, e.g. `'x86_64'` or `'arm64'`.
 
-`seqera.machineRequirement.provisioning`
+`seqera.executor.machineRequirement.provisioning`
 : The instance provisioning mode. Can be `'spot'`, `'ondemand'`, or `'spotFirst'`.
 
-`seqera.machineRequirement.maxSpotAttempts`
+`seqera.executor.machineRequirement.maxSpotAttempts`
 : The maximum number of spot retry attempts before falling back to on-demand. Only used when `provisioning` is `'spot'` or `'spotFirst'`.
 
-`seqera.machineRequirement.machineFamilies`
+`seqera.executor.machineRequirement.machineFamilies`
 : List of acceptable EC2 instance families, e.g. `['m5', 'c5', 'r5']`.
 
-`seqera.machineRequirement.diskAllocation`
+`seqera.executor.machineRequirement.diskAllocation`
 : The disk allocation strategy. Can be `'task'` (default) for per-task EBS volumes, or `'node'` for per-node instance storage. When using `'node'` allocation, EBS-specific options (`diskType`, `diskIops`, `diskThroughputMiBps`, `diskEncrypted`) are not applicable.
 
-`seqera.machineRequirement.diskType`
+`seqera.executor.machineRequirement.diskType`
 : The EBS volume type for task scratch disk. Supported types: `'ebs/gp3'` (default), `'ebs/gp2'`, `'ebs/io1'`, `'ebs/io2'`, `'ebs/st1'`, `'ebs/sc1'`. Only applicable when `diskAllocation` is `'task'`.
 
-`seqera.machineRequirement.diskThroughputMiBps`
+`seqera.executor.machineRequirement.diskThroughputMiBps`
 : The throughput in MiB/s for gp3 volumes (125-1000). Default: `325` (Fusion recommended). Only applicable when `diskAllocation` is `'task'`.
 
-`seqera.machineRequirement.diskIops`
+`seqera.executor.machineRequirement.diskIops`
 : The IOPS for io1/io2/gp3 volumes. Required for io1/io2 volume types. Only applicable when `diskAllocation` is `'task'`.
 
-`seqera.machineRequirement.diskEncrypted`
+`seqera.executor.machineRequirement.diskEncrypted`
 : Enable KMS encryption for the EBS volume (default: `false`). Only applicable when `diskAllocation` is `'task'`.
 
-`seqera.retryPolicy.delay`
+`seqera.executor.retryPolicy.delay`
 : The initial delay when a failing HTTP request is retried (default: `'450ms'`).
 
-`seqera.retryPolicy.maxDelay`
+`seqera.executor.retryPolicy.maxDelay`
 : The maximum delay when a failing HTTP request is retried (default: `'90s'`).
 
-`seqera.retryPolicy.maxAttempts`
+`seqera.executor.retryPolicy.maxAttempts`
 : The maximum number of retry attempts (default: `10`).
 
-`seqera.retryPolicy.jitter`
+`seqera.executor.retryPolicy.jitter`
 : The jitter factor for randomizing retry delays (default: `0.25`).
 
-`seqera.retryPolicy.multiplier`
+`seqera.executor.retryPolicy.multiplier`
 : The multiplier for exponential backoff (default: `2.0`).
 
 (config-spack)=

plugins/nf-seqera/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

plugins/nf-seqera/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     compileOnly project(':nextflow')
     compileOnly 'org.slf4j:slf4j-api:2.0.17'
     compileOnly 'org.pf4j:pf4j:3.12.0'
-    api 'io.seqera:sched-client:0.16.0-SNAPSHOT'
+    api 'io.seqera:sched-client:0.19.0-SNAPSHOT'
 
     testImplementation(testFixtures(project(":nextflow")))
     testImplementation "org.apache.groovy:groovy:4.0.29"

plugins/nf-seqera/src/main/io/seqera/config/ExecutorOpts.groovy

@@ -0,0 +1,123 @@
+/*
+ * Copyright 2013-2025, 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 io.seqera.config
+
+import groovy.transform.CompileStatic
+import nextflow.config.spec.ConfigOption
+import nextflow.config.spec.ConfigScope
+import nextflow.script.dsl.Description
+import nextflow.util.Duration
+
+/**
+ * Configuration for the Seqera executor.
+ *
+ * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
+ */
+@Description("""
+    The `seqera.executor` scope provides configuration for the Seqera compute executor.
+""")
+@CompileStatic
+class ExecutorOpts implements ConfigScope {
+
+    final RetryOpts retryPolicy
+
+    @ConfigOption
+    @Description("""
+        The Seqera scheduler service endpoint URL.
+    """)
+    final String endpoint
+
+    @ConfigOption
+    @Description("""
+        The AWS region for task execution (default: `eu-central-1`).
+    """)
+    final String region
+
+    @ConfigOption
+    @Description("""
+        The EC2 key pair name for SSH access to instances.
+    """)
+    final String keyPairName
+
+    @ConfigOption
+    @Description("""
+        The interval for batching task submissions (default: `1 sec`).
+    """)
+    final Duration batchFlushInterval
+
+    @Description("""
+        Machine/infrastructure requirements for session tasks.
+    """)
+    final MachineRequirementOpts machineRequirement
+
+    @ConfigOption
+    @Description("""
+        Custom labels to apply to AWS resources for cost tracking and resource organization.
+        Labels are propagated to ECS tasks, capacity providers, and EC2 instances.
+    """)
+    final Map<String, String> labels
+
+    /* required by config scope -- do not remove */
+
+    ExecutorOpts() {}
+
+    ExecutorOpts(Map opts) {
+        this.retryPolicy = new RetryOpts(opts.retryPolicy as Map ?: Map.of())
+        this.endpoint = opts.endpoint as String
+        if (!endpoint)
+            throw new IllegalArgumentException("Missing Seqera endpoint - make sure to specify 'seqera.executor.endpoint' settings")
+
+        this.region = opts.region as String ?: "eu-central-1"
+        this.keyPairName = opts.keyPairName as String
+        this.batchFlushInterval = opts.batchFlushInterval
+            ? Duration.of(opts.batchFlushInterval as String)
+            : Duration.of('1 sec')
+        // machine requirement settings
+        this.machineRequirement = new MachineRequirementOpts(opts.machineRequirement as Map ?: Map.of())
+        // labels for cost tracking
+        this.labels = opts.labels as Map<String, String>
+    }
+
+    RetryOpts retryOpts() {
+        this.retryPolicy
+    }
+
+    String getEndpoint() {
+        return endpoint
+    }
+
+    String getRegion() {
+        return region
+    }
+
+    String getKeyPairName() {
+        return keyPairName
+    }
+
+    Duration getBatchFlushInterval() {
+        return batchFlushInterval
+    }
+
+    MachineRequirementOpts getMachineRequirement() {
+        return machineRequirement
+    }
+
+    Map<String, String> getLabels() {
+        return labels
+    }
+}

plugins/nf-seqera/src/main/io/seqera/config/MachineRequirementOpts.groovy

@@ -21,6 +21,7 @@ import groovy.transform.CompileStatic
 import nextflow.config.spec.ConfigOption
 import nextflow.config.spec.ConfigScope
 import nextflow.script.dsl.Description
+import nextflow.util.MemoryUnit
 
 /**
  * Machine/infrastructure requirements configuration options.
@@ -90,6 +91,12 @@ class MachineRequirementOpts implements ConfigScope {
     """)
     final String diskAllocation
 
+    @ConfigOption
+    @Description("""
+        The disk size for session-level storage (e.g., `100.GB`).
+    """)
+    final MemoryUnit diskSize
+
     /* required by config scope -- do not remove */
     MachineRequirementOpts() {}
 
@@ -103,6 +110,9 @@ class MachineRequirementOpts implements ConfigScope {
         this.diskIops = opts.diskIops as Integer
         this.diskEncrypted = opts.diskEncrypted as Boolean
         this.diskAllocation = opts.diskAllocation as String
+        this.diskSize = opts.diskSize instanceof MemoryUnit
+            ? opts.diskSize as MemoryUnit
+            : (opts.diskSize ? MemoryUnit.of(opts.diskSize as String) : null)
     }
 
     String getArch() {
@@ -140,4 +150,8 @@ class MachineRequirementOpts implements ConfigScope {
     String getDiskAllocation() {
         return diskAllocation
     }
+
+    MemoryUnit getDiskSize() {
+        return diskSize
+    }
 }