Merge branch 'master' into add_unit_tests_jdbc

burhan94 · web-flow · commit c165b9aacf0d · 2025-10-27T15:15:47.000-04:00
diff --git a/Dockerfile b/Dockerfile
@@ -3,10 +3,10 @@ ARG JAVA_VERSION=11
 # Use the specified version of Java
 FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
 
-# Argument for Java tool options for ssl
-ARG JAVA_TOOL_OPTIONS="-Djavax.net.ssl.trustStore=/var/lang/lib/security/cacerts"
-# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
-ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
+# Argument for Java tool options
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17 and always include default truststore to avoid SSL handshake issues
+ENV JAVA_TOOL_OPTIONS="-Djavax.net.ssl.trustStore=/var/lang/lib/security/cacerts ${JAVA_TOOL_OPTIONS}"
 
 # Install necessary tools
 RUN yum update -y
diff --git a/athena-cloudera-hive/pom.xml b/athena-cloudera-hive/pom.xml
@@ -135,7 +135,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.14</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/athena-cloudera-impala/pom.xml b/athena-cloudera-impala/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.9.4</version>
+            <version>4.9.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -117,7 +117,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.14</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/athena-cloudwatch/pom.xml b/athena-cloudwatch/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>cloudwatchlogs</artifactId>
-            <version>2.33.8</version>
+            <version>2.35.8</version>
             <exclusions>
                 <!-- replaced with jcl-over-slf4j -->
                 <exclusion>
diff --git a/athena-db2-as400/pom.xml b/athena-db2-as400/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>net.sf.jt400</groupId>
             <artifactId>jt400</artifactId>
-            <version>21.0.5</version>
+            <version>21.0.6</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/rds -->
         <dependency>
diff --git a/athena-docdb/Dockerfile b/athena-docdb/Dockerfile
@@ -3,10 +3,10 @@ ARG JAVA_VERSION=11
 # Use the specified version of Java
 FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
 
-# Argument for Java tool options for ssl
-ARG JAVA_TOOL_OPTIONS="-Djavax.net.ssl.trustStore=/var/lang/lib/security/cacerts"
-# Set the JAVA_TOOL_OPTIONS environment variable for Java 17 and for ssl
-ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
+# Argument for Java tool options
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17 and always include default truststore to avoid SSL handshake issues
+ENV JAVA_TOOL_OPTIONS="-Djavax.net.ssl.trustStore=/var/lang/lib/security/cacerts ${JAVA_TOOL_OPTIONS}"
 
 # Install necessary tools
 RUN yum update -y
diff --git a/athena-dynamodb/pom.xml b/athena-dynamodb/pom.xml
@@ -119,7 +119,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.9.0</version>
                 <executions>
                     <execution>
                         <id>copy</id>
diff --git a/athena-dynamodb/src/main/java/com/amazonaws/athena/connectors/dynamodb/resolver/DynamoDBTableResolver.java b/athena-dynamodb/src/main/java/com/amazonaws/athena/connectors/dynamodb/resolver/DynamoDBTableResolver.java
@@ -151,7 +151,7 @@ public DynamoDBTable getTableMetadata(String tableName,
                 return DDBTableUtils.getTable(caseInsensitiveMatch.get(), invoker, ddbClient, awsRequestOverrideConfiguration);
             }
             else {
-                throw e;
+                throw new AthenaConnectorException(e.getMessage(), ErrorDetails.builder().errorCode(FederationSourceErrorCode.ENTITY_NOT_FOUND_EXCEPTION.toString()).build());
             }
         }
     }
diff --git a/athena-elasticsearch/pom.xml b/athena-elasticsearch/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-client</artifactId>
-            <version>9.1.3</version>
+            <version>9.1.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.elasticsearch.client/elasticsearch-rest-high-level-client -->
         <dependency>
diff --git a/athena-federation-integ-test/pom.xml b/athena-federation-integ-test/pom.xml
@@ -117,7 +117,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
              <!--- to meet engine version 3.12.0-->
