fix various small issues (#3056)

Zelda Hessler · web-flow · commit 5a2dbd430208 · 2023-10-11T19:41:05.000Z
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._
diff --git a/.github/workflows/ci-tls.yml b/.github/workflows/ci-tls.yml
@@ -20,62 +20,62 @@ jobs:
     name: Verify TLS configuration
     runs-on: ubuntu-latest
     steps:
-      - name: Install packages
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install gcc make python3-pip nginx git ruby openjdk-17-jre pkg-config libssl-dev faketime
-          pip3 install certbuilder crlbuilder
-      - name: Stop nginx
-        run: sudo systemctl stop nginx
-      - name: Checkout smithy-rs
-        uses: actions/checkout@v3
-        with:
-          path: ./smithy-rs
-      - name: Checkout trytls
-        uses: actions/checkout@v3
-        with:
-          repository: ouspg/trytls
-          path: ./trytls
-      - name: Checkout badtls
-        uses: actions/checkout@v3
-        with:
-          repository: wbond/badtls.io
-          path: ./badtls.io
-      - name: Checkout badssl
-        uses: actions/checkout@v3
-        with:
-          repository: chromium/badssl.com
-          path: ./badssl.com
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.rust_version }}
-      - name: Build badssl.com
-        shell: bash
-        working-directory: badssl.com
-        env:
-          DOCKER_BUILDKIT: 1
-        run: ../smithy-rs/tools/ci-scripts/configure-tls/configure-badssl
-      - name: Build SDK
-        working-directory: smithy-rs
-        run: ./gradlew :aws:sdk:assemble -Paws.services=+sts,+sso
-      - name: Build trytls
-        shell: bash
-        working-directory: trytls
-        run: ../smithy-rs/tools/ci-scripts/configure-tls/configure-trytls
-      - name: Build badtls.io
-        working-directory: badtls.io
-        shell: bash
-        run: ../smithy-rs/tools/ci-scripts/configure-tls/configure-badtls
-      - name: Update TLS configuration
-        shell: bash
-        run: smithy-rs/tools/ci-scripts/configure-tls/update-certs
-      - name: Build TLS stub
-        working-directory: smithy-rs/tools/ci-resources/tls-stub
-        shell: bash
-        run: cargo build
-      - name: Test TLS configuration
-        working-directory: smithy-rs/tools
-        shell: bash
-        run: trytls https target/debug/stub
+    - name: Install packages
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install gcc make python3-pip nginx git ruby openjdk-17-jre pkg-config libssl-dev faketime
+        pip3 install certbuilder crlbuilder
+    - name: Stop nginx
+      run: sudo systemctl stop nginx
+    - name: Checkout smithy-rs
+      uses: actions/checkout@v3
+      with:
+        path: ./smithy-rs
+    - name: Checkout trytls
+      uses: actions/checkout@v3
+      with:
+        repository: ouspg/trytls
+        path: ./trytls
+    - name: Checkout badtls
+      uses: actions/checkout@v3
+      with:
+        repository: wbond/badtls.io
+        path: ./badtls.io
+    - name: Checkout badssl
+      uses: actions/checkout@v3
+      with:
+        repository: chromium/badssl.com
+        path: ./badssl.com
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ env.rust_version }}
+    - name: Build badssl.com
+      shell: bash
+      working-directory: badssl.com
+      env:
+        DOCKER_BUILDKIT: 1
+      run: ../smithy-rs/tools/ci-scripts/configure-tls/configure-badssl
+    - name: Build SDK
+      working-directory: smithy-rs
+      run: ./gradlew :aws:sdk:assemble -Paws.services=+sts,+sso
+    - name: Build trytls
+      shell: bash
+      working-directory: trytls
+      run: ../smithy-rs/tools/ci-scripts/configure-tls/configure-trytls
+    - name: Build badtls.io
+      working-directory: badtls.io
+      shell: bash
+      run: ../smithy-rs/tools/ci-scripts/configure-tls/configure-badtls
+    - name: Update TLS configuration
+      shell: bash
+      run: smithy-rs/tools/ci-scripts/configure-tls/update-certs
+    - name: Build TLS stub
+      working-directory: smithy-rs/tools/ci-resources/tls-stub
+      shell: bash
+      run: cargo build
+    - name: Test TLS configuration
+      working-directory: smithy-rs/tools
+      shell: bash
+      run: trytls https target/debug/stub
diff --git a/aws/SDK_CHANGELOG.next.json b/aws/SDK_CHANGELOG.next.json
@@ -775,4 +775,4 @@
     }
   ],
   "aws-sdk-model": []
