Unverified Commit b092e602 authored by Zelda Hessler's avatar Zelda Hessler Committed by GitHub
Browse files

refactor: unify module writers (apologies for the churn 😅) (#1783) 

* refactor: unify module writers
refactor: use RustModule instead of strings for module names
suppress: unchecked cast warning for Writable

* remove: unnecessary writer references in EnumGenerator
format: remove wildcard import
add: intellij wildcard import rules to .editorconfig

* respond to John's comment
parent e4e7ef24

.editorconfig

+4 −0
Original line number Diff line number Diff line 
[*.{kt,kts}]

ij_kotlin_allow_trailing_comma = true

ij_kotlin_allow_trailing_comma_on_call_site = true

ij_java_use_single_class_imports = true

ij_groovy_use_single_class_imports = true

ij_kotlin_name_count_to_use_star_import = 100

ij_kotlin_name_count_to_use_star_import_for_members = 100

indent_size = 4

indent_style = space

insert_final_newline = true

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

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ class EndpointResolverGenerator(codegenContext: CodegenContext, private val endp 
        val rest = partitions.drop(1)

        val fnName = "endpoint_resolver"

        return RuntimeType.forInlineFun(fnName, RustModule.private("aws_endpoint")) {

            it.rustBlockTemplate("pub fn $fnName() -> impl #{ResolveAwsEndpoint}", *codegenScope) {

            rustBlockTemplate("pub fn $fnName() -> impl #{ResolveAwsEndpoint}", *codegenScope) {

                withBlockTemplate("#{PartitionResolver}::new(", ")", *codegenScope) {

                    renderPartition(base)

                    rust(",")

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

+4 −4
Original line number Diff line number Diff line
@@ -108,11 +108,11 @@ class AwsFluentClientDecorator : RustCodegenDecorator<ClientProtocolGenerator, C 
            ),

            retryClassifier = runtimeConfig.awsHttp().asType().member("retry::AwsResponseRetryClassifier"),

        ).render(rustCrate)

        rustCrate.withNonRootModule(CustomizableOperationGenerator.CUSTOMIZE_MODULE) { writer ->

            renderCustomizableOperationSendMethod(runtimeConfig, generics, writer)

        rustCrate.withNonRootModule(CustomizableOperationGenerator.CUSTOMIZE_MODULE) {

            renderCustomizableOperationSendMethod(runtimeConfig, generics, this)

        }

        rustCrate.withModule(FluentClientGenerator.clientModule) { writer ->

            AwsFluentClientExtensions(types).render(writer)

        rustCrate.withModule(FluentClientGenerator.clientModule) {

            AwsFluentClientExtensions(types).render(this)

        }

        val awsSmithyClient = "aws-smithy-client"

        rustCrate.mergeFeature(Feature("rustls", default = true, listOf("$awsSmithyClient/rustls")))

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

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ internal class AwsSdkReadmeGenerator { 
    internal fun generateReadme(codegenContext: ClientCodegenContext, rustCrate: RustCrate) {

        val awsConfigVersion = SdkSettings.from(codegenContext.settings).awsConfigVersion

            ?: throw IllegalStateException("missing `awsConfigVersion` codegen setting")

        rustCrate.withFile("README.md") { writer ->

        rustCrate.withFile("README.md") {

            val description = normalizeDescription(

                codegenContext.moduleName,

                codegenContext.settings.getService(codegenContext.model).getTrait<DocumentationTrait>()?.value ?: "",
@@ -66,7 +66,7 @@ internal class AwsSdkReadmeGenerator { 
            val snakeCaseModuleName = moduleName.replace('-', '_')

            val shortModuleName = moduleName.removePrefix("aws-sdk-")



            writer.raw(

            raw(

                """

                # $moduleName

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ class CrateLicenseDecorator : RustCodegenDecorator<ClientProtocolGenerator, Clie 
    override fun extras(codegenContext: ClientCodegenContext, rustCrate: RustCrate) {

        rustCrate.withFile("LICENSE") {

            val license = this::class.java.getResource("/LICENSE").readText()

            it.raw(license)

            raw(license)

        }

    }