Skip to content

Commit 0de7e4d

Browse files
committed
Merge branch 'main' of github.com:awslabs/aws-sdk-kotlin into fix-jdk21
2 parents 67aab10 + f7790f7 commit 0de7e4d

File tree

25 files changed

+2068
-573
lines changed

25 files changed

+2068
-573
lines changed

.changes/fb53db86-ba89-44ae-86e3-1c85abb9c217.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/release-readiness.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ description: >
55
66
on:
77
pull_request:
8+
types: [ opened, synchronize, reopened, labeled, unlabeled ]
89
branches: [ main ]
910

1011
jobs:

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# Changelog
22

3+
## [1.4.110] - 06/21/2025
4+
5+
## [1.4.109] - 06/20/2025
6+
7+
### Features
8+
* (**bedrock**) Add support for tiers in Content Filters and Denied Topics for Amazon Bedrock Guardrails.
9+
* (**ecs**) Add ECS support for Windows Server 2025
10+
* (**geoplaces**) Geocode, ReverseGeocode, and GetPlace APIs added Intersections and SecondaryAddresses. To use, add to the AdditionalFeatures list in your request. This provides info about nearby intersections and secondary addresses that are associated with a main address. Also added MainAddress and ParsedQuery.
11+
* (**glue**) AWS Glue Data Quality now provides aggregated metrics in evaluation results when publishAggregatedMetrics with row-level results are enabled. These metrics include summary statistics showing total counts of processed, passed, and failed rows and rules in a single view.
12+
* (**mediaconvert**) This release adds a new SPECIFIED_OPTIMAL option for handling DDS when using DVB-Sub with high resolution video.
13+
14+
## [1.4.108] - 06/19/2025
15+
16+
### Features
17+
* (**bedrock**) This release of the SDK has the API and documentation for the createcustommodel API. This feature lets you copy a trained model into Amazon Bedrock for inference.
18+
* (**emrserverless**) This release adds the capability to enable IAM IdentityCenter Trusted Identity Propagation for users running Interactive Sessions on EMR Serverless Applications.
19+
* (**lambda**) Support Schema Registry feature for Kafka Event Source Mapping. Customers can now configure a Schema Registry to enable schema validation and filtering for Avro, Protobuf, and JSON-formatted events in Lambda for Kafka Event Source.
20+
* (**paymentcryptography**) Additional support for managing HMAC keys that adheres to changes documented in X9.143-2021 and provides better interoperability for key import/export
21+
* (**paymentcryptographydata**) Additional support for managing HMAC keys that adheres to changes documented in X9.143-2021 and provides better interoperability for key import/export
22+
* (**sagemaker**) This release introduces alternative support for utilizing CFN templates from S3 for SageMaker Projects.
23+
24+
### Miscellaneous
25+
* Upgrade to Dokka 2.0.0
26+
327
## [1.4.107] - 06/18/2025
428

529
### Features

aws-runtime/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,12 @@ dependencies {
8080
it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the subproject
8181
dokka(project(it.path)) // Aggregate the subprojects' generated documentation
8282
}
83+
84+
// Preserve Dokka v1 module paths
85+
// https://kotlinlang.org/docs/dokka-migration.html#revert-to-the-dgp-v1-directory-behavior
86+
subprojects {
87+
dokka {
88+
modulePath = this@subprojects.name
89+
}
90+
}
8391
}

