Upgrade Kotlin and Ktlint (smithy-lang#2392)

* Upgrade Kotlin to 1.7.21

* Upgrade Ktlint to 0.48.2

* Run `pre-commit run --all-files` to fix broken Ktlints

* Fix string comparison broken by code formatting

.editorconfig

@@ -9,5 +9,11 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 max_line_length = 120
+
 # Ktlint-specific config
-disabled_rules = filename, max-line-length, argument-list-wrapping, parameter-list-wrapping
+ktlint_standard = enabled
+ktlint_experimental = disabled
+ktlint_standard_filename = disabled
+ktlint_standard_max-line-length = disabled
+ktlint_standard_argument-list-wrapping = disabled
+ktlint_standard_parameter-list-wrapping = disabled

.pre-commit-config.yaml

@@ -20,10 +20,10 @@ repos:
     files: ^.*$
     pass_filenames: false
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.5.0
+  rev: v2.6.0
   hooks:
   - id: pretty-format-kotlin
-    args: [--autofix, --ktlint-version, 0.46.1]
+    args: [--autofix, --ktlint-version, 0.48.2]
   - id: pretty-format-yaml
     args: [--autofix, --indent, '2']
   - id: pretty-format-rust

aws/SDK_CHANGELOG.next.json

@@ -498,4 +498,4 @@
     }
   ],
   "aws-sdk-model": []
-}
+}

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

@@ -130,7 +130,9 @@ class RegionDecorator : ClientCodegenDecorator {
             object : EndpointCustomization {
                 override fun loadBuiltInFromServiceConfig(parameter: Parameter, configRef: String): Writable? {
                     return when (parameter.builtIn) {
-                        Builtins.REGION.builtIn -> writable { rust("$configRef.region.as_ref().map(|r|r.as_ref().to_owned())") }
+                        Builtins.REGION.builtIn -> writable {
+                            rust("$configRef.region.as_ref().map(|r|r.as_ref().to_owned())")
+                        }
                         else -> null
                     }
                 }

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/glacier/AccountIdAutofill.kt

@@ -37,7 +37,9 @@ class AccountIdAutofill : OperationCustomization() {
             val input = operation.inputShape(model)
             return if (input.memberNames.contains("accountId")) {
                 AccountIdAutofill()
-            } else null
+            } else {
+                null
+            }
         }
     }
 }

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/route53/Route53Decorator.kt

@@ -49,7 +49,9 @@ class Route53Decorator : ClientCodegenDecorator {
             operation.inputShape(codegenContext.model).members().find { it.hasTrait<TrimResourceId>() }
         return if (hostedZoneMember != null) {
             baseCustomizations + TrimResourceIdCustomization(codegenContext.symbolProvider.toMemberName(hostedZoneMember))
-        } else baseCustomizations
+        } else {
+            baseCustomizations
+        }
     }
 
     private fun isResourceId(shape: Shape): Boolean {

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

@@ -250,8 +250,7 @@ class AwsEndpointDecorator : ClientCodegenDecorator {
                 }
 
                 ServiceConfig.ConfigStruct -> rust("endpoint_url: Option<String>,")
-                ServiceConfig.ConfigStructAdditionalDocs -> emptySection
-                ServiceConfig.Extras -> emptySection
+                else -> {}
             }
         }
     }

aws/sdk/build.gradle.kts

@@ -52,7 +52,9 @@ dependencies {
 
 // Class and functions for service and protocol membership for SDK generation
 
-val awsServices: AwsServices by lazy { discoverServices(properties.get("aws.sdk.models.path"), loadServiceMembership()) }
+val awsServices: AwsServices by lazy {
+    discoverServices(properties.get("aws.sdk.models.path"), loadServiceMembership())
+}
 val eventStreamAllowList: Set<String> by lazy { eventStreamAllowList() }
 val crateVersioner by lazy { aws.sdk.CrateVersioner.defaultFor(rootProject, properties) }
 

build.gradle.kts

@@ -14,9 +14,7 @@ buildscript {
     }
 }
 