-            <version>3.18.0</version>
+            <version>3.19.0</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/athena-federation-sdk/pom.xml b/athena-federation-sdk/pom.xml
@@ -184,13 +184,18 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -228,7 +233,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.81</version>
+            <version>1.82</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -260,8 +265,8 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-             <!--- to meet engine version 3.18.0 -->
-            <version>3.18.0</version>
+             <!--- to meet engine version 3.19.0 -->
+            <version>3.19.0</version>
         </dependency>
         <dependency>
             <groupId>net.jqwik</groupId>
@@ -403,7 +408,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>2.6.0</version>
+                <version>2.7.0</version>
                 <configuration>
                     <verbose>false</verbose>
                     <addSvnKeyWords>false</addSvnKeyWords>
diff --git a/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/lambda/security/KmsKeyFactory.java b/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/lambda/security/KmsKeyFactory.java
@@ -20,12 +20,16 @@
  * #L%
  */
 
+import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
+import software.amazon.awssdk.services.glue.model.ErrorDetails;
+import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 import software.amazon.awssdk.services.kms.KmsClient;
 import software.amazon.awssdk.services.kms.model.DataKeySpec;
 import software.amazon.awssdk.services.kms.model.GenerateDataKeyRequest;
 import software.amazon.awssdk.services.kms.model.GenerateDataKeyResponse;
 import software.amazon.awssdk.services.kms.model.GenerateRandomRequest;
 import software.amazon.awssdk.services.kms.model.GenerateRandomResponse;
