Skip to content

Commit 9bdc590

Browse files
authored
[ML] Upgrade to AWS SDK v2 (#114309)
- Replaced AWS 1.12.740 with 2.28.13 - Removed `aws-java-sdk*` and its transitive dependencies. - Added `awssdk:bedrockruntime` as an `implementations`, all transitive dependencies are added as `api` matching their marked `Compile` in maven. - Added `awssdk:netty-nio-client` as our client implementation, since our v1 integration is using the respective Async client. - Added netty packages as `runtimeOnly` since they are only used during runtime. - Replaced AWS's use of SLF4J-1.7 with our declaration of SLF4J-2.x, since SLF4J includes backwards-compatible bindings. - Migrated all references from the v1 package (`com.amazonaws`) to the v2 package (`software.amazon.awssdk`). Notable changes in the SDK: - *Result objects are renamed to *Response objects. - Objects are now immutable and require Builders to set fields. - Getters no longer have the `get*` prefix, e.g. `getModelId()` is now `modelId()`. - `Future` has been replaced with `CompletableFuture`. - There is no longer a need to invoke the `IdleConnectionReaper`, this is now done when the client is closed. - Builders have a consumer mutation pattern for modifying many fields at once. Security changes: - The underlying Builder objects always check to see if the `.aws/credentials` and `.aws/config` files exist, even if they are not used, so our `plugin-security.policy` now allows reading these files. - The Builder always checks for the `http.proxyHost` property before defaulting to the hardcoded Bedrock URL. Resolve #110590
1 parent 70d9f09 commit 9bdc590

File tree

51 files changed

+1284
-830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1284
-830
lines changed

docs/changelog/114309.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 114309
2+
summary: Upgrade to AWS SDK v2
3+
area: Machine Learning
4+
type: enhancement
5+
issues:
6+
- 110590

gradle/verification-metadata.xml

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,6 +1456,11 @@
14561456
<sha256 value="dfa817a156ea263aa9ad8364a2e226527665c9722aca40a7945f228c2c14f1da" origin="Generated by Gradle"/>
14571457
</artifact>
14581458
</component>
1459+
<component group="io.netty" name="netty-transport-classes-epoll" version="4.1.109.Final">
1460+
<artifact name="netty-transport-classes-epoll-4.1.109.Final.jar">
1461+
<sha256 value="02ce34ba9ab6ecc62de667ed35a8680202a902ec6e90bed587bea2e574fae38d" origin="Generated by Gradle"/>
1462+
</artifact>
1463+
</component>
14591464
<component group="io.netty" name="netty-transport-native-epoll" version="4.1.42.Final">
14601465
<artifact name="netty-transport-native-epoll-4.1.42.Final.jar">
14611466
<sha256 value="3c7d659b3bd773e0ea9b7517d2d6baffa275a3d2ae8eb4c10cb8f0a7724b11d5" origin="Generated by Gradle"/>
@@ -4222,6 +4227,11 @@
42224227
<sha256 value="f75ca597789b3dac58f61857b9ac2e1034a68fa672db35055a8fb4509e325f28" origin="Generated by Gradle"/>
42234228
</artifact>
42244229
</component>
4230+
<component group="org.reactivestreams" name="reactive-streams-tck" version="1.0.4">
4231+
<artifact name="reactive-streams-tck-1.0.4.jar">
4232+
<sha256 value="8423b5062b3f3c5600a85cfad5a6ccbda88129a822be82b2e364d737d53c9836" origin="Generated by Gradle"/>
4233+
</artifact>
4234+
</component>
42254235
<component group="org.redline-rpm" name="redline" version="1.2.10">
42264236
<artifact name="redline-1.2.10.jar">
42274237
<sha256 value="2e074e7bd42174eaeac98cebc782f0d7bcc8dc2a41617932ac9c79d56bc86ecd" origin="Generated by Gradle"/>
@@ -4435,6 +4445,136 @@
44354445
<sha256 value="880c9d896e4b74a06c549c15ca496450165d6909fa15d7e662bee8f6a66d7afa" origin="Generated by Gradle"/>
44364446
</artifact>
44374447
</component>
4448+
<component group="software.amazon.awssdk" name="annotations" version="2.28.13">
4449+
<artifact name="annotations-2.28.13.jar">
4450+
<sha256 value="f8f0df5ee1fcfef0381d167ae50d85ce635b7e5b32d5d620bbb8019f183c6b41" origin="Generated by Gradle"/>
4451+
</artifact>
4452+
</component>
4453+
<component group="software.amazon.awssdk" name="auth" version="2.28.13">
4454+
<artifact name="auth-2.28.13.jar">
4455+
<sha256 value="494db83a2a06f09ba6717bb7fff07d50eb85b0b0d51904bf76601ee48e728741" origin="Generated by Gradle"/>
4456+
</artifact>
4457+
</component>
4458+
<component group="software.amazon.awssdk" name="aws-core" version="2.28.13">
4459+
<artifact name="aws-core-2.28.13.jar">
4460+
<sha256 value="8dd71bedb30d0a4a857cb9e5b30a48e81a66dd9381c13537c2f4639248adba60" origin="Generated by Gradle"/>
4461+
</artifact>
4462+
</component>
4463+
<component group="software.amazon.awssdk" name="aws-json-protocol" version="2.28.13">
4464+
<artifact name="aws-json-protocol-2.28.13.jar">
4465+
<sha256 value="63adac3a637c67f779cc56099e264f1cdd2fc4ac85c27e281b2cad53a693f7d2" origin="Generated by Gradle"/>
4466+
</artifact>
4467+
</component>
4468+
<component group="software.amazon.awssdk" name="bedrockruntime" version="2.28.13">
4469+
<artifact name="bedrockruntime-2.28.13.jar">
4470+
<sha256 value="9ff1571e87a11114407eade316e4439b63275283ff49b6aaf52549c37d8e6a92" origin="Generated by Gradle"/>
4471+
</artifact>
4472+
</component>
4473+
<component group="software.amazon.awssdk" name="checksums" version="2.28.13">
4474+
<artifact name="checksums-2.28.13.jar">
4475+
<sha256 value="b4d452f8ceddf0e9a4874a9cfd65e62c257fef4c2b3b942893f590e09e945eca" origin="Generated by Gradle"/>
4476+
</artifact>
4477+
</component>
4478+
<component group="software.amazon.awssdk" name="checksums-spi" version="2.28.13">
4479+
<artifact name="checksums-spi-2.28.13.jar">
4480+
<sha256 value="20dfb45d582c175e48aa50237fd44704e31e91418b5d3da1092508dbcb9a4d11" origin="Generated by Gradle"/>
4481+
</artifact>
4482+
</component>
4483+
<component group="software.amazon.awssdk" name="endpoints-spi" version="2.28.13">
4484+
<artifact name="endpoints-spi-2.28.13.jar">
4485+
<sha256 value="b18dd1d66f03bf5e192ab51d7f3a8139e5bf1e7bab27501b00338f1d8e260f61" origin="Generated by Gradle"/>
4486+
</artifact>
4487+
</component>
4488+
<component group="software.amazon.awssdk" name="http-auth" version="2.28.13">
4489+
<artifact name="http-auth-2.28.13.jar">
4490+
<sha256 value="aeb18af3ba2c8b60b1012122737dc613e1b8d68558d69da301ba1c6a19e12593" origin="Generated by Gradle"/>
4491+
</artifact>
4492+
</component>
4493+
<component group="software.amazon.awssdk" name="http-auth-aws" version="2.28.13">
4494+
<artifact name="http-auth-aws-2.28.13.jar">
4495+
<sha256 value="cd0303e19ae51e8bb4dc1e454ef6e46e54ef865cf80988d775cfa8edb48ca975" origin="Generated by Gradle"/>
4496+
</artifact>
4497+
</component>
4498+
<component group="software.amazon.awssdk" name="http-auth-aws-eventstream" version="2.28.13">
4499+
<artifact name="http-auth-aws-eventstream-2.28.13.jar">
4500+
<sha256 value="55da99bf20179255f1da5551f41192095bf36eb8ab97b08f1a430f50bbb61733" origin="Generated by Gradle"/>
4501+
</artifact>
4502+
</component>
4503+
<component group="software.amazon.awssdk" name="http-auth-spi" version="2.28.13">
4504+
<artifact name="http-auth-spi-2.28.13.jar">
4505+
<sha256 value="61a142852865dc050006ff6ab61e59780d296e7b2721d578db255c4dc31be083" origin="Generated by Gradle"/>
4506+
</artifact>
4507+
</component>
4508+
<component group="software.amazon.awssdk" name="http-client-spi" version="2.28.13">
4509+
<artifact name="http-client-spi-2.28.13.jar">
4510+
<sha256 value="827763cbf43131d9542a58546a5252a4f6c4f32b861f755e339cb4c85e74f4c8" origin="Generated by Gradle"/>
4511+
</artifact>
4512+
</component>
4513+
<component group="software.amazon.awssdk" name="identity-spi" version="2.28.13">
4514+
<artifact name="identity-spi-2.28.13.jar">
4515+
<sha256 value="8baf158caf32cbab7cfdc2fabf48bac90e737917703c2a6e0502f46c46e3ef71" origin="Generated by Gradle"/>
4516+
</artifact>
4517+
</component>
4518+
<component group="software.amazon.awssdk" name="json-utils" version="2.28.13">
4519+
<artifact name="json-utils-2.28.13.jar">
4520+
<sha256 value="369ed42586213a33bc7f94e9d21594ee64fec1152819476c24c82b312b27b170" origin="Generated by Gradle"/>
4521+
</artifact>
4522+
</component>
4523+
<component group="software.amazon.awssdk" name="metrics-spi" version="2.28.13">
4524+
<artifact name="metrics-spi-2.28.13.jar">
4525+
<sha256 value="5ba10e6cf4882455eb27f6cb3b72832ea01d9bdf260c2c7fe80442b997af951b" origin="Generated by Gradle"/>
4526+
</artifact>
4527+
</component>
4528+
<component group="software.amazon.awssdk" name="netty-nio-client" version="2.28.13">
4529+
<artifact name="netty-nio-client-2.28.13.jar">
4530+
<sha256 value="d382c2fc88121faa4a523e48683d22694f47638428741a1cf67985dd893de560" origin="Generated by Gradle"/>
4531+
</artifact>
4532+
</component>
4533+
<component group="software.amazon.awssdk" name="profiles" version="2.28.13">
4534+
<artifact name="profiles-2.28.13.jar">
4535+
<sha256 value="1889896c4a2714c3ae9ebd9c7be430c8b7add52fcd7561b4cdca70f41d225902" origin="Generated by Gradle"/>
4536+
</artifact>
4537+
</component>
4538+
<component group="software.amazon.awssdk" name="protocol-core" version="2.28.13">
4539+
<artifact name="protocol-core-2.28.13.jar">
4540+
<sha256 value="86bd64f9c897058578a7153d7d1dbc1ce4fcf7025b5b2651f4b3404144dbeba4" origin="Generated by Gradle"/>
4541+
</artifact>
4542+
</component>
4543+
<component group="software.amazon.awssdk" name="regions" version="2.28.13">
4544+
<artifact name="regions-2.28.13.jar">
4545+
<sha256 value="97051ca69715150e1bc3f12f89e05692585a0f1e8a6901699d1fe07cad9a348f" origin="Generated by Gradle"/>
4546+
</artifact>
4547+
</component>
4548+
<component group="software.amazon.awssdk" name="retries" version="2.28.13">
4549+
<artifact name="retries-2.28.13.jar">
4550+
<sha256 value="3bf13cc6ba9dabf41009fcf8b9f31d936340d8b565b2bf83aa030d12494e8d18" origin="Generated by Gradle"/>
4551+
</artifact>
4552+
</component>
4553+
<component group="software.amazon.awssdk" name="retries-spi" version="2.28.13">
4554+
<artifact name="retries-spi-2.28.13.jar">
4555+
<sha256 value="d30595d38eb17929afe724290667873828f9c4c79dd5d5b8d3ae902318e6495f" origin="Generated by Gradle"/>
4556+
</artifact>
4557+
</component>
4558+
<component group="software.amazon.awssdk" name="sdk-core" version="2.28.13">
4559+
<artifact name="sdk-core-2.28.13.jar">
4560+
<sha256 value="1072f71dd15f89596c63d30bdb779e0956eb4380f94c8b75d675d01846711df3" origin="Generated by Gradle"/>
4561+
</artifact>
4562+
</component>
4563+
<component group="software.amazon.awssdk" name="third-party-jackson-core" version="2.28.13">
4564+
<artifact name="third-party-jackson-core-2.28.13.jar">
4565+
<sha256 value="3782d94baf0d396f7687d186b3fe0f3ffdbab9d610f0099b782ae9d802387183" origin="Generated by Gradle"/>
4566+
</artifact>
4567+
</component>
4568+
<component group="software.amazon.awssdk" name="utils" version="2.28.13">
4569+
<artifact name="utils-2.28.13.jar">
4570+
<sha256 value="c0ab5446f8009bde04a09de880804c5bda30cf8f69ce857116c1f99606c67069" origin="Generated by Gradle"/>
4571+
</artifact>
4572+
</component>
4573+
<component group="software.amazon.eventstream" name="eventstream" version="1.0.1">
4574+
<artifact name="eventstream-1.0.1.jar">
4575+
<sha256 value="0c37d8e696117f02c302191b8110b0d0eb20fa412fce34c3a269ec73c16ce822" origin="Generated by Gradle"/>
4576+
</artifact>
4577+
</component>
44384578
<component group="ua.net.nlp" name="morfologik-ukrainian-search" version="3.7.5">
44394579
<artifact name="morfologik-ukrainian-search-3.7.5.jar">
44404580
<sha256 value="1c7e5f7158e02bd35924a73a85958313c95a00d0973f830d0d19a8268a35a668" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)