Refactor runtimeType usage in codegen

CHANGELOG.next.toml

@@ -91,4 +91,3 @@ message = "Removed re-export of `aws_smithy_client::retry::Config` from the `mid
 references = ["smithy-rs#1935"]
 meta = { "breaking" = true, "tada" = false, "bug" = false }
 author = "jdisanti"
-

aws/sdk-adhoc-test/build.gradle.kts

@@ -9,8 +9,7 @@ extra["moduleName"] = "software.amazon.smithy.kotlin.codegen.test"
 tasks["jar"].enabled = false
 
 plugins {
-    val smithyGradlePluginVersion: String by project
-    id("software.amazon.smithy").version(smithyGradlePluginVersion)
+    id("software.amazon.smithy")
 }
 
 val smithyVersion: String by project

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsCustomization.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.rustsdk
+
+import software.amazon.smithy.rust.codegen.core.smithy.customize.NamedSectionGenerator
+import software.amazon.smithy.rust.codegen.core.smithy.customize.Section
+
+sealed class AwsSection(name: String) : Section(name) {
+    abstract val customizations: List<AwsCustomization>
+
+    /**
+     * Write custom code into the `impl From<&aws_types::sdk_config::SdkConfig> for Builder`.
+     * This `From` impl takes a reference; Don't forget to clone non-`Copy` types.
+     */
+    data class FromSdkConfigForBuilder(override val customizations: List<AwsCustomization>) :
+        AwsSection("FromSdkConfig")
+}
+
+abstract class AwsCustomization : NamedSectionGenerator<AwsSection>()

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsRuntimeDependency.kt

@@ -8,6 +8,7 @@ package software.amazon.smithy.rustsdk
 import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency
 import software.amazon.smithy.rust.codegen.core.rustlang.Visibility
+import software.amazon.smithy.rust.codegen.core.rustlang.asType
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeCrateLocation
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
@@ -50,20 +51,23 @@ object AwsRuntimeType {
     fun RuntimeConfig.defaultMiddleware() = RuntimeType.forInlineDependency(
         InlineAwsDependency.forRustFile(
             "middleware", visibility = Visibility.PUBLIC,
-            CargoDependency.SmithyHttp(this),
-            CargoDependency.SmithyHttpTower(this),
-            CargoDependency.SmithyClient(this),
+            CargoDependency.smithyHttp(this),
+            CargoDependency.smithyHttpTower(this),
+            CargoDependency.smithyClient(this),
             CargoDependency.Tower,
-            awsHttp(),
-            awsEndpoint(),
+            awsRuntimeCrate("aws-http"),
+            awsRuntimeCrate("aws-endpoint"),
         ),
     ).member("DefaultMiddleware")
 }
 
-fun RuntimeConfig.awsRuntimeDependency(name: String, features: Set<String> = setOf()): CargoDependency =
+fun RuntimeConfig.awsRuntimeCrate(name: String, features: Set<String> = setOf()): CargoDependency =
     CargoDependency(name, awsRoot().crateLocation(null), features = features)
 
-fun RuntimeConfig.awsHttp(): CargoDependency = awsRuntimeDependency("aws-http")
-fun RuntimeConfig.awsTypes(): CargoDependency = awsRuntimeDependency("aws-types")
-fun RuntimeConfig.awsConfig(): CargoDependency = awsRuntimeDependency("aws-config")
-fun RuntimeConfig.awsEndpoint() = awsRuntimeDependency("aws-endpoint")
+fun RuntimeConfig.awsConfig() = awsRuntimeCrate("aws-config").asType()
+fun RuntimeConfig.awsEndpoint() = awsRuntimeCrate("aws-endpoint").asType()
+fun RuntimeConfig.awsHttp() = awsRuntimeCrate("aws-http").asType()
+fun RuntimeConfig.awsSigAuth() = awsRuntimeCrate("aws-sig-auth").asType()
+fun RuntimeConfig.awsSigAuthEventStream() = awsRuntimeCrate("aws-sig-auth", setOf("sign-eventstream")).asType()
+fun RuntimeConfig.awsSigv4() = awsRuntimeCrate("aws-sigv4").asType()
+fun RuntimeConfig.awsTypes() = awsRuntimeCrate("aws-types").asType()

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/SdkSettings.kt