+import software.amazon.awssdk.services.kms.model.NotFoundException;
 
 /**
  * An EncryptionKeyFactory that is backed by AWS KMS.
@@ -49,12 +53,17 @@ public KmsKeyFactory(KmsClient kmsClient, String masterKeyId)
      */
     public EncryptionKey create()
     {
-        GenerateDataKeyResponse dataKeyResponse =
-                kmsClient.generateDataKey(
-                        GenerateDataKeyRequest.builder()
-                                .keyId(masterKeyId)
-                                .keySpec(DataKeySpec.AES_128)
-                                .build());
+        GenerateDataKeyResponse dataKeyResponse;
+        try {
+            dataKeyResponse = kmsClient.generateDataKey(
+                            GenerateDataKeyRequest.builder()
+                                    .keyId(masterKeyId)
+                                    .keySpec(DataKeySpec.AES_128)
+                                    .build());
+        }
+        catch (NotFoundException e) {
+            throw new AthenaConnectorException(e.getMessage(), ErrorDetails.builder().errorCode(FederationSourceErrorCode.ENTITY_NOT_FOUND_EXCEPTION.toString()).build());
+        }
 
         GenerateRandomRequest randomRequest = GenerateRandomRequest.builder()
                 .numberOfBytes(AesGcmBlockCrypto.NONCE_BYTES)
diff --git a/athena-federation-sdk/src/test/java/com/amazonaws/athena/connector/lambda/security/KmsKeyFactoryTest.java b/athena-federation-sdk/src/test/java/com/amazonaws/athena/connector/lambda/security/KmsKeyFactoryTest.java
@@ -20,13 +20,16 @@
 package com.amazonaws.athena.connector.lambda.security;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
 import software.amazon.awssdk.core.SdkBytes;
@@ -35,6 +38,7 @@
 import software.amazon.awssdk.services.kms.model.GenerateDataKeyResponse;
 import software.amazon.awssdk.services.kms.model.GenerateRandomRequest;
 import software.amazon.awssdk.services.kms.model.GenerateRandomResponse;
+import software.amazon.awssdk.services.kms.model.NotFoundException;
 
 public class KmsKeyFactoryTest {
 
@@ -79,4 +83,16 @@ public void testCreate() {
         verify(mockKmsClient).generateDataKey((GenerateDataKeyRequest) any());
         verify(mockKmsClient).generateRandom((GenerateRandomRequest) any());
     }
+
+    @Test
+    public void testNotFoundException() {
+        NotFoundException exception = NotFoundException.builder()
+                .message("Key not found")
+                .build();
+        when(mockKmsClient.generateDataKey((GenerateDataKeyRequest) any())).thenThrow(exception);
+
+        assertThrows(AthenaConnectorException.class, () -> {
+            kmsKeyFactory.create();
+        });
+    }
 }
diff --git a/athena-gcs/pom.xml b/athena-gcs/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
-            <version>5.17.0</version>
+            <version>5.18.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>2.58.0</version>
+            <version>2.58.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.grpc</groupId>
diff --git a/athena-google-bigquery/pom.xml b/athena-google-bigquery/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
-            <version>5.17.0</version>
+            <version>5.18.1</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awscdk/rds -->
         <dependency>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>4.1.1</version>
+            <version>4.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/athena-hortonworks-hive/pom.xml b/athena-hortonworks-hive/pom.xml
@@ -130,7 +130,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.14</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/athena-jdbc/pom.xml b/athena-jdbc/pom.xml
@@ -146,7 +146,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.9.4</version>
+            <version>4.9.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/athena-kafka/pom.xml b/athena-kafka/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>kafka-avro-serializer</artifactId>
-            <version>8.0.0</version>
+            <version>8.1.0</version>
         </dependency>
         <dependency>
             <groupId>io.confluent</groupId>
@@ -182,7 +182,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.14</version>
                 <configuration>
                     <excludes>
                         <exclude>com/athena/connectors/kafka/dto/*.*</exclude>
diff --git a/athena-msk/pom.xml b/athena-msk/pom.xml
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-stdlib</artifactId>
-                <version>2.2.10</version>
+                <version>2.2.20</version>
             </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
@@ -229,7 +229,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.14</version>
                 <configuration>
                     <excludes>
                         <exclude>com/athena/connectors/msk/dto/*.*</exclude>
diff --git a/athena-neptune/pom.xml b/athena-neptune/pom.xml
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>org.eclipse.rdf4j</groupId>
             <artifactId>rdf4j-repository-sparql</artifactId>
-            <version>5.1.6</version>
+            <version>5.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/athena-oracle/Dockerfile b/athena-oracle/Dockerfile
@@ -3,10 +3,10 @@ ARG JAVA_VERSION=11
 # Use the specified version of Java
 FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
 
-# Argument for Java tool options for ssl
-ARG JAVA_TOOL_OPTIONS="-Djavax.net.ssl.trustStore=/var/lang/lib/security/cacerts"
-# Set the JAVA_TOOL_OPTIONS environment variable for Java 17 and for ssl
-ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
+# Argument for Java tool options
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17 and always include default truststore to avoid SSL handshake issues
+ENV JAVA_TOOL_OPTIONS="-Djavax.net.ssl.trustStore=/var/lang/lib/security/cacerts ${JAVA_TOOL_OPTIONS}"
 
 # Install necessary tools
 RUN yum update -y
diff --git a/athena-postgresql/pom.xml b/athena-postgresql/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.7</version>
+            <version>42.7.8</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
diff --git a/athena-snowflake/pom.xml b/athena-snowflake/pom.xml
diff --git a/athena-snowflake/src/main/java/com/amazonaws/athena/connectors/snowflake/SnowflakeQueryStringBuilder.java b/athena-snowflake/src/main/java/com/amazonaws/athena/connectors/snowflake/SnowflakeQueryStringBuilder.java
diff --git a/athena-snowflake/src/test/java/com/amazonaws/athena/connectors/snowflake/SnowflakeQueryStringBuilderTest.java b/athena-snowflake/src/test/java/com/amazonaws/athena/connectors/snowflake/SnowflakeQueryStringBuilderTest.java
diff --git a/athena-teradata/pom.xml b/athena-teradata/pom.xml
diff --git a/athena-vertica/pom.xml b/athena-vertica/pom.xml
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public DynamoDBTable getTableMetadata(String tableName,`
`151`	`151`	`return DDBTableUtils.getTable(caseInsensitiveMatch.get(), invoker, ddbClient, awsRequestOverrideConfiguration);`
`152`	`152`	`}`
`153`	`153`	`else {`
`154`		`- throw e;`
	`154`	`+ throw new AthenaConnectorException(e.getMessage(), ErrorDetails.builder().errorCode(FederationSourceErrorCode.ENTITY_NOT_FOUND_EXCEPTION.toString()).build());`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`}`