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

fix various small issues (#3056) 

This fixes some pre-commit issues and updates the gradle builds to fix a
deprecated thing where I was sure it wouldn't break anything.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
parent 3b6f8867

aws/sdk/build.gradle.kts

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ plugins { 
}



configure<software.amazon.smithy.gradle.SmithyExtension> {

    smithyBuildConfigs = files(buildDir.resolve("smithy-build.json"))

    smithyBuildConfigs = files(layout.buildDirectory.file("smithy-build.json"))

    allowUnknownTraits = true

}
@@ -144,7 +144,7 @@ tasks.register("generateSmithyBuild") { 
    inputs.property("servicelist", awsServices.services.toString())

    inputs.property("eventStreamAllowList", eventStreamAllowList)

    inputs.dir(projectDir.resolve("aws-models"))

    outputs.file(buildDir.resolve("smithy-build.json"))

    outputs.file(layout.buildDirectory.file("smithy-build.json"))



    doFirst {

        buildDir.resolve("smithy-build.json").writeText(generateSmithyBuild(awsServices))
@@ -186,7 +186,7 @@ tasks.register("relocateServices") { 
            }

        }

    }

    inputs.dir("$buildDir/smithyprojections/sdk/")

    inputs.dir(layout.buildDirectory.dir("smithyprojections/sdk/"))

    outputs.dir(sdkOutputDir)

}
@@ -406,7 +406,7 @@ tasks.register<ExecRustBuildTool>("generateVersionManifest") { 
        "--examples-revision",

        properties.get("aws.sdk.examples.revision") ?: "missing",

    ).apply {

        val previousReleaseManifestPath = getPreviousReleaseVersionManifestPath()?.let { manifestPath ->

        getPreviousReleaseVersionManifestPath()?.let { manifestPath ->

            add("--previous-release-versions")

            add(manifestPath)

        }
@@ -414,7 +414,7 @@ tasks.register<ExecRustBuildTool>("generateVersionManifest") { 
}



tasks["smithyBuildJar"].apply {

    inputs.file(buildDir.resolve("smithy-build.json"))

    inputs.file(layout.buildDirectory.file("smithy-build.json"))

    inputs.dir(projectDir.resolve("aws-models"))

    dependsOn("generateSmithyBuild")

    dependsOn("generateCargoWorkspace")
@@ -455,5 +455,5 @@ tasks.register<Delete>("deleteSdk") { 
}

tasks["clean"].dependsOn("deleteSdk")

tasks["clean"].doFirst {

    delete(buildDir.resolve("smithy-build.json"))

    delete(layout.buildDirectory.file("smithy-build.json"))

}

build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ allprojects.forEach { 


    it.the<JacocoPluginExtension>().apply {

        toolVersion = "0.8.8"

        reportsDirectory.set(file("$buildDir/jacoco-reports"))

        reportsDirectory.set(layout.buildDirectory.dir("jacoco-reports"))

    }

}

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/customizations/ClientDocsGenerator.kt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class ClientDocsGenerator(private val codegenContext: ClientCodegenContext) : Li 


    private fun crateLayout(): Writable =

        writable {

            val serviceName = codegenContext.serviceShape?.getTrait<TitleTrait>()?.value ?: "the service"

            val serviceName = codegenContext.serviceShape.getTrait<TitleTrait>()?.value ?: "the service"

            containerDocs(

                """

                The entry point for most customers will be [`Client`], which exposes one method for each API

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/EndpointsDecorator.kt

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ class EndpointsDecorator : ClientCodegenDecorator { 
    override fun extras(codegenContext: ClientCodegenContext, rustCrate: RustCrate) {

        val generator = EndpointTypesGenerator.fromContext(codegenContext)

        rustCrate.withModule(ClientRustModule.Config.endpoint) {

            withInlineModule(endpointTestsModule(codegenContext), rustCrate.moduleDocProvider) {

            withInlineModule(endpointTestsModule(), rustCrate.moduleDocProvider) {

                generator.testGenerator()(this)

            }

        }

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointParamsGenerator.kt

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ import software.amazon.smithy.rust.codegen.core.util.dq 
import software.amazon.smithy.rust.codegen.core.util.orNull



// internals contains the actual resolver function

fun endpointImplModule(codegenContext: ClientCodegenContext) = RustModule.private("internals", parent = ClientRustModule.Config.endpoint)

fun endpointImplModule() = RustModule.private("internals", parent = ClientRustModule.Config.endpoint)



fun endpointTestsModule(codegenContext: ClientCodegenContext) = RustModule.new(

fun endpointTestsModule() = RustModule.new(

    "test",

    visibility = Visibility.PRIVATE,

    parent = ClientRustModule.Config.endpoint,