feat: endpoints2: aws middleware and integration changes

aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProviderTest.kt

@@ -26,6 +26,7 @@ import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.ManualClock
 import aws.smithy.kotlin.runtime.time.epochMilliseconds
 import aws.smithy.kotlin.runtime.time.fromEpochMilliseconds
+import aws.smithy.kotlin.runtime.util.net.Host
 import io.kotest.matchers.string.shouldContain
 import io.mockk.coVerify
 import io.mockk.spyk
@@ -503,7 +504,7 @@ class ImdsCredentialsProviderTest {
             override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall {
                 if (successfulCallCount >= 2) {
                     return HttpCall(
-                        HttpRequest(HttpMethod.GET, Url(Protocol.HTTP, "test", Protocol.HTTP.defaultPort, "/path/foo/bar"), Headers.Empty, HttpBody.Empty),
+                        HttpRequest(HttpMethod.GET, Url(Protocol.HTTP, Host.parse("test"), Protocol.HTTP.defaultPort, "/path/foo/bar"), Headers.Empty, HttpBody.Empty),
                         HttpResponse(HttpStatusCode.InternalServerError, Headers.Empty, HttpBody.Empty),
                         testClock.now(),
                         testClock.now(),
@@ -578,7 +579,7 @@ class ImdsCredentialsProviderTest {
         val internalServerErrorEngine = object : HttpClientEngineBase("internalServerError") {
             override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall {
                 return HttpCall(
-                    HttpRequest(HttpMethod.GET, Url(Protocol.HTTP, "test", Protocol.HTTP.defaultPort, "/path/foo/bar"), Headers.Empty, HttpBody.Empty),
+                    HttpRequest(HttpMethod.GET, Url(Protocol.HTTP, Host.parse("test"), Protocol.HTTP.defaultPort, "/path/foo/bar"), Headers.Empty, HttpBody.Empty),
                     HttpResponse(HttpStatusCode.InternalServerError, Headers.Empty, HttpBody.Empty),
                     testClock.now(),
                     testClock.now(),

aws-runtime/aws-endpoint/common/src/aws/sdk/kotlin/runtime/endpoint/AwsEndpoint.kt

@@ -2,32 +2,13 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 package aws.sdk.kotlin.runtime.endpoint
 
 import aws.sdk.kotlin.runtime.InternalSdkApi
-import aws.smithy.kotlin.runtime.http.Url
+import aws.smithy.kotlin.runtime.auth.awssigning.SigningContext
 import aws.smithy.kotlin.runtime.http.endpoints.Endpoint
 import aws.smithy.kotlin.runtime.util.AttributeKey
 
-/**
- * Represents the endpoint a service client should make API operation calls to.
- *
- * The SDK will automatically resolve these endpoints per API client using an internal resolver.
- *
- * @property endpoint The endpoint clients will use to make API calls
- * to e.g. "{service-id}.{region}.amazonaws.com"
- * @property credentialScope Custom signing constraint overrides
- */
-// TODO: remove when endpoints2 is fully implemented
-public data class AwsEndpoint(
-    public val endpoint: Endpoint,
-    public val credentialScope: CredentialScope? = null,
-) {
-    public constructor(url: Url, credentialScope: CredentialScope? = null) : this(Endpoint(url), credentialScope)
-    public constructor(url: String, credentialScope: CredentialScope? = null) : this(Endpoint(Url.parse(url)), credentialScope)
-}
-
 /**
  * Static attribute key for AWS endpoint auth schemes.
  */
@@ -51,3 +32,16 @@ public sealed class AuthScheme {
         public val signingRegionSet: List<String>,
     ) : AuthScheme()
 }
+
+/**
+ * Sugar extension to pull an auth scheme out of the attribute set.
+ *
+ * FUTURE: Right now we only support sigv4. The auth scheme property can include multiple schemes, for now we only pull
+ * out the sigv4 one if present.
+ */
+@InternalSdkApi
+public fun Endpoint.authScheme(): AuthScheme.SigV4? =
+    attributes.getOrNull(AuthSchemesAttributeKey)?.find { it is AuthScheme.SigV4 } as AuthScheme.SigV4?
+
+@InternalSdkApi
+public fun AuthScheme.SigV4.asSigningContext(): SigningContext = SigningContext(signingName, signingRegion)

aws-runtime/aws-endpoint/common/src/aws/sdk/kotlin/runtime/endpoint/functions/Functions.kt

@@ -78,20 +78,21 @@ public data class PartitionConfig(
  * The resource identifier is further split based on the type or scope delimiter present (if any).
  */
 @InternalSdkApi
-public fun parseArn(value: String): Arn? {
-    val split = value.split(':', limit = ARN_COMPONENT_COUNT)
-    if (split[0] != "arn") return null
-    if (split.size != ARN_COMPONENT_COUNT) return null
-    if (split[5] == "") return null
+public fun parseArn(value: String?): Arn? =
+    value?.let {
+        val split = it.split(':', limit = ARN_COMPONENT_COUNT)
+        if (split[0] != "arn") return null
+        if (split.size != ARN_COMPONENT_COUNT) return null
+        if (split[5] == "") return null
 
-    return Arn(
-        split[1],
-        split[2],
-        split[3],
-        split[4],
-        split[5].split(':', '/'),
-    )
-}
+        return Arn(
+            split[1],
+            split[2],
+            split[3],
+            split[4],
+            split[5].split(':', '/'),
+        )
+    }
 
 /**
  * Represents a parsed form of an ARN (Amazon Resource Name).