You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by da...@apache.org on 2023/04/26 14:31:15 UTC
[flink-connector-aws] branch main updated: [FLINK-31675][Connectors/AWS] Update AWS SDKv2 to v2.20.32 for 4.x (#68)
This is an automated email from the ASF dual-hosted git repository.
dannycranmer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-aws.git
The following commit(s) were added to refs/heads/main by this push:
new 9a51b52 [FLINK-31675][Connectors/AWS] Update AWS SDKv2 to v2.20.32 for 4.x (#68)
9a51b52 is described below
commit 9a51b5242563f2870148a62e07ef6e9763050519
Author: antovespoli <71...@users.noreply.github.com>
AuthorDate: Wed Apr 26 15:31:10 2023 +0100
[FLINK-31675][Connectors/AWS] Update AWS SDKv2 to v2.20.32 for 4.x (#68)
* [FLINK-31675][Connectors/AWS] Update AWS SDKv2 to v2.20.32 for 4.x
---------
Co-authored-by: Antonio Vespoli <av...@amazon.com>
---
.../dynamodb/sink/DynamoDbSinkWriterTest.java | 16 +++++++++
.../src/main/resources/META-INF/NOTICE | 42 +++++++++++-----------
.../kinesis/testutils/FakeKinesisAsyncClient.java | 6 ++++
.../kinesis/testutils/FakeKinesisSyncClient.java | 6 ++++
.../src/main/resources/META-INF/NOTICE | 38 ++++++++++----------
.../src/main/resources/META-INF/NOTICE | 42 +++++++++++-----------
.../src/main/resources/META-INF/NOTICE | 40 ++++++++++-----------
.../flink/connectors/kinesis/PackagingITCase.java | 15 +++++++-
pom.xml | 2 +-
9 files changed, 124 insertions(+), 83 deletions(-)
diff --git a/flink-connector-dynamodb/src/test/java/org/apache/flink/connector/dynamodb/sink/DynamoDbSinkWriterTest.java b/flink-connector-dynamodb/src/test/java/org/apache/flink/connector/dynamodb/sink/DynamoDbSinkWriterTest.java
index 9a178e7..51a500e 100644
--- a/flink-connector-dynamodb/src/test/java/org/apache/flink/connector/dynamodb/sink/DynamoDbSinkWriterTest.java
+++ b/flink-connector-dynamodb/src/test/java/org/apache/flink/connector/dynamodb/sink/DynamoDbSinkWriterTest.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbServiceClientConfiguration;
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
@@ -480,6 +481,11 @@ public class DynamoDbSinkWriterTest {
return CompletableFuture.completedFuture(BatchWriteItemResponse.builder().build());
}
+ @Override
+ public DynamoDbServiceClientConfiguration serviceClientConfiguration() {
+ return DynamoDbServiceClientConfiguration.builder().build();
+ }
+
public List<List<WriteRequest>> getRequestHistory() {
return requestHistory;
}
@@ -535,6 +541,11 @@ public class DynamoDbSinkWriterTest {
}
return CompletableFuture.completedFuture(responseBuilder.build());
}
+
+ @Override
+ public DynamoDbServiceClientConfiguration serviceClientConfiguration() {
+ return DynamoDbServiceClientConfiguration.builder().build();
+ }
}
private static class FailingRecordsDynamoDbAsyncClient implements DynamoDbAsyncClient {
@@ -588,5 +599,10 @@ public class DynamoDbSinkWriterTest {
}
return CompletableFuture.completedFuture(responseBuilder.build());
}
+
+ @Override
+ public DynamoDbServiceClientConfiguration serviceClientConfiguration() {
+ return DynamoDbServiceClientConfiguration.builder().build();
+ }
}
}
diff --git a/flink-connector-kinesis/src/main/resources/META-INF/NOTICE b/flink-connector-kinesis/src/main/resources/META-INF/NOTICE
index 58e4183..acc0646 100644
--- a/flink-connector-kinesis/src/main/resources/META-INF/NOTICE
+++ b/flink-connector-kinesis/src/main/resources/META-INF/NOTICE
@@ -8,27 +8,27 @@ This project bundles the following dependencies under the Apache Software Licens
- software.amazon.ion:ion-java:1.0.2
- software.amazon.eventstream:eventstream:1.0.1
-- software.amazon.awssdk:utils:2.19.14
-- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.19.14
-- software.amazon.awssdk:third-party-jackson-core:2.19.14
-- software.amazon.awssdk:sts:2.19.14
-- software.amazon.awssdk:sdk-core:2.19.14
-- software.amazon.awssdk:regions:2.19.14
-- software.amazon.awssdk:protocol-core:2.19.14
-- software.amazon.awssdk:profiles:2.19.14
-- software.amazon.awssdk:netty-nio-client:2.19.14
-- software.amazon.awssdk:metrics-spi:2.19.14
-- software.amazon.awssdk:kinesis:2.19.14
-- software.amazon.awssdk:json-utils:2.19.14
-- software.amazon.awssdk:http-client-spi:2.19.14
-- software.amazon.awssdk:endpoints-spi:2.19.14
-- software.amazon.awssdk:aws-query-protocol:2.19.14
-- software.amazon.awssdk:aws-json-protocol:2.19.14
-- software.amazon.awssdk:aws-core:2.19.14
-- software.amazon.awssdk:aws-cbor-protocol:2.19.14
-- software.amazon.awssdk:auth:2.19.14
-- software.amazon.awssdk:apache-client:2.19.14
-- software.amazon.awssdk:annotations:2.19.14
+- software.amazon.awssdk:utils:2.20.32
+- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.20.32
+- software.amazon.awssdk:third-party-jackson-core:2.20.32
+- software.amazon.awssdk:sts:2.20.32
+- software.amazon.awssdk:sdk-core:2.20.32
+- software.amazon.awssdk:regions:2.20.32
+- software.amazon.awssdk:protocol-core:2.20.32
+- software.amazon.awssdk:profiles:2.20.32
+- software.amazon.awssdk:netty-nio-client:2.20.32
+- software.amazon.awssdk:metrics-spi:2.20.32
+- software.amazon.awssdk:kinesis:2.20.32
+- software.amazon.awssdk:json-utils:2.20.32
+- software.amazon.awssdk:http-client-spi:2.20.32
+- software.amazon.awssdk:endpoints-spi:2.20.32
+- software.amazon.awssdk:aws-query-protocol:2.20.32
+- software.amazon.awssdk:aws-json-protocol:2.20.32
+- software.amazon.awssdk:aws-core:2.20.32
+- software.amazon.awssdk:aws-cbor-protocol:2.20.32
+- software.amazon.awssdk:auth:2.20.32
+- software.amazon.awssdk:apache-client:2.20.32
+- software.amazon.awssdk:annotations:2.20.32
- org.apache.httpcomponents:httpcore:4.4.14
- org.apache.httpcomponents:httpclient:4.5.13
- io.netty:netty-transport:4.1.86.Final
diff --git a/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/testutils/FakeKinesisAsyncClient.java b/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/testutils/FakeKinesisAsyncClient.java
index 831a757..94b17a0 100644
--- a/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/testutils/FakeKinesisAsyncClient.java
+++ b/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/testutils/FakeKinesisAsyncClient.java
@@ -18,6 +18,7 @@
package org.apache.flink.streaming.connectors.kinesis.testutils;
import software.amazon.awssdk.services.kinesis.KinesisAsyncClient;
+import software.amazon.awssdk.services.kinesis.KinesisServiceClientConfiguration;
import software.amazon.awssdk.services.kinesis.model.AddTagsToStreamRequest;
import software.amazon.awssdk.services.kinesis.model.AddTagsToStreamResponse;
import software.amazon.awssdk.services.kinesis.model.CreateStreamRequest;
@@ -464,6 +465,11 @@ public class FakeKinesisAsyncClient implements KinesisAsyncClient {
return KinesisAsyncClient.super.waiter();
}
+ @Override
+ public KinesisServiceClientConfiguration serviceClientConfiguration() {
+ return KinesisServiceClientConfiguration.builder().build();
+ }
+
@Override
public String serviceName() {
return null;
diff --git a/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/testutils/FakeKinesisSyncClient.java b/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/testutils/FakeKinesisSyncClient.java
index be63843..ff87a5b 100644
--- a/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/testutils/FakeKinesisSyncClient.java
+++ b/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/testutils/FakeKinesisSyncClient.java
@@ -20,6 +20,7 @@ package org.apache.flink.streaming.connectors.kinesis.testutils;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.services.kinesis.KinesisClient;
+import software.amazon.awssdk.services.kinesis.KinesisServiceClientConfiguration;
import software.amazon.awssdk.services.kinesis.model.AddTagsToStreamRequest;
import software.amazon.awssdk.services.kinesis.model.AddTagsToStreamResponse;
import software.amazon.awssdk.services.kinesis.model.CreateStreamRequest;
@@ -667,4 +668,9 @@ public class FakeKinesisSyncClient implements KinesisClient {
public KinesisWaiter waiter() {
return null;
}
+
+ @Override
+ public KinesisServiceClientConfiguration serviceClientConfiguration() {
+ return KinesisServiceClientConfiguration.builder().build();
+ }
}
diff --git a/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE b/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE
index dcf2dbb..4b4f8a5 100644
--- a/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE
+++ b/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE
@@ -7,25 +7,25 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- software.amazon.awssdk:utils:2.19.14
-- software.amazon.awssdk:third-party-jackson-core:2.19.14
-- software.amazon.awssdk:sts:2.19.14
-- software.amazon.awssdk:sdk-core:2.19.14
-- software.amazon.awssdk:regions:2.19.14
-- software.amazon.awssdk:protocol-core:2.19.14
-- software.amazon.awssdk:profiles:2.19.14
-- software.amazon.awssdk:netty-nio-client:2.19.14
-- software.amazon.awssdk:metrics-spi:2.19.14
-- software.amazon.awssdk:json-utils:2.19.14
-- software.amazon.awssdk:http-client-spi:2.19.14
-- software.amazon.awssdk:firehose:2.19.14
-- software.amazon.awssdk:endpoints-spi:2.19.14
-- software.amazon.awssdk:aws-query-protocol:2.19.14
-- software.amazon.awssdk:aws-json-protocol:2.19.14
-- software.amazon.awssdk:aws-core:2.19.14
-- software.amazon.awssdk:auth:2.19.14
-- software.amazon.awssdk:apache-client:2.19.14
-- software.amazon.awssdk:annotations:2.19.14
+- software.amazon.awssdk:utils:2.20.32
+- software.amazon.awssdk:third-party-jackson-core:2.20.32
+- software.amazon.awssdk:sts:2.20.32
+- software.amazon.awssdk:sdk-core:2.20.32
+- software.amazon.awssdk:regions:2.20.32
+- software.amazon.awssdk:protocol-core:2.20.32
+- software.amazon.awssdk:profiles:2.20.32
+- software.amazon.awssdk:netty-nio-client:2.20.32
+- software.amazon.awssdk:metrics-spi:2.20.32
+- software.amazon.awssdk:json-utils:2.20.32
+- software.amazon.awssdk:http-client-spi:2.20.32
+- software.amazon.awssdk:firehose:2.20.32
+- software.amazon.awssdk:endpoints-spi:2.20.32
+- software.amazon.awssdk:aws-query-protocol:2.20.32
+- software.amazon.awssdk:aws-json-protocol:2.20.32
+- software.amazon.awssdk:aws-core:2.20.32
+- software.amazon.awssdk:auth:2.20.32
+- software.amazon.awssdk:apache-client:2.20.32
+- software.amazon.awssdk:annotations:2.20.32
- org.apache.httpcomponents:httpcore:4.4.14
- org.apache.httpcomponents:httpclient:4.5.13
- io.netty:netty-transport:4.1.86.Final
diff --git a/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE b/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE
index 2e45b72..2fb089e 100644
--- a/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE
+++ b/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE
@@ -7,27 +7,27 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- software.amazon.awssdk:utils:2.19.14
-- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.19.14
-- software.amazon.awssdk:third-party-jackson-core:2.19.14
-- software.amazon.awssdk:sts:2.19.14
-- software.amazon.awssdk:sdk-core:2.19.14
-- software.amazon.awssdk:regions:2.19.14
-- software.amazon.awssdk:protocol-core:2.19.14
-- software.amazon.awssdk:profiles:2.19.14
-- software.amazon.awssdk:netty-nio-client:2.19.14
-- software.amazon.awssdk:metrics-spi:2.19.14
-- software.amazon.awssdk:kinesis:2.19.14
-- software.amazon.awssdk:json-utils:2.19.14
-- software.amazon.awssdk:http-client-spi:2.19.14
-- software.amazon.awssdk:endpoints-spi:2.19.14
-- software.amazon.awssdk:aws-query-protocol:2.19.14
-- software.amazon.awssdk:aws-json-protocol:2.19.14
-- software.amazon.awssdk:aws-core:2.19.14
-- software.amazon.awssdk:aws-cbor-protocol:2.19.14
-- software.amazon.awssdk:auth:2.19.14
-- software.amazon.awssdk:apache-client:2.19.14
-- software.amazon.awssdk:annotations:2.19.14
+- software.amazon.awssdk:utils:2.20.32
+- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.20.32
+- software.amazon.awssdk:third-party-jackson-core:2.20.32
+- software.amazon.awssdk:sts:2.20.32
+- software.amazon.awssdk:sdk-core:2.20.32
+- software.amazon.awssdk:regions:2.20.32
+- software.amazon.awssdk:protocol-core:2.20.32
+- software.amazon.awssdk:profiles:2.20.32
+- software.amazon.awssdk:netty-nio-client:2.20.32
+- software.amazon.awssdk:metrics-spi:2.20.32
+- software.amazon.awssdk:kinesis:2.20.32
+- software.amazon.awssdk:json-utils:2.20.32
+- software.amazon.awssdk:http-client-spi:2.20.32
+- software.amazon.awssdk:endpoints-spi:2.20.32
+- software.amazon.awssdk:aws-query-protocol:2.20.32
+- software.amazon.awssdk:aws-json-protocol:2.20.32
+- software.amazon.awssdk:aws-core:2.20.32
+- software.amazon.awssdk:aws-cbor-protocol:2.20.32
+- software.amazon.awssdk:auth:2.20.32
+- software.amazon.awssdk:apache-client:2.20.32
+- software.amazon.awssdk:annotations:2.20.32
- org.apache.httpcomponents:httpcore:4.4.14
- org.apache.httpcomponents:httpclient:4.5.13
- io.netty:netty-transport:4.1.86.Final
diff --git a/flink-sql-connector-dynamodb/src/main/resources/META-INF/NOTICE b/flink-sql-connector-dynamodb/src/main/resources/META-INF/NOTICE
index 6142a45..0670c76 100644
--- a/flink-sql-connector-dynamodb/src/main/resources/META-INF/NOTICE
+++ b/flink-sql-connector-dynamodb/src/main/resources/META-INF/NOTICE
@@ -7,26 +7,26 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- software.amazon.awssdk:utils:2.19.14
-- software.amazon.awssdk:third-party-jackson-core:2.19.14
-- software.amazon.awssdk:sts:2.19.14
-- software.amazon.awssdk:sdk-core:2.19.14
-- software.amazon.awssdk:regions:2.19.14
-- software.amazon.awssdk:protocol-core:2.19.14
-- software.amazon.awssdk:profiles:2.19.14
-- software.amazon.awssdk:netty-nio-client:2.19.14
-- software.amazon.awssdk:metrics-spi:2.19.14
-- software.amazon.awssdk:json-utils:2.19.14
-- software.amazon.awssdk:http-client-spi:2.19.14
-- software.amazon.awssdk:endpoints-spi:2.19.14
-- software.amazon.awssdk:dynamodb:2.19.14
-- software.amazon.awssdk:dynamodb-enhanced:2.19.14
-- software.amazon.awssdk:aws-query-protocol:2.19.14
-- software.amazon.awssdk:aws-json-protocol:2.19.14
-- software.amazon.awssdk:aws-core:2.19.14
-- software.amazon.awssdk:auth:2.19.14
-- software.amazon.awssdk:apache-client:2.19.14
-- software.amazon.awssdk:annotations:2.19.14
+- software.amazon.awssdk:utils:2.20.32
+- software.amazon.awssdk:third-party-jackson-core:2.20.32
+- software.amazon.awssdk:sts:2.20.32
+- software.amazon.awssdk:sdk-core:2.20.32
+- software.amazon.awssdk:regions:2.20.32
+- software.amazon.awssdk:protocol-core:2.20.32
+- software.amazon.awssdk:profiles:2.20.32
+- software.amazon.awssdk:netty-nio-client:2.20.32
+- software.amazon.awssdk:metrics-spi:2.20.32
+- software.amazon.awssdk:json-utils:2.20.32
+- software.amazon.awssdk:http-client-spi:2.20.32
+- software.amazon.awssdk:endpoints-spi:2.20.32
+- software.amazon.awssdk:dynamodb:2.20.32
+- software.amazon.awssdk:dynamodb-enhanced:2.20.32
+- software.amazon.awssdk:aws-query-protocol:2.20.32
+- software.amazon.awssdk:aws-json-protocol:2.20.32
+- software.amazon.awssdk:aws-core:2.20.32
+- software.amazon.awssdk:auth:2.20.32
+- software.amazon.awssdk:apache-client:2.20.32
+- software.amazon.awssdk:annotations:2.20.32
- org.apache.httpcomponents:httpcore:4.4.14
- org.apache.httpcomponents:httpclient:4.5.13
- io.netty:netty-transport:4.1.86.Final
diff --git a/flink-sql-connector-kinesis/src/test/java/org/apache/flink/connectors/kinesis/PackagingITCase.java b/flink-sql-connector-kinesis/src/test/java/org/apache/flink/connectors/kinesis/PackagingITCase.java
index fb4404c..a45a79a 100644
--- a/flink-sql-connector-kinesis/src/test/java/org/apache/flink/connectors/kinesis/PackagingITCase.java
+++ b/flink-sql-connector-kinesis/src/test/java/org/apache/flink/connectors/kinesis/PackagingITCase.java
@@ -40,7 +40,20 @@ class PackagingITCase {
"META-INF/",
"amazon-kinesis-producer-native-binaries/",
"cacerts/",
- "google/"));
+ "google/",
+ "LICENSE",
+ "io/",
+ "javax/",
+ ".gitkeep",
+ "software/amazon/",
+ "com/esotericsoftware/",
+ "com/fasterxml/",
+ "com/ibm/",
+ "com/amazonaws/",
+ "com/ibm/",
+ "org/objenesis/",
+ "org/reactivestreams/",
+ "org/slf4j/"));
PackagingTestUtils.assertJarContainsServiceEntry(jar, Factory.class);
}
}
diff --git a/pom.xml b/pom.xml
index 5d4921f..e5d57af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@ under the License.
<properties>
<aws.sdkv1.version>1.12.276</aws.sdkv1.version>
- <aws.sdkv2.version>2.19.14</aws.sdkv2.version>
+ <aws.sdkv2.version>2.20.32</aws.sdkv2.version>
<netty.version>4.1.86.Final</netty.version>
<flink.version>1.16.0</flink.version>
<flink.shaded.version>16.0</flink.shaded.version>