@@ -21,7 +21,7 @@ class SdkSettings private constructor(private val awsSdk: ObjectNode?) {
 
     /** Path to the `sdk-default-configuration.json` config file */
     val defaultsConfigPath: Path? get() =
-        awsSdk?.getStringMember("defaultConfigPath")?.orNull()?.value.let { Paths.get(it) }
+        awsSdk?.getStringMember("defaultConfigPath")?.orNull()?.value?.let { Paths.get(it) }
 
     /** Path to the `sdk-endpoints.json` configuration */
     val endpointsConfigPath: Path? get() =

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/decorators/AwsCombinedCodegenDecorator.kt

@@ -0,0 +1,102 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.rustsdk.decorators
+
+import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext
+import software.amazon.smithy.rust.codegen.client.smithy.customizations.DocsRsMetadataDecorator
+import software.amazon.smithy.rust.codegen.client.smithy.customizations.DocsRsMetadataSettings
+import software.amazon.smithy.rust.codegen.client.smithy.customize.CombinedCodegenDecorator
+import software.amazon.smithy.rust.codegen.client.smithy.customize.RustCodegenDecorator
+import software.amazon.smithy.rust.codegen.client.smithy.generators.protocol.ClientProtocolGenerator
+import software.amazon.smithy.rust.codegen.core.rustlang.RustModule
+import software.amazon.smithy.rust.codegen.core.rustlang.rust
+import software.amazon.smithy.rust.codegen.core.rustlang.rustBlockTemplate
+import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
+import software.amazon.smithy.rust.codegen.core.smithy.RustCrate
+import software.amazon.smithy.rust.codegen.core.smithy.customize.writeCustomizations
+import software.amazon.smithy.rustsdk.AwsCustomization
+import software.amazon.smithy.rustsdk.AwsSection
+import software.amazon.smithy.rustsdk.awsTypes
+import software.amazon.smithy.rustsdk.servicedecorators.apigateway.ApiGatewayDecorator
+import software.amazon.smithy.rustsdk.servicedecorators.auth.DisabledAuthDecorator
+import software.amazon.smithy.rustsdk.servicedecorators.ec2.Ec2Decorator
+import software.amazon.smithy.rustsdk.servicedecorators.glacier.GlacierDecorator
+import software.amazon.smithy.rustsdk.servicedecorators.route53.Route53Decorator
+import software.amazon.smithy.rustsdk.servicedecorators.s3.S3Decorator
+import software.amazon.smithy.rustsdk.servicedecorators.sts.STSDecorator
+
+val DECORATORS = listOf(
+    // General AWS Decorators
+    AwsEndpointDecorator(),
+    AwsFluentClientDecorator(),
+    AwsPresigningDecorator(),
+    AwsReadmeDecorator(),
+    CrateLicenseDecorator(),
+    CredentialsProviderDecorator(),
+    HttpRequestChecksumDecorator(),
+    HttpResponseChecksumDecorator(),
+    IntegrationTestDecorator(),
+    RegionDecorator(),
+    ResiliencyDecorator(),
+    SdkConfigDecorator(),
+    ServiceConfigDecorator(),
+    SigV4SigningDecorator(),
+    UserAgentDecorator(),
+
+    // Service specific decorators
+    ApiGatewayDecorator(),
+    DisabledAuthDecorator(),
+    Ec2Decorator(),
+    GlacierDecorator(),
+    Route53Decorator(),
+    S3Decorator(),
+    STSDecorator(),
+
+    // Only build docs-rs for linux to reduce load on docs.rs
+    DocsRsMetadataDecorator(DocsRsMetadataSettings(targets = listOf("x86_64-unknown-linux-gnu"), allFeatures = true)),
+)
+
+interface AwsCodegenDecorator : RustCodegenDecorator<ClientProtocolGenerator, ClientCodegenContext> {
+    fun awsCustomizations(
+        codegenContext: ClientCodegenContext,
+        baseCustomizations: List<AwsCustomization>,
+    ): List<AwsCustomization> {
+        return baseCustomizations
+    }
+}
+
+class AwsCombinedCodegenDecorator :
+    CombinedCodegenDecorator<ClientProtocolGenerator, ClientCodegenContext>(DECORATORS) {
+    override val order: Byte = -1
+
+    override fun extras(codegenContext: ClientCodegenContext, rustCrate: RustCrate) {
+        super.extras(codegenContext, rustCrate)
+
+        val awsCustomizations = orderedDecorators.filterIsInstance<AwsCodegenDecorator>()
+            .foldRight(listOf<AwsCustomization>()) { decorator, customizations ->
+                decorator.awsCustomizations(codegenContext, customizations)
+            }
+        generateImplFromRefSdkConfigForConfigBuilder(codegenContext.runtimeConfig, rustCrate, awsCustomizations)
+    }
+}
+
+fun generateImplFromRefSdkConfigForConfigBuilder(
+    runtimeConfig: RuntimeConfig,
+    rustCrate: RustCrate,
+    customizations: List<AwsCustomization>,
+) {
+    val codegenContext = arrayOf("SdkConfig" to runtimeConfig.awsTypes().member("sdk_config::SdkConfig"))
+
+    rustCrate.withModule(RustModule.Config) {
+        rustBlockTemplate("impl From<&#{SdkConfig}> for Builder", *codegenContext) {
+            rustBlockTemplate("fn from(input: &#{SdkConfig}) -> Self", *codegenContext) {
+                rust("let mut builder = Builder::default();")
+                writeCustomizations(customizations, AwsSection.FromSdkConfigForBuilder(customizations))
+                rust("builder")
+            }
+        }
+    }
+}