-}
+}
diff --git a/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/OperationInputTestGeneratorTests.kt b/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/OperationInputTestGeneratorTests.kt
@@ -21,15 +21,15 @@ class OperationInputTestGeneratorTests {
         val operationModel = """
             $prefix
             namespace operations
-            
+
             operation Ping {}
         """.trimIndent()
         val serviceModel = """
             $prefix
             namespace service
-            
+
             use operations#Ping
-            
+
             service MyService {
                 operations: [Ping]
             }
diff --git a/aws/sdk/build.gradle.kts b/aws/sdk/build.gradle.kts
@@ -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,15 +406,15 @@ 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)
         }
     }
 }
 
 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"))
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -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"))
     }
 }
 
diff --git a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/customizations/ClientDocsGenerator.kt b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/customizations/ClientDocsGenerator.kt
@@ -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
diff --git a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/EndpointsDecorator.kt b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/EndpointsDecorator.kt
@@ -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)
             }
         }
diff --git a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointParamsGenerator.kt b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointParamsGenerator.kt
@@ -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,
diff --git a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointResolverGenerator.kt b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/endpoint/generators/EndpointResolverGenerator.kt
@@ -207,7 +207,7 @@ internal class EndpointResolverGenerator(
         endpointRuleSet: EndpointRuleSet,
         fnsUsed: List<CustomRuntimeFunction>,
     ): RuntimeType {
-        return RuntimeType.forInlineFun("resolve_endpoint", endpointImplModule(codegenContext)) {
+        return RuntimeType.forInlineFun("resolve_endpoint", endpointImplModule()) {
             Attribute(allow(allowLintsForResolver)).render(this)
             rustTemplate(
                 """
diff --git a/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/protocol/RequestSerializerGenerator.kt b/codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/protocol/RequestSerializerGenerator.kt
@@ -36,7 +36,6 @@ class RequestSerializerGenerator(
     private val codegenScope by lazy {
         val runtimeApi = RuntimeType.smithyRuntimeApi(codegenContext.runtimeConfig)
         val interceptorContext = runtimeApi.resolve("client::interceptors::context")
-        val smithyTypes = RuntimeType.smithyTypes(codegenContext.runtimeConfig)
         arrayOf(
             *preludeScope,
             "BoxError" to RuntimeType.boxError(codegenContext.runtimeConfig),
diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/UnionGenerator.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/UnionGenerator.kt
@@ -109,7 +109,6 @@ open class UnionGenerator(
     private fun renderImplBlock(unionSymbol: Symbol) {
         writer.rustBlock("impl ${unionSymbol.name}") {
             sortedMembers.forEach { member ->
-                val memberSymbol = symbolProvider.toSymbol(member)
                 val funcNamePart = member.memberName.toSnakeCase()
                 val variantName = symbolProvider.toMemberName(member)
 
diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/Ec2Query.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/Ec2Query.kt
@@ -59,7 +59,7 @@ class Ec2QueryProtocol(private val codegenContext: CodegenContext) : Protocol {
         }
 
     override fun parseEventStreamErrorMetadata(operationShape: OperationShape): RuntimeType =
-        ProtocolFunctions.crossOperationFn("parse_event_stream_error_metadata") { fnName ->
+        ProtocolFunctions.crossOperationFn("parse_event_stream_error_metadata") {
             rustBlockTemplate(
                 "pub fn parse_event_stream_error_metadata(payload: &#{Bytes}) -> Result<#{ErrorMetadataBuilder}, #{XmlDecodeError}>",
                 *errorScope,
diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/parse/JsonParserGenerator.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/parse/JsonParserGenerator.kt
@@ -287,7 +287,7 @@ class JsonParserGenerator(
             is BooleanShape -> rustTemplate("#{expect_bool_or_null}(tokens.next())?", *codegenScope)
             is NumberShape -> deserializeNumber(target)
             is BlobShape -> deserializeBlob(memberShape)
-            is TimestampShape -> deserializeTimestamp(target, memberShape)
+            is TimestampShape -> deserializeTimestamp(memberShape)
             is CollectionShape -> deserializeCollection(target)
             is MapShape -> deserializeMap(target)
             is StructureShape -> deserializeStruct(target)
@@ -361,7 +361,7 @@ class JsonParserGenerator(
         }
     }
 
-    private fun RustWriter.deserializeTimestamp(shape: TimestampShape, member: MemberShape) {
+    private fun RustWriter.deserializeTimestamp(member: MemberShape) {
         val timestampFormat =
             httpBindingResolver.timestampFormat(
                 member, HttpLocation.DOCUMENT,
diff --git a/codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/ServerRootGenerator.kt b/codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/ServerRootGenerator.kt
@@ -106,7 +106,7 @@ open class ServerRootGenerator(
             //! #### Plugins
             //!
             //! The [`$serviceName::builder_with_plugins`] method, returning [`$builderName`],
-            //! accepts a plugin marked with [`HttpMarker`](aws_smithy_http_server::plugin::HttpMarker) and a 
+            //! accepts a plugin marked with [`HttpMarker`](aws_smithy_http_server::plugin::HttpMarker) and a
             //! plugin marked with [`ModelMarker`](aws_smithy_http_server::plugin::ModelMarker).
             //! Plugins allow you to build middleware which is aware of the operation it is being applied to.
             //!
diff --git a/codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/server/smithy/PatternTraitEscapedSpecialCharsValidatorTest.kt b/codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/server/smithy/PatternTraitEscapedSpecialCharsValidatorTest.kt
@@ -20,7 +20,7 @@ class PatternTraitEscapedSpecialCharsValidatorTest {
         val exception = shouldThrow<ValidatedResultException> {
             """
             namespace test
-    
+
             @pattern("\t")
             string MyString
             """.asSmithyModel(smithyVersion = "2")
@@ -41,7 +41,7 @@ class PatternTraitEscapedSpecialCharsValidatorTest {
         val exception = shouldThrow<ValidatedResultException> {
             """
             namespace test
-    
+
             @pattern("[.\n\\r]+")
             string MyString
             """.asSmithyModel(smithyVersion = "2")
@@ -62,16 +62,16 @@ class PatternTraitEscapedSpecialCharsValidatorTest {
         val exception = shouldThrow<ValidatedResultException> {
             """
             namespace test
-    
+
             @pattern("\b")
             string MyString
-            
+
             @pattern("^\n$")
             string MyString2
-            
+
             @pattern("^[\n]+$")
             string MyString3
-            
+
             @pattern("^[\r\t]$")
             string MyString4
             """.asSmithyModel(smithyVersion = "2")
@@ -85,10 +85,10 @@ class PatternTraitEscapedSpecialCharsValidatorTest {
         val exception = shouldThrow<ValidatedResultException> {
             """
             namespace test
-    
+
             @pattern("\t")
             string MyString
-            
+
             structure MyStructure {
                 @pattern("\b")
                 field: String
@@ -109,10 +109,10 @@ class PatternTraitEscapedSpecialCharsValidatorTest {
 
         @pattern("\\t")
         string MyString
-        
+
         @pattern("[.\\n\\r]+")
         string MyString2
-        
+
         @pattern("\\b\\f\\n\\r\\t")
         string MyString3
 

Original file line number	Diff line number	Diff line change
`@@ -775,4 +775,4 @@`
`775`	`775`	`}`
`776`	`776`	`],`
`777`	`777`	`"aws-sdk-model": []`
`778`		`-}`
	`778`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ plugins {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`configure<software.amazon.smithy.gradle.SmithyExtension> {`
`22`		`- smithyBuildConfigs = files(buildDir.resolve("smithy-build.json"))`
	`22`	`+ smithyBuildConfigs = files(layout.buildDirectory.file("smithy-build.json"))`
`23`	`23`	`allowUnknownTraits = true`
`24`	`24`	`}`
`25`	`25`
`@@ -144,7 +144,7 @@ tasks.register("generateSmithyBuild") {`
`144`	`144`	`inputs.property("servicelist", awsServices.services.toString())`
`145`	`145`	`inputs.property("eventStreamAllowList", eventStreamAllowList)`
`146`	`146`	`inputs.dir(projectDir.resolve("aws-models"))`
`147`		`- outputs.file(buildDir.resolve("smithy-build.json"))`
	`147`	`+ outputs.file(layout.buildDirectory.file("smithy-build.json"))`
`148`	`148`
`149`	`149`	`doFirst {`
`150`	`150`	`buildDir.resolve("smithy-build.json").writeText(generateSmithyBuild(awsServices))`
`@@ -186,7 +186,7 @@ tasks.register("relocateServices") {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`	`}`
`189`		`- inputs.dir("$buildDir/smithyprojections/sdk/")`
	`189`	`+ inputs.dir(layout.buildDirectory.dir("smithyprojections/sdk/"))`
`190`	`190`	`outputs.dir(sdkOutputDir)`
`191`	`191`	`}`
`192`	`192`
`@@ -406,15 +406,15 @@ tasks.register<ExecRustBuildTool>("generateVersionManifest") {`
`406`	`406`	`"--examples-revision",`
`407`	`407`	`properties.get("aws.sdk.examples.revision") ?: "missing",`
`408`	`408`	`).apply {`
`409`		`- val previousReleaseManifestPath = getPreviousReleaseVersionManifestPath()?.let { manifestPath ->`
	`409`	`+ getPreviousReleaseVersionManifestPath()?.let { manifestPath ->`
`410`	`410`	`add("--previous-release-versions")`
`411`	`411`	`add(manifestPath)`
`412`	`412`	`}`
`413`	`413`	`}`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`tasks["smithyBuildJar"].apply {`
`417`		`- inputs.file(buildDir.resolve("smithy-build.json"))`
	`417`	`+ inputs.file(layout.buildDirectory.file("smithy-build.json"))`
`418`	`418`	`inputs.dir(projectDir.resolve("aws-models"))`
`419`	`419`	`dependsOn("generateSmithyBuild")`
`420`	`420`	`dependsOn("generateCargoWorkspace")`
`@@ -455,5 +455,5 @@ tasks.register<Delete>("deleteSdk") {`
`455`	`455`	`}`
`456`	`456`	`tasks["clean"].dependsOn("deleteSdk")`
`457`	`457`	`tasks["clean"].doFirst {`
`458`		`- delete(buildDir.resolve("smithy-build.json"))`
	`458`	`+ delete(layout.buildDirectory.file("smithy-build.json"))`
`459`	`459`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ allprojects.forEach {`
`29`	`29`
`30`	`30`	`it.the<JacocoPluginExtension>().apply {`
`31`	`31`	`toolVersion = "0.8.8"`
`32`		`- reportsDirectory.set(file("$buildDir/jacoco-reports"))`
	`32`	`+ reportsDirectory.set(layout.buildDirectory.dir("jacoco-reports"))`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ class EndpointsDecorator : ClientCodegenDecorator {`
`107`	`107`	`override fun extras(codegenContext: ClientCodegenContext, rustCrate: RustCrate) {`
`108`	`108`	`val generator = EndpointTypesGenerator.fromContext(codegenContext)`
`109`	`109`	`rustCrate.withModule(ClientRustModule.Config.endpoint) {`
`110`		`- withInlineModule(endpointTestsModule(codegenContext), rustCrate.moduleDocProvider) {`
	`110`	`+ withInlineModule(endpointTestsModule(), rustCrate.moduleDocProvider) {`
`111`	`111`	`generator.testGenerator()(this)`
`112`	`112`	`}`
`113`	`113`	`}`