refactor: migrate AWS protocol support to smithy-kotlin (#1254)

awslabs · Mar 14, 2024 · 19f9ec6 · 19f9ec6
1 parent 0462019
commit 19f9ec6
Show file tree

Hide file tree

Showing 33 changed files with 8 additions and 2,821 deletions.
diff --git a/aws-runtime/aws-core/common/src/aws/sdk/kotlin/runtime/client/AwsClientOption.kt b/aws-runtime/aws-core/common/src/aws/sdk/kotlin/runtime/client/AwsClientOption.kt
@@ -14,9 +14,11 @@ import aws.smithy.kotlin.runtime.collections.AttributeKey
 public object AwsClientOption {
     /**
      * The AWS region the client should use. Note this is not always the same as [AwsSigningAttributes.SigningRegion] in
-     * the case of global services like IAM
+     * the case of global services like IAM.
+     *
+     * NOTE: Synonymous with [aws.smithy.kotlin.runtime.awsprotocol.AwsAttributes.Region]
      */
-    public val Region: AttributeKey<String> = AttributeKey("aws.sdk.kotlin#AwsRegion")
+    public val Region: AttributeKey<String> = AttributeKey("aws.smithy.kotlin#AwsRegion")
 
     /**
      * The ID of the AWS account requests are routed to.

diff --git a/codegen/aws-sdk-codegen/build.gradle.kts b/codegen/aws-sdk-codegen/build.gradle.kts
@@ -20,10 +20,9 @@ group = "aws.sdk.kotlin"
 version = sdkVersion
 
 dependencies {
-
-    api(project(":codegen:smithy-aws-kotlin-codegen"))
     implementation(libs.kotlin.stdlib.jdk8)
     api(libs.smithy.kotlin.codegen)
+    api(libs.smithy.aws.kotlin.codegen)
 
     api(libs.smithy.aws.traits)
     api(libs.smithy.aws.iam.traits)

diff --git a/codegen/protocol-tests/build.gradle.kts b/codegen/protocol-tests/build.gradle.kts
@@ -21,29 +21,15 @@ data class ProtocolTest(val projectionName: String, val serviceShapeId: String,
 // The following section exposes Smithy protocol test suites as gradle test targets
 // for the configured protocols in [enabledProtocols].
 val enabledProtocols = listOf(
-    ProtocolTest("aws-ec2-query", "aws.protocoltests.ec2#AwsEc2"),
-    ProtocolTest("aws-json-10", "aws.protocoltests.json10#JsonRpc10"),
-    ProtocolTest("aws-json-11", "aws.protocoltests.json#JsonProtocol"),
-    ProtocolTest("aws-restjson", "aws.protocoltests.restjson#RestJson"),
-    ProtocolTest("aws-restxml", "aws.protocoltests.restxml#RestXml"),
-    ProtocolTest("aws-restxml-xmlns", "aws.protocoltests.restxml.xmlns#RestXmlWithNamespace"),
-    ProtocolTest("aws-query", "aws.protocoltests.query#AwsQuery"),
-
     // service specific tests
     ProtocolTest("apigateway", "com.amazonaws.apigateway#BackplaneControlService"),
     ProtocolTest("glacier", "com.amazonaws.glacier#Glacier"),
     ProtocolTest("machinelearning", "com.amazonaws.machinelearning#AmazonML_20141212", sdkId = "Machine Learning"),
-
-    // Custom hand written tests
-    ProtocolTest("error-correction-json", "aws.protocoltests.errorcorrection#RequiredValueJson"),
-    ProtocolTest("error-correction-xml", "aws.protocoltests.errorcorrection#RequiredValueXml"),
 )
 
 smithyBuild {
     enabledProtocols.forEach { test ->
         projections.register(test.projectionName) {
-            imports = listOf(file("model").absolutePath)
-
             transforms = listOf(
                 """
                 {

diff --git a/codegen/protocol-tests/model/error-correction-tests.smithy b/codegen/protocol-tests/model/error-correction-tests.smithy
diff --git a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
diff --git a/...src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/SdkProtocolGeneratorSupplier.kt b/...src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/SdkProtocolGeneratorSupplier.kt