-plugins {
-    kotlin("jvm") version "1.3.72" apply false
-}
+plugins { }
 
 allprojects {
     repositories {
@@ -61,7 +59,7 @@ tasks.register<JavaExec>("ktlint") {
     group = "Verification"
     classpath = configurations.getByName("ktlint")
     mainClass.set("com.pinterest.ktlint.Main")
-    args = listOf("--verbose", "--relative", "--") + lintPaths
+    args = listOf("--log-level=info", "--relative", "--") + lintPaths
     // https://github.com/pinterest/ktlint/issues/1195#issuecomment-1009027802
     jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }
@@ -71,7 +69,7 @@ tasks.register<JavaExec>("ktlintFormat") {
     group = "formatting"
     classpath = configurations.getByName("ktlint")
     mainClass.set("com.pinterest.ktlint.Main")
-    args = listOf("--verbose", "--relative", "--format", "--") + lintPaths
+    args = listOf("--log-level=info", "--relative", "--format", "--") + lintPaths
     // https://github.com/pinterest/ktlint/issues/1195#issuecomment-1009027802
     jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }

buildSrc/src/main/kotlin/CodegenTestCommon.kt

@@ -62,7 +62,7 @@ enum class Cargo(val toString: String) {
     CHECK("cargoCheck"),
     TEST("cargoTest"),
     DOCS("cargoDoc"),
-    CLIPPY("cargoClippy");
+    CLIPPY("cargoClippy"),
 }
 
 private fun generateCargoWorkspace(pluginName: String, tests: List<CodegenTest>) =
@@ -86,7 +86,9 @@ private fun codegenTests(properties: PropertyRetriever, allTests: List<CodegenTe
         allTests
     }
     require(ret.isNotEmpty()) {
-        "None of the provided module overrides (`$modulesOverride`) are valid test services (`${allTests.map { it.module }}`)"
+        "None of the provided module overrides (`$modulesOverride`) are valid test services (`${allTests.map {
+            it.module
+        }}`)"
     }
     return ret
 }
@@ -115,7 +117,9 @@ fun cargoCommands(properties: PropertyRetriever): List<Cargo> {
         AllCargoCommands
     }
     require(ret.isNotEmpty()) {
-        "None of the provided cargo commands (`$cargoCommandsOverride`) are valid cargo commands (`${AllCargoCommands.map { it.toString }}`)"
+        "None of the provided cargo commands (`$cargoCommandsOverride`) are valid cargo commands (`${AllCargoCommands.map {
+            it.toString
+        }}`)"
     }
     return ret
 }

buildSrc/src/main/kotlin/aws/sdk/DocsLandingPage.kt

@@ -44,7 +44,9 @@ fun Project.docsLandingPage(awsServices: AwsServices, outputPath: File) {
 /**
  * Generate a link to the examples for a given service
  */
-private fun examplesLink(service: AwsService, project: Project) = service.examplesUri(project)?.let { "([examples]($it))" }
+private fun examplesLink(service: AwsService, project: Project) = service.examplesUri(project)?.let {
+    "([examples]($it))"
+}
 
 /**
  * Generate a link to the docs

buildSrc/src/main/kotlin/aws/sdk/ModelMetadata.kt

@@ -11,7 +11,7 @@ import java.io.File
 enum class ChangeType {
     UNCHANGED,
     FEATURE,
-    DOCUMENTATION
+    DOCUMENTATION,
 }
 
 /** Model metadata toml file */

buildSrc/src/main/kotlin/aws/sdk/ServiceLoader.kt

@@ -135,9 +135,9 @@ fun Project.discoverServices(awsModelsPath: String?, serviceMembership: Membersh
         serviceMembership.exclusions.forEach { disabledService ->
             check(baseModules.contains(disabledService)) {
                 "Service $disabledService was explicitly disabled but no service was generated with that name. Generated:\n ${
-                baseModules.joinToString(
-                    "\n ",
-                )
+                    baseModules.joinToString(
+                        "\n ",
+                    )
                 }"
             }
         }
@@ -206,7 +206,9 @@ fun parseMembership(rawList: String): Membership {
     }
 
     val conflictingMembers = inclusions.intersect(exclusions)
-    require(conflictingMembers.isEmpty()) { "$conflictingMembers specified both for inclusion and exclusion in $rawList" }
+    require(conflictingMembers.isEmpty()) {
+        "$conflictingMembers specified both for inclusion and exclusion in $rawList"
+    }
 
     return Membership(inclusions, exclusions)
 }

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

@@ -100,7 +100,7 @@ private class ApiKeyOperationCustomization(private val runtimeConfig: RuntimeCon
                     """
                     ${section.request}.properties_mut().insert(api_key_config.clone());
                     let api_key = api_key_config.api_key();
-                """,
+                    """,
                 )
                 val definitionName = authDefinition.getName()
                 if (authDefinition.getIn() == HttpApiKeyAuthTrait.Location.QUERY) {

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

@@ -16,7 +16,9 @@ class ClientDocsGenerator : LibRsCustomization() {
         return when (section) {
             is LibRsSection.ModuleDocumentation -> if (section.subsection == LibRsSection.CrateOrganization) {
                 crateLayout()
-            } else emptySection
+            } else {
+                emptySection
+            }
             else -> emptySection
         }
     }

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

@@ -90,7 +90,9 @@ internal class EndpointConfigCustomization(
                         /// let config = $moduleUseName::Config::builder().endpoint_resolver(prefix_resolver);
                         /// ```
                         """
-                    } else ""
+                    } else {
+                        ""
+                    }
                     rustTemplate(
                         """
                         /// Sets the endpoint resolver to use when making requests.

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

@@ -74,10 +74,9 @@ class AwsPartitionResolver(runtimeConfig: RuntimeConfig, private val partitionsD
     )
 
     override fun structFieldInit() = writable {
+        val json = Node.printJson(partitionsDotJson).dq()
         rustTemplate(
-            """partition_resolver: #{PartitionResolver}::new_from_json(b${
-            Node.printJson(partitionsDotJson).dq()
-            }).expect("valid JSON")""",
+            """partition_resolver: #{PartitionResolver}::new_from_json(b$json).expect("valid JSON")""",
             *codegenScope,
         )
     }

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

@@ -136,15 +136,15 @@ class FluentClientGenerator(
             "smithy_inst" to generics.smithyInst,
             "client" to RuntimeType.smithyClient(runtimeConfig),
             "client_docs" to writable
-            {
-                customizations.forEach {
-                    it.section(
-                        FluentClientSection.FluentClientDocs(
-                            serviceShape,
-                        ),
-                    )(this)
-                }
-            },
+                {
+                    customizations.forEach {
+                        it.section(
+                            FluentClientSection.FluentClientDocs(
+                                serviceShape,
+                            ),
+                        )(this)
+                    }
+                },
         )
         writer.rustBlockTemplate(
             "impl${generics.inst} Client${generics.inst} #{bounds:W}",
@@ -156,7 +156,9 @@ class FluentClientGenerator(
                 val fullPath = operation.fullyQualifiedFluentBuilder(symbolProvider)
                 val maybePaginated = if (operation.isPaginated(model)) {
                     "\n/// This operation supports pagination; See [`into_paginator()`]($fullPath::into_paginator)."
-                } else ""
+                } else {
+                    ""
+                }
 
                 val output = operation.outputShape(model)
                 val operationOk = symbolProvider.toSymbol(output)
@@ -201,10 +203,10 @@ class FluentClientGenerator(
                 writer.rust(
                     """
                     pub fn ${
-                    clientOperationFnName(
-                        operation,
-                        symbolProvider,
-                    )
+                        clientOperationFnName(
+                            operation,
+                            symbolProvider,
+                        )
                     }(&self) -> fluent_builders::$name${generics.inst} {
                         fluent_builders::$name::new(self.handle.clone())
                     }

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/config/IdempotencyTokenProviderCustomization.kt

@@ -63,7 +63,9 @@ class IdempotencyTokenProviderCustomization : NamedCustomization<ServiceConfig>(
                 rust("make_token: self.make_token.unwrap_or_else(#T::default_provider),", RuntimeType.IdempotencyToken)
             }
 
-            is ServiceConfig.DefaultForTests -> writable { rust("""${section.configBuilderRef}.set_make_token(Some("00000000-0000-4000-8000-000000000000".into()));""") }
+            is ServiceConfig.DefaultForTests -> writable {
+                rust("""${section.configBuilderRef}.set_make_token(Some("00000000-0000-4000-8000-000000000000".into()));""")
+            }
 
             else -> writable { }
         }

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/error/ErrorGenerator.kt

@@ -52,6 +52,7 @@ class ErrorGenerator(
                         is StructureSection.AdditionalDebugFields -> {
                             rust("""${section.formatterName}.field("meta", &self.meta);""")
                         }
+                        else -> {}
                     }
                 }
             },
@@ -90,6 +91,8 @@ class ErrorGenerator(
                             is BuilderSection.AdditionalFieldsInBuild -> {
                                 rust("meta: self.meta.unwrap_or_default(),")
                             }
+
+                            else -> {}
                         }
                     }
                 },

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/error/ServiceErrorGenerator.kt

@@ -53,7 +53,9 @@ class ServiceErrorGenerator(
     private val symbolProvider = codegenContext.symbolProvider
     private val model = codegenContext.model
 
-    private val allErrors = operations.flatMap { it.allErrors(model) }.map { it.id }.distinctBy { it.getName(codegenContext.serviceShape) }
+    private val allErrors = operations.flatMap {
+        it.allErrors(model)
+    }.map { it.id }.distinctBy { it.getName(codegenContext.serviceShape) }
         .map { codegenContext.model.expectShape(it, StructureShape::class.java) }
         .sortedBy { it.id.getName(codegenContext.serviceShape) }
 

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/protocol/ProtocolTestGenerator.kt

@@ -246,10 +246,10 @@ class ProtocolTestGenerator(
         expectedShape: StructureShape,
     ) {
         if (!protocolSupport.responseDeserialization || (
-            !protocolSupport.errorDeserialization && expectedShape.hasTrait(
+                !protocolSupport.errorDeserialization && expectedShape.hasTrait(
                     ErrorTrait::class.java,
                 )
-            )
+                )
         ) {
             rust("/* test case disabled for this protocol (not yet supported) */")
             return
@@ -356,7 +356,7 @@ class ProtocolTestGenerator(
             assertOk(rustWriter) {
                 rustWriter.write(
                     "#T(&body, ${
-                    rustWriter.escape(body).dq()
+                        rustWriter.escape(body).dq()
                     }, #T::from(${(mediaType ?: "unknown").dq()}))",
                     RuntimeType.protocolTest(codegenContext.runtimeConfig, "validate_body"),
                     RuntimeType.protocolTest(codegenContext.runtimeConfig, "MediaType"),

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/HttpBoundProtocolGenerator.kt

@@ -350,7 +350,9 @@ class HttpBoundProtocolTraitImplGenerator(
 
         val err = if (BuilderGenerator.hasFallibleBuilder(outputShape, symbolProvider)) {
             ".map_err(${format(errorSymbol)}::unhandled)?"
-        } else ""
+        } else {
+            ""
+        }
 
         writeCustomizations(customizations, OperationSection.MutateOutput(customizations, operationShape))
 

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/customizations/HttpVersionListGeneratorTest.kt

@@ -205,7 +205,9 @@ class FakeSigningDecorator : ClientCodegenDecorator {
         codegenContext: ClientCodegenContext,
         baseCustomizations: List<ConfigCustomization>,
     ): List<ConfigCustomization> {
-        return baseCustomizations.filterNot { it is EventStreamSigningConfig } + FakeSigningConfig(codegenContext.runtimeConfig)
+        return baseCustomizations.filterNot {
+            it is EventStreamSigningConfig
+        } + FakeSigningConfig(codegenContext.runtimeConfig)
     }
 }
 

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/config/ServiceConfigGeneratorTest.kt

@@ -94,7 +94,9 @@ internal class ServiceConfigGeneratorTest {
                     }
                     ServiceConfig.BuilderStruct -> writable { rust("config_field: Option<u64>") }
                     ServiceConfig.BuilderImpl -> emptySection
-                    ServiceConfig.BuilderBuild -> writable { rust("config_field: self.config_field.unwrap_or_default(),") }
+                    ServiceConfig.BuilderBuild -> writable {
+                        rust("config_field: self.config_field.unwrap_or_default(),")
+                    }
                     else -> emptySection
                 }
             }

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/RustType.kt

@@ -222,7 +222,9 @@ fun RustType.asArgument(name: String) = Argument(
 fun RustType.render(fullyQualified: Boolean = true): String {
     val namespace = if (fullyQualified) {
         this.namespace?.let { "$it::" } ?: ""
-    } else ""
+    } else {
+        ""
+    }
     val base = when (this) {
         is RustType.Unit -> this.name
         is RustType.Bool -> this.name
@@ -426,7 +428,7 @@ enum class AttributeKind {
     /**
      * Outer attributes, written without the bang after the hash, apply to the thing that follows the attribute.
      */
-    Outer
+    Outer,
 }
 
 /**