Revert "Update nf-codecommit to AWS SDK v2 (#6263)" [ci fast]

This reverts commit 9e9476f.

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>

Author: pditommaso

plugins/nf-codecommit/build.gradle

@@ -38,9 +38,7 @@ dependencies {
     compileOnly 'org.pf4j:pf4j:3.12.0'
 
     api ('javax.xml.bind:jaxb-api:2.4.0-b180830.0359')
-    api ('software.amazon.awssdk:codecommit:2.31.64')
-    api ('software.amazon.awssdk:sso:2.31.64')
-    api ('software.amazon.awssdk:ssooidc:2.31.64')
+    api ('com.amazonaws:aws-java-sdk-codecommit:1.12.777')
 
     testImplementation(testFixtures(project(":nextflow")))
     testImplementation project(':nextflow')

plugins/nf-codecommit/src/main/nextflow/cloud/aws/codecommit/AwsCodeCommitCredentialProvider.groovy

@@ -16,8 +16,6 @@
 
 package nextflow.cloud.aws.codecommit
 
-import software.amazon.awssdk.auth.credentials.AwsCredentials
-
 import javax.crypto.Mac
 
 /*
@@ -42,11 +40,12 @@ import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 import java.text.SimpleDateFormat
 
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider
-import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
-import software.amazon.awssdk.auth.credentials.AwsSessionCredentials
+import com.amazonaws.auth.AWSCredentials
+import com.amazonaws.auth.AWSCredentialsProvider
+import com.amazonaws.auth.AWSSessionCredentials
+import com.amazonaws.auth.AWSStaticCredentialsProvider
+import com.amazonaws.auth.BasicAWSCredentials
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import nextflow.exception.AbortOperationException
@@ -202,23 +201,23 @@ final class AwsCodeCommitCredentialProvider extends CredentialsProvider {
     }
 
     /**
-     * Get the AWSCredentials. If an AwsCredentialProvider was specified, use that,
-     * otherwise, create a new AwsCredentialsProvider. If the username and password are
-     * provided, use those directly as AwsCredentials. Otherwise, use the
-     * {@link DefaultCredentialsProvider} as is standard with AWS applications.
+     * Get the AWSCredentials. If an AWSCredentialProvider was specified, use that,
+     * otherwise, create a new AWSCredentialsProvider. If the username and password are
+     * provided, use those directly as AWSCredentials. Otherwise, use the
+     * {@link DefaultAWSCredentialsProviderChain} as is standard with AWS applications.
      * @return the AWS credentials.
      */
-    private AwsCredentials retrieveAwsCredentials() {
-        AwsCredentialsProvider credsProvider
+    private AWSCredentials retrieveAwsCredentials() {
+        AWSCredentialsProvider credsProvider
         if ( username && password ) {
             log.debug "Creating a static AWS credentials provider"
-            credsProvider = StaticCredentialsProvider.create( AwsBasicCredentials.create(username,password) )
+            credsProvider = new AWSStaticCredentialsProvider( new BasicAWSCredentials( username, password ))
         }
         else {
             log.debug "Creating a default AWS credentials provider chain"
-            credsProvider = DefaultCredentialsProvider.builder().build()
+            credsProvider = new DefaultAWSCredentialsProviderChain()
         }
-        return credsProvider.resolveCredentials()
+        return credsProvider.getCredentials()
     }
 
     /**
@@ -261,14 +260,14 @@ final class AwsCodeCommitCredentialProvider extends CredentialsProvider {
         String awsSecretKey
 
         try {
-            AwsCredentials awsCredentials = retrieveAwsCredentials()
+            AWSCredentials awsCredentials = retrieveAwsCredentials()
             StringBuilder awsKey = new StringBuilder();
-            awsKey.append(awsCredentials.accessKeyId());
-            awsSecretKey = awsCredentials.secretAccessKey();
-            if (awsCredentials instanceof AwsSessionCredentials) {
-                AwsSessionCredentials sessionCreds = (AwsSessionCredentials) awsCredentials;
-                if ( sessionCreds.sessionToken() ) {
-                    awsKey.append('%').append(sessionCreds.sessionToken())
+            awsKey.append(awsCredentials.getAWSAccessKeyId());
+            awsSecretKey = awsCredentials.getAWSSecretKey();
+            if (awsCredentials instanceof AWSSessionCredentials) {
+                AWSSessionCredentials sessionCreds = (AWSSessionCredentials) awsCredentials;
+                if ( sessionCreds.getSessionToken() ) {
+                    awsKey.append('%').append(sessionCreds.getSessionToken())
                 }
             }
             awsAccessKey = awsKey.toString()
@@ -323,7 +322,7 @@ final class AwsCodeCommitCredentialProvider extends CredentialsProvider {
     /**
      * @param awsCredentialProvider the awsCredentialProvider to set
      */
-    void setAwsCredentialsProvider(AwsCredentialsProvider awsCredentialsProvider) {
+    void setAwsCredentialsProvider(AWSCredentialsProvider awsCredentialsProvider) {
         this.awsCredentialsProvider = awsCredentialsProvider
     }
 

plugins/nf-codecommit/src/main/nextflow/cloud/aws/codecommit/AwsCodeCommitRepositoryProvider.groovy

@@ -16,16 +16,16 @@
 
 package nextflow.cloud.aws.codecommit
 
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
-import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
-import software.amazon.awssdk.core.exception.SdkException
-import software.amazon.awssdk.regions.Region
-import software.amazon.awssdk.services.codecommit.CodeCommitClient
-import software.amazon.awssdk.services.codecommit.model.CodeCommitException
-import software.amazon.awssdk.services.codecommit.model.GetFileRequest
-import software.amazon.awssdk.services.codecommit.model.GetRepositoryRequest
-import software.amazon.awssdk.services.codecommit.model.RepositoryMetadata
+import com.amazonaws.SdkClientException
+import com.amazonaws.auth.AWSStaticCredentialsProvider
+import com.amazonaws.auth.BasicAWSCredentials
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
+import com.amazonaws.services.codecommit.AWSCodeCommit
+import com.amazonaws.services.codecommit.AWSCodeCommitClientBuilder
+import com.amazonaws.services.codecommit.model.AWSCodeCommitException
+import com.amazonaws.services.codecommit.model.GetFileRequest
+import com.amazonaws.services.codecommit.model.GetRepositoryRequest
+import com.amazonaws.services.codecommit.model.RepositoryMetadata
 import groovy.transform.CompileStatic
 import groovy.transform.Memoized
 import groovy.util.logging.Slf4j
@@ -56,21 +56,22 @@ class AwsCodeCommitRepositoryProvider extends RepositoryProvider {
     }
 
     private String region
-    private CodeCommitClient client
+    private AWSCodeCommit client
     private String repositoryName
 
 
-    protected CodeCommitClient createClient(AwsCodeCommitProviderConfig config) {
-        final builder = CodeCommitClient.builder()
-                .region(Region.of(region))
+    protected AWSCodeCommit createClient(AwsCodeCommitProviderConfig config) {
+        final builder = AWSCodeCommitClientBuilder
+                .standard()
+                .withRegion(region)
         if( config.user && config.password ) {
-            final creds = AwsBasicCredentials.create(config.user, config.password)
+            final creds = new BasicAWSCredentials(config.user, config.password)
             log.debug "AWS CodeCommit using username=$config.user; password=${StringUtils.redact(config.password)}"
-            builder.credentialsProvider( StaticCredentialsProvider.create(creds) )
+            builder.withCredentials( new AWSStaticCredentialsProvider(creds) )
         }
         else {
             log.debug "AWS CodeCommit using default credentials chain"
-            builder.credentialsProvider( DefaultCredentialsProvider.builder().build() )
+            builder.withCredentials( new DefaultAWSCredentialsProviderChain() )
         }
         builder.build()
     }
@@ -83,13 +84,12 @@ class AwsCodeCommitRepositoryProvider extends RepositoryProvider {
     }
 
     private RepositoryMetadata getRepositoryMetadata() {
-        final request = GetRepositoryRequest.builder()
-                .repositoryName(repositoryName)
-                .build()
+        final request = new GetRepositoryRequest()
+                .withRepositoryName(repositoryName)
 
         return client
                 .getRepository(request)
-                .repositoryMetadata()
+                .getRepositoryMetadata()
     }
 
     /** {@inheritDoc} **/
@@ -136,16 +136,16 @@ class AwsCodeCommitRepositoryProvider extends RepositoryProvider {
     @Override
     byte[] readBytes( String path ) {
 
-        final builder = GetFileRequest.builder()
-            .repositoryName(repositoryName)
-            .filePath(path)
+        final request = new GetFileRequest()
+            .withRepositoryName(repositoryName)
+            .withFilePath(path)
         if( revision )
-            builder.commitSpecifier(revision)
+            request.withCommitSpecifier(revision)
 
         try {
             return client
-                    .getFile( builder.build() )
-                    .fileContent()?.asByteArray()
+                    .getFile( request )
+                    .getFileContent()?.array()
         }
         catch (Exception e) {
             checkMissingCredsException(e)
@@ -160,9 +160,9 @@ class AwsCodeCommitRepositoryProvider extends RepositoryProvider {
                 "Unable to load AWS credentials",
                 "The security token included in the request is invalid",
                 "The request signature we calculated does not match the signature you provided"]
-        if( e !instanceof SdkException )
+        if( e !instanceof SdkClientException )
             return
-        if( e instanceof CodeCommitException && e.message?.startsWith("Could not find path") ) {
+        if( e instanceof AWSCodeCommitException && e.message?.startsWith("Could not find path") ) {
             // it cannot find the request file
             return
         }

plugins/nf-codecommit/src/test/nextflow/cloud/aws/codecommit/AwsCodeCommitRepositoryProviderTest.groovy

@@ -26,7 +26,7 @@ import spock.lang.Specification
  * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
  */
 @IgnoreIf({System.getenv('NXF_SMOKE')})
-//@Requires({System.getenv('AWS_ACCESS_KEY_ID') && System.getenv('AWS_SECRET_ACCESS_KEY')})
+@Requires({System.getenv('AWS_ACCESS_KEY_ID') && System.getenv('AWS_SECRET_ACCESS_KEY')})
 class AwsCodeCommitRepositoryProviderTest extends Specification {
 
     def 'should get repo url' () {