Merge branch 'master' into panama-sdkv2-gdcv2

awslabs · Nov 20, 2024 · a1c288b · a1c288b
2 parents 5fe1b3c + c9d6c1f
commit a1c288b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/athena-cloudwatch/pom.xml b/athena-cloudwatch/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>cloudwatchlogs</artifactId>
-            <version>2.29.9</version>
+            <version>2.29.15</version>
             <exclusions>
                 <!-- replaced with jcl-over-slf4j -->
                 <exclusion>

diff --git a/...a-dynamodb/src/main/java/com/amazonaws/athena/connectors/dynamodb/util/DDBTableUtils.java b/...a-dynamodb/src/main/java/com/amazonaws/athena/connectors/dynamodb/util/DDBTableUtils.java
@@ -21,7 +21,6 @@
 
 import com.amazonaws.athena.connector.lambda.ThrottlingInvoker;
 import com.amazonaws.athena.connector.lambda.data.SchemaBuilder;
-import com.amazonaws.athena.connector.lambda.exceptions.AthenaConnectorException;
 import com.amazonaws.athena.connectors.dynamodb.model.DynamoDBIndex;
 import com.amazonaws.athena.connectors.dynamodb.model.DynamoDBTable;
 import com.google.common.collect.ImmutableList;
@@ -42,8 +41,6 @@
 import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
 import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
 import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import software.amazon.awssdk.services.glue.model.ErrorDetails;
-import software.amazon.awssdk.services.glue.model.FederationSourceErrorCode;
 
 import java.util.List;
 import java.util.Map;
@@ -170,7 +167,7 @@ public static Schema peekTableForSchema(String tableName, ThrottlingInvoker invo
                 logger.warn("Failed to retrieve table schema due to KMS issue, empty schema for table: {}. Error Message: {}", tableName, runtimeException.getMessage());
             }
             else {
-                throw new AthenaConnectorException(runtimeException.getMessage(), ErrorDetails.builder().errorCode(FederationSourceErrorCode.OPERATION_TIMEOUT_EXCEPTION.toString()).build());
+                throw runtimeException;
             }
         }
         return schemaBuilder.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>8.15.3</version>
+            <version>8.16.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.elasticsearch.client/elasticsearch-rest-high-level-client -->
         <dependency>

diff --git a/athena-msk/pom.xml b/athena-msk/pom.xml
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>software.amazon.glue</groupId>
             <artifactId>schema-registry-serde</artifactId>
-            <version>1.1.21</version>
+            <version>1.1.22</version>
         </dependency>
         <dependency>
             <groupId>io.confluent</groupId>

diff --git a/pom.xml b/pom.xml
@@ -14,11 +14,11 @@
         <maven.compiler.release>11</maven.compiler.release>
         <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
         <!--- to meet engine version 1.12.533-->
-        <aws-sdk-v2.version>2.29.9</aws-sdk-v2.version>
+        <aws-sdk-v2.version>2.29.15</aws-sdk-v2.version>
         <aws.lambda-java-core.version>1.2.2</aws.lambda-java-core.version>
         <aws.lambda-java-log4j2.version>1.6.0</aws.lambda-java-log4j2.version>
         <aws-cdk.version>1.204.0</aws-cdk.version>
-        <jsii.version>1.104.0</jsii.version>
+        <jsii.version>1.105.0</jsii.version>
         <!--- to meet engine version 2.0.7-->
         <slf4j-log4j.version>2.0.16</slf4j-log4j.version>
         <mockito.version>4.11.0</mockito.version>