buildSrc/src/main/kotlin/dokka-convention.gradle.kts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,15 @@ tasks.register("trimNavigationFiles") {
9797
val navigation = moduleDir.resolve("navigation.html").toFile()
9898
val doc = Jsoup.parse(navigation)
9999

100-
// Fix navigation links
101-
doc.select("a[href^='../../../../']").forEach { anchor ->
102-
val originalHref = anchor.attr("href")
103-
val trimmedHref = originalHref.replace("../../../../", "")
104-
anchor.attr("href", trimmedHref)
100+
// Remove all parent directory elements from all navigation links
101+
doc.select("a[href^=../]").forEach { anchor ->
102+
var href = anchor.attr("href")
103+
104+
while (href.startsWith("../")) {
105+
href = href.removePrefix("../")
106+
}
107+
108+
anchor.attr("href", href)
105109
}
106110

107111
// Trim side menus

codegen/aws-sdk-codegen/src/main/resources/aws/sdk/kotlin/codegen/endpoints.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,12 +2881,15 @@
28812881
"tags" : [ "dualstack" ]
28822882
} ]
28832883
},
2884+
"ap-southeast-5" : { },
2885+
"ap-southeast-7" : { },
28842886
"ca-central-1" : {
28852887
"variants" : [ {
28862888
"hostname" : "appsync.ca-central-1.api.aws",
28872889
"tags" : [ "dualstack" ]
28882890
} ]
28892891
},
2892+
"ca-west-1" : { },
28902893
"eu-central-1" : {
28912894
"variants" : [ {
28922895
"hostname" : "appsync.eu-central-1.api.aws",
@@ -14795,6 +14798,7 @@
1479514798
"tags" : [ "dualstack" ]
1479614799
} ]
1479714800
},
14801+
"ap-east-2" : { },
1479814802
"ap-northeast-1" : {
1479914803
"variants" : [ {
1480014804
"hostname" : "lakeformation.ap-northeast-1.api.aws",

codegen/sdk/aws-models/bedrock.json

Lines changed: 125 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2786,7 +2786,7 @@
27862786
"min": 20,
27872787
"max": 1011
27882788
},
2789-
"smithy.api#pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:custom-model/(imported|[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}/[a-z0-9]{12})$"
2789+
"smithy.api#pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:custom-model/(imported|[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2})/[a-z0-9]{12}$"
27902790
}
27912791
},
27922792
"com.amazonaws.bedrock#CustomModelName": {
@@ -6845,6 +6845,56 @@
68456845
}
68466846
}
68476847
},
6848+
"com.amazonaws.bedrock#GuardrailContentFiltersTier": {
6849+
"type": "structure",
6850+
"members": {
6851+
"tierName": {
6852+
"target": "com.amazonaws.bedrock#GuardrailContentFiltersTierName",
6853+
"traits": {
6854+
"smithy.api#documentation": "<p>The tier that your guardrail uses for content filters. Valid values include:</p> <ul> <li> <p> <code>CLASSIC</code> tier – Provides established guardrails functionality supporting English, French, and Spanish languages.</p> </li> <li> <p> <code>STANDARD</code> tier – Provides a more robust solution than the <code>CLASSIC</code> tier and has more comprehensive language support. This tier requires that your guardrail use <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails-cross-region.html\">cross-Region inference</a>.</p> </li> </ul>",
6855+
"smithy.api#required": {}
6856+
}
6857+
}
6858+
},
6859+
"traits": {
6860+
"smithy.api#documentation": "<p>The tier that your guardrail uses for content filters.</p>"
6861+
}
6862+
},
6863+
"com.amazonaws.bedrock#GuardrailContentFiltersTierConfig": {
6864+
"type": "structure",
6865+
"members": {
6866+
"tierName": {
6867+
"target": "com.amazonaws.bedrock#GuardrailContentFiltersTierName",
6868+
"traits": {
6869+
"smithy.api#documentation": "<p>The tier that your guardrail uses for content filters. Valid values include:</p> <ul> <li> <p> <code>CLASSIC</code> tier – Provides established guardrails functionality supporting English, French, and Spanish languages.</p> </li> <li> <p> <code>STANDARD</code> tier – Provides a more robust solution than the <code>CLASSIC</code> tier and has more comprehensive language support. This tier requires that your guardrail use <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails-cross-region.html\">cross-Region inference</a>.</p> </li> </ul>",
6870+
"smithy.api#required": {}
6871+
}
6872+
}
6873+
},
6874+
"traits": {
6875+
"smithy.api#documentation": "<p>The tier that your guardrail uses for content filters. Consider using a tier that balances performance, accuracy, and compatibility with your existing generative AI workflows.</p>"
6876+
}
6877+
},
6878+
"com.amazonaws.bedrock#GuardrailContentFiltersTierName": {
6879+
"type": "enum",
6880+
"members": {
6881+
"CLASSIC": {
6882+
"target": "smithy.api#Unit",
6883+
"traits": {
6884+
"smithy.api#enumValue": "CLASSIC"
6885+
}
6886+
},
6887+
"STANDARD": {
6888+
"target": "smithy.api#Unit",
6889+
"traits": {
6890+
"smithy.api#enumValue": "STANDARD"
6891+
}
6892+
}
6893+
},
6894+
"traits": {
6895+
"smithy.api#sensitive": {}
6896+
}
6897+
},
68486898
"com.amazonaws.bedrock#GuardrailContentPolicy": {
68496899
"type": "structure",
68506900
"members": {
@@ -6853,6 +6903,12 @@
68536903
"traits": {
68546904
"smithy.api#documentation": "<p>Contains the type of the content filter and how strongly it should apply to prompts and model responses.</p>"
68556905
}
6906+
},
6907+
"tier": {
6908+
"target": "com.amazonaws.bedrock#GuardrailContentFiltersTier",
6909+
"traits": {
6910+
"smithy.api#documentation": "<p>The tier that your guardrail uses for content filters.</p>"
6911+
}
68566912
}
68576913
},
68586914
"traits": {
@@ -6868,6 +6924,12 @@
68686924
"smithy.api#documentation": "<p>Contains the type of the content filter and how strongly it should apply to prompts and model responses.</p>",
68696925
"smithy.api#required": {}
68706926
}
6927+
},
6928+
"tierConfig": {
6929+
"target": "com.amazonaws.bedrock#GuardrailContentFiltersTierConfig",
6930+
"traits": {
6931+
"smithy.api#documentation": "<p>The tier that your guardrail uses for content filters.</p>"
6932+
}
68716933
}
68726934
},
68736935
"traits": {
@@ -8201,6 +8263,12 @@
82018263
"smithy.api#documentation": "<p>A list of policies related to topics that the guardrail should deny.</p>",
82028264
"smithy.api#required": {}
82038265
}
8266+
},
8267+
"tier": {
8268+
"target": "com.amazonaws.bedrock#GuardrailTopicsTier",
8269+
"traits": {
8270+
"smithy.api#documentation": "<p>The tier that your guardrail uses for denied topic filters.</p>"
8271+
}
82048272
}
82058273
},
82068274
"traits": {
@@ -8216,6 +8284,12 @@
82168284
"smithy.api#documentation": "<p>A list of policies related to topics that the guardrail should deny.</p>",
82178285
"smithy.api#required": {}
82188286
}
8287+
},
8288+
"tierConfig": {
8289+
"target": "com.amazonaws.bedrock#GuardrailTopicsTierConfig",
8290+
"traits": {
8291+
"smithy.api#documentation": "<p>The tier that your guardrail uses for denied topic filters.</p>"
8292+
}
82198293
}
82208294
},
82218295
"traits": {
@@ -8257,6 +8331,56 @@
82578331
}
82588332
}
82598333
},
8334+
"com.amazonaws.bedrock#GuardrailTopicsTier": {
8335+
"type": "structure",
8336+
"members": {
8337+
"tierName": {
8338+
"target": "com.amazonaws.bedrock#GuardrailTopicsTierName",
8339+
"traits": {
8340+
"smithy.api#documentation": "<p>The tier that your guardrail uses for denied topic filters. Valid values include:</p> <ul> <li> <p> <code>CLASSIC</code> tier – Provides established guardrails functionality supporting English, French, and Spanish languages.</p> </li> <li> <p> <code>STANDARD</code> tier – Provides a more robust solution than the <code>CLASSIC</code> tier and has more comprehensive language support. This tier requires that your guardrail use <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails-cross-region.html\">cross-Region inference</a>.</p> </li> </ul>",
8341+
"smithy.api#required": {}
8342+
}
8343+
}
8344+
},
8345+
"traits": {
8346+
"smithy.api#documentation": "<p>The tier that your guardrail uses for denied topic filters.</p>"
8347+
}
8348+
},
8349+
"com.amazonaws.bedrock#GuardrailTopicsTierConfig": {
8350+
"type": "structure",
8351+
"members": {
8352+
"tierName": {
8353+
"target": "com.amazonaws.bedrock#GuardrailTopicsTierName",
8354+
"traits": {
8355+
"smithy.api#documentation": "<p>The tier that your guardrail uses for denied topic filters. Valid values include:</p> <ul> <li> <p> <code>CLASSIC</code> tier – Provides established guardrails functionality supporting English, French, and Spanish languages.</p> </li> <li> <p> <code>STANDARD</code> tier – Provides a more robust solution than the <code>CLASSIC</code> tier and has more comprehensive language support. This tier requires that your guardrail use <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails-cross-region.html\">cross-Region inference</a>.</p> </li> </ul>",
8356+
"smithy.api#required": {}
8357+
}
8358+
}
8359+
},
8360+
"traits": {
8361+
"smithy.api#documentation": "<p>The tier that your guardrail uses for denied topic filters. Consider using a tier that balances performance, accuracy, and compatibility with your existing generative AI workflows.</p>"
8362+
}
8363+
},
8364+
"com.amazonaws.bedrock#GuardrailTopicsTierName": {
8365+
"type": "enum",
8366+
"members": {
8367+
"CLASSIC": {
8368+
"target": "smithy.api#Unit",
8369+
"traits": {
8370+
"smithy.api#enumValue": "CLASSIC"
8371+
}
8372+
},
8373+
"STANDARD": {
8374+
"target": "smithy.api#Unit",
8375+
"traits": {
8376+
"smithy.api#enumValue": "STANDARD"
8377+
}
8378+
}
8379+
},
8380+
"traits": {
8381+
"smithy.api#sensitive": {}
8382+
}
8383+
},
82608384
"com.amazonaws.bedrock#GuardrailVersion": {
82618385
"type": "string",
82628386
"traits": {

0 commit comments

Comments
 (0)