Merge branch 'main' of https://github.com/awslabs/aws-sdk-kotlin into…

… smoke-tests-trait

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.3.67] - 11/01/2024
+
+### Features
+* (**bedrockagent**) Amazon Bedrock Knowledge Bases now supports using application inference profiles to increase throughput and improve resilience.
+* (**cloudwatchlogs**) This release introduces an improvement in PutLogEvents
+* (**docdbelastic**) Amazon DocumentDB Elastic Clusters adds support for pending maintenance actions feature with APIs GetPendingMaintenanceAction, ListPendingMaintenanceActions and ApplyPendingMaintenanceAction
+* (**taxsettings**) Add support for supplemental tax registrations via these new APIs: PutSupplementalTaxRegistration, ListSupplementalTaxRegistrations, and DeleteSupplementalTaxRegistration.
+
 ## [1.3.66] - 10/31/2024
 
 ### Features

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptor.kt

@@ -35,9 +35,9 @@ public class BusinessMetricsInterceptor : HttpInterceptor {
 /**
  * Makes sure the metrics do not exceed the maximum size and truncates them if so.
  */
-private fun formatMetrics(metrics: MutableSet<String>): String {
+private fun formatMetrics(metrics: MutableSet<BusinessMetric>): String {
     if (metrics.isEmpty()) return ""
-    val metricsString = metrics.joinToString(",", "m/")
+    val metricsString = metrics.joinToString(",", "m/") { it.identifier }
     val metricsByteArray = metricsString.encodeToByteArray()
 
     if (metricsByteArray.size <= BUSINESS_METRICS_MAX_LENGTH) return metricsString

aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptorTest.kt

@@ -6,6 +6,7 @@ package aws.sdk.kotlin.runtime.http.interceptors
 
 import aws.sdk.kotlin.runtime.http.BUSINESS_METRICS_MAX_LENGTH
 import aws.sdk.kotlin.runtime.http.middleware.USER_AGENT
+import aws.smithy.kotlin.runtime.businessmetrics.BusinessMetric
 import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
 import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
 import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
@@ -70,7 +71,11 @@ class BusinessMetricsInterceptorTest {
         executionContext.attributes[aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics] = mutableSetOf()
 
         for (i in 0..1024) {
-            executionContext.attributes[aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics].add(i.toString())
+            executionContext.emitBusinessMetric(
+                object : BusinessMetric {
+                    override val identifier: String = i.toString()
+                },
+            )
         }
 
         val rawMetrics = executionContext[aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics]
@@ -91,9 +96,12 @@ class BusinessMetricsInterceptorTest {
     @Test
     fun malformedBusinessMetrics() = runTest {
         val executionContext = ExecutionContext()
+        val reallyLongMetric = "All work and no play makes Jack a dull boy".repeat(1000)
 
-        executionContext.attributes[aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics] = mutableSetOf(
-            "A".repeat(BUSINESS_METRICS_MAX_LENGTH),
+        executionContext.attributes.emitBusinessMetric(
+            object : BusinessMetric {
+                override val identifier: String = reallyLongMetric
+            },
         )
 
         val interceptor = BusinessMetricsInterceptor()

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

@@ -16192,6 +16192,7 @@
             "hostname" : "rekognition-fips.ca-central-1.amazonaws.com"
           },
           "eu-central-1" : { },
+          "eu-south-2" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "il-central-1" : { },

codegen/sdk/aws-models/bedrock-agent.json

@@ -2005,7 +2005,7 @@
                     "min": 20,
                     "max": 2048
                 },
-                "smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$"
+                "smithy.api#pattern": "^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$"
             }
         },
         "com.amazonaws.bedrockagent#BedrockEmbeddingModelConfiguration": {
@@ -2050,7 +2050,7 @@
                     "min": 1,
                     "max": 2048
                 },
-                "smithy.api#pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)$"
+                "smithy.api#pattern": "^(arn:aws(-[^:]{1,12})?:(bedrock):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$"
             }
         },
         "com.amazonaws.bedrockagent#BucketOwnerAccountId": {
@@ -13621,7 +13621,7 @@
                 "embeddingModelArn": {
                     "target": "com.amazonaws.bedrockagent#BedrockEmbeddingModelArn",
                     "traits": {
-                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the model used to create vector embeddings for the knowledge base.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the model or inference profile used to create vector embeddings for the knowledge base.</p>",
                         "smithy.api#required": {}
                     }
                 },

codegen/sdk/aws-models/cloudwatch-logs.json

@@ -3386,7 +3386,7 @@
             "traits": {
                 "smithy.api#length": {
                     "min": 2,
-                    "max": 3
+                    "max": 4
                 }
             }
         },