Upgrade to AWS Java SDK v2

docs/reference/config.md

@@ -223,14 +223,21 @@ The following settings are available:
 : The maximum number of retry attempts for failed retryable requests (default: `-1`).
 
 `aws.client.protocol`
-: The protocol to use when connecting to AWS. Can be `http` or `https` (default: `'https'`).
+: :::{deprecated} 25.06.0-edge
+  :::
+: The protocol to use when connecting to AWS. Can be `http` or `https` (default: `'https'`). This option is not supported on AWS SDK v2.
 
 `aws.client.proxyHost`
 : The proxy host to connect through.
 
 `aws.client.proxyPort`
 : The port to use when connecting through a proxy.
 
+`aws.client.proxyScheme`
+: :::{versionadded} 25.06.0-edge
+  :::
+: The scheme to use when connecting through a proxy (Can be `http` or `https` (default: `'http'`).
+
 `aws.client.proxyUsername`
 : The user name to use when connecting through a proxy.
 
@@ -249,10 +256,14 @@ The following settings are available:
 : The name of the signature algorithm to use for signing requests made by the client.
 
 `aws.client.socketSendBufferSizeHint`
-: The Size hint (in bytes) for the low level TCP send buffer (default: `0`).
+: :::{deprecated} 25.06.0-edge
+  :::
+: The Size hint (in bytes) for the low level TCP send buffer (default: `0`). This option is not supported in AWS SDK v2.
 
 `aws.client.socketRecvBufferSizeHint`
-: The Size hint (in bytes) for the low level TCP receive buffer (default: `0`).
+: :::{deprecated} 25.06.0-edge
+  :::
+: The Size hint (in bytes) for the low level TCP receive buffer (default: `0`). This option is not supported in AWS SDK v2.
 
 `aws.client.socketTimeout`
 : The amount of time to wait (in milliseconds) for data to be transferred over an established, open connection before the connection is timed out (default: `50000`).

modules/nf-commons/src/main/nextflow/file/FileHelper.groovy

@@ -880,7 +880,9 @@ class FileHelper {
 
             @Override
             FileVisitResult visitFile(Path fullPath, BasicFileAttributes attrs) throws IOException {
-                final path = folder.relativize(fullPath)
+                def path = fullPath
+                if( fullPath.isAbsolute() )
+                    path = folder.relativize(fullPath)
                 log.trace "visitFiles > file=$path; includeFile=$includeFile; matches=${matcher.matches(path)}; isRegularFile=${attrs.isRegularFile()}"
 
                 if (includeFile && matcher.matches(path) && (attrs.isRegularFile() || (options.followLinks == false && attrs.isSymbolicLink())) && (includeHidden || !isHidden(fullPath))) {
@@ -912,7 +914,9 @@ class FileHelper {
     }
 
     static protected Path relativize0(Path folder, Path fullPath) {
-        def result = folder.relativize(fullPath)
+        def result = fullPath
+        if( fullPath.isAbsolute() )
+            result = folder.relativize(fullPath)
         String str
         if( folder.is(FileSystems.default) || !(str=result.toString()).endsWith('/') )
             return result

modules/nf-lang/src/main/java/nextflow/config/scopes/AwsClientConfig.java

@@ -79,6 +79,12 @@ The protocol (i.e. HTTP or HTTPS) to use when connecting to AWS.
     """)
     public int proxyPort;
 
+    @ConfigOption
+    @Description("""
+        The schema to use when connecting through a proxy (http/https).
+    """)
+    public String proxySchema;
+
     @ConfigOption
     @Description("""
         The user name to use when connecting through a proxy.

plugins/nf-amazon/build.gradle

@@ -38,17 +38,20 @@ dependencies {
     compileOnly 'org.pf4j:pf4j:3.12.0'
 
     api ('javax.xml.bind:jaxb-api:2.4.0-b180830.0359')
-    api ('com.amazonaws:aws-java-sdk-s3:1.12.777')
-    api ('com.amazonaws:aws-java-sdk-ec2:1.12.777')
-    api ('com.amazonaws:aws-java-sdk-batch:1.12.777')
-    api ('com.amazonaws:aws-java-sdk-iam:1.12.777')
-    api ('com.amazonaws:aws-java-sdk-ecs:1.12.777')
-    api ('com.amazonaws:aws-java-sdk-logs:1.12.777')
-    api ('com.amazonaws:aws-java-sdk-codecommit:1.12.777')
-    api ('com.amazonaws:aws-java-sdk-sts:1.12.777')
-    api ('com.amazonaws:aws-java-sdk-ses:1.12.777')
-    api ('software.amazon.awssdk:sso:2.26.26')
-    api ('software.amazon.awssdk:ssooidc:2.26.26')
+    api ('software.amazon.awssdk:s3:2.31.64')
+    api ('software.amazon.awssdk:ec2:2.31.64')
+    api ('software.amazon.awssdk:batch:2.31.64')
+    api ('software.amazon.awssdk:iam:2.31.64')
+    api ('software.amazon.awssdk:ecs:2.31.64')
+    api ('software.amazon.awssdk:cloudwatchlogs:2.31.64')
+    api ('software.amazon.awssdk:codecommit:2.31.64')
+    api ('software.amazon.awssdk:sts:2.31.64')
+    api ('software.amazon.awssdk:ses:2.31.64')
+    api ('software.amazon.awssdk:sso:2.31.64')
+    api ('software.amazon.awssdk:ssooidc:2.31.64')
+    api ('software.amazon.awssdk:s3-transfer-manager:2.31.64')
+    api ('software.amazon.awssdk:apache-client:2.31.64')
+    api ('software.amazon.awssdk:aws-crt-client:2.31.64')
 
     constraints {
         api 'com.fasterxml.jackson.core:jackson-databind:2.12.7.1'

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

@@ -35,8 +35,6 @@ class AmazonPlugin extends BasePlugin {
     @Override
     void start() {
         super.start()
-        // disable aws sdk v1 warning
-        System.setProperty("aws.java.v1.disableDeprecationAnnouncement", "true")
         FileHelper.getOrInstallProvider(S3FileSystemProvider)
     }