chore: ktlint & swiftlint version bumps (#1887)

* Update swiftlint version, ktlint version, and fix new lint warnings.

* Make warnings fail swiftlint as well.

---------

Co-authored-by: Sichan Yoo <[email protected]>

Author: sichanyoo

.github/workflows/lint.yml

@@ -20,9 +20,9 @@ jobs:
     if: github.repository == 'awslabs/aws-sdk-swift' || github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/realm/swiftlint:0.54.0
+      image: ghcr.io/realm/swiftlint:0.58.2
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
       - name: Run swiftlint on AWSClientRuntime
-        run: swiftlint --reporter github-actions-logging
+        run: swiftlint --strict --reporter github-actions-logging

build.gradle.kts

@@ -18,7 +18,7 @@ allprojects {
 val ktlint by configurations.creating
 val ktlintVersion: String by project
 dependencies {
-    ktlint("com.pinterest:ktlint:$ktlintVersion")
+    ktlint("com.pinterest.ktlint:ktlint-cli:$ktlintVersion")
 }
 
 val lintPaths = listOf(

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSAuthUtils.kt

@@ -21,7 +21,7 @@ import software.amazon.smithy.swift.codegen.model.hasTrait
 import software.amazon.smithy.swift.codegen.utils.AuthUtils
 
 open class AWSAuthUtils(
-    private val ctx: ProtocolGenerator.GenerationContext
+    private val ctx: ProtocolGenerator.GenerationContext,
 ) : AuthUtils(ctx) {
     companion object {
         /**
@@ -31,12 +31,16 @@ open class AWSAuthUtils(
          * @param serviceShape service shape for the API
          * @return if the SigV4 trait is used by the service.
          */
-        fun isSupportedAuthentication(model: Model, serviceShape: ServiceShape): Boolean =
+        fun isSupportedAuthentication(
+            model: Model,
+            serviceShape: ServiceShape,
+        ): Boolean =
             ServiceIndex
                 .of(model)
                 .getAuthSchemes(serviceShape)
                 .values
                 .any { it.javaClass == SigV4Trait::class.java }
+
         /**
          * Get the SigV4Trait auth name to sign request for
          *
@@ -56,13 +60,20 @@ open class AWSAuthUtils(
          * @param operation operation shape
          * @return if SigV4Trait is an auth scheme for the operation and service.
          */
-        fun hasSigV4AuthScheme(model: Model, service: ServiceShape, operation: OperationShape): Boolean {
+        fun hasSigV4AuthScheme(
+            model: Model,
+            service: ServiceShape,
+            operation: OperationShape,
+        ): Boolean {
             val auth = ServiceIndex.of(model).getEffectiveAuthSchemes(service.id, operation.id)
             return auth.containsKey(SigV4Trait.ID) && !operation.hasTrait<OptionalAuthTrait>()
         }
     }
 
-    override fun addAdditionalSchemes(writer: SwiftWriter, authSchemeList: MutableList<String>): List<String> {
+    override fun addAdditionalSchemes(
+        writer: SwiftWriter,
+        authSchemeList: MutableList<String>,
+    ): List<String> {
         val effectiveAuthSchemes = ServiceIndex(ctx.model).getEffectiveAuthSchemes(ctx.service)
 
         val sdkId = AuthSchemeResolverGenerator.getSdkId(ctx)

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSClientConfigurationIntegration.kt

@@ -19,11 +19,14 @@ import software.amazon.smithy.swift.codegen.integration.SwiftIntegration
 import software.amazon.smithy.swift.codegen.integration.plugins.DefaultAWSClientPlugin
 
 class AWSClientConfigurationIntegration : SwiftIntegration {
-    override fun clientConfigurations(ctx: ProtocolGenerator.GenerationContext): List<ClientConfiguration> {
-        return listOf(AWSDefaultClientConfiguration(), AWSRegionClientConfiguration(), AWSEndpointClientConfiguration(ctx))
-    }
+    override fun clientConfigurations(ctx: ProtocolGenerator.GenerationContext): List<ClientConfiguration> =
+        listOf(AWSDefaultClientConfiguration(), AWSRegionClientConfiguration(), AWSEndpointClientConfiguration(ctx))
 
-    override fun plugins(serviceConfig: ServiceConfig): List<Plugin> {
-        return listOf(DefaultAWSClientPlugin(), EndpointPlugin(serviceConfig), DefaultAWSAuthSchemePlugin(serviceConfig), AuthSchemePlugin(serviceConfig))
-    }
+    override fun plugins(serviceConfig: ServiceConfig): List<Plugin> =
+        listOf(
+            DefaultAWSClientPlugin(),
+            EndpointPlugin(serviceConfig),
+            DefaultAWSAuthSchemePlugin(serviceConfig),
+            AuthSchemePlugin(serviceConfig),
+        )
 }

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPBindingProtocolGenerator.kt

@@ -26,7 +26,6 @@ import software.amazon.smithy.swift.codegen.testModuleName
 abstract class AWSHTTPBindingProtocolGenerator(
     customizations: HTTPProtocolCustomizable,
 ) : HTTPBindingProtocolGenerator(customizations) {
-
     override var serviceErrorProtocolSymbol: Symbol = AWSClientRuntimeTypes.Core.AWSServiceError
 
     override val retryErrorInfoProviderSymbol: Symbol
@@ -41,8 +40,9 @@ abstract class AWSHTTPBindingProtocolGenerator(
     open val protocolTestTagsToIgnore: Set<String> = setOf()
 
     override val shouldRenderEncodableConformance = false
-    override fun generateProtocolUnitTests(ctx: ProtocolGenerator.GenerationContext): Int {
-        return HttpProtocolTestGenerator(
+
+    override fun generateProtocolUnitTests(ctx: ProtocolGenerator.GenerationContext): Int =
+        HttpProtocolTestGenerator(
             ctx,
             requestTestBuilder,
             responseTestBuilder,
@@ -52,11 +52,8 @@ abstract class AWSHTTPBindingProtocolGenerator(
             protocolTestsToIgnore,
             protocolTestTagsToIgnore,
         ).generateProtocolTests() + renderEndpointsTests(ctx)
-    }
 
-    override fun generateSmokeTests(ctx: ProtocolGenerator.GenerationContext) {
-        return AWSSmokeTestGenerator(ctx).generateSmokeTests()
-    }
+    override fun generateSmokeTests(ctx: ProtocolGenerator.GenerationContext) = AWSSmokeTestGenerator(ctx).generateSmokeTests()
 
     fun renderEndpointsTests(ctx: ProtocolGenerator.GenerationContext): Int {
         val ruleSetNode = ctx.service.getTrait<EndpointRuleSetTrait>()?.ruleSet
@@ -69,21 +66,27 @@ abstract class AWSHTTPBindingProtocolGenerator(
             }
 
             ctx.delegator.useFileWriter("Tests/${ctx.settings.testModuleName}/EndpointResolverTest.swift") { swiftWriter ->
-                testCount = + EndpointTestGenerator(testsTrait, ruleSet, ctx).render(swiftWriter)
+                testCount = +EndpointTestGenerator(testsTrait, ruleSet, ctx).render(swiftWriter)
             }
         }
 
         return testCount
     }
 
-    override fun addProtocolSpecificMiddleware(ctx: ProtocolGenerator.GenerationContext, operation: OperationShape) {
+    override fun addProtocolSpecificMiddleware(
+        ctx: ProtocolGenerator.GenerationContext,
+        operation: OperationShape,
+    ) {
         operationMiddleware.appendMiddleware(
             operation,
-            AWSOperationEndpointResolverMiddleware(ctx, customizations.endpointMiddlewareSymbol)
+            AWSOperationEndpointResolverMiddleware(ctx, customizations.endpointMiddlewareSymbol),
         )
     }
 
-    override fun addUserAgentMiddleware(ctx: ProtocolGenerator.GenerationContext, operation: OperationShape) {
+    override fun addUserAgentMiddleware(
+        ctx: ProtocolGenerator.GenerationContext,
+        operation: OperationShape,
+    ) {
         operationMiddleware.appendMiddleware(operation, UserAgentMiddleware(ctx.settings))
     }
 }

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHTTPProtocolCustomizations.kt

@@ -23,8 +23,12 @@ import software.amazon.smithy.swift.codegen.model.isInputEventStream
 import software.amazon.smithy.swift.codegen.model.isOutputEventStream
 
 abstract class AWSHTTPProtocolCustomizations : DefaultHTTPProtocolCustomizations() {
-
-    override fun renderContextAttributes(ctx: ProtocolGenerator.GenerationContext, writer: SwiftWriter, serviceShape: ServiceShape, op: OperationShape) {
+    override fun renderContextAttributes(
+        ctx: ProtocolGenerator.GenerationContext,
+        writer: SwiftWriter,
+        serviceShape: ServiceShape,
+        op: OperationShape,
+    ) {
         // FIXME handle indentation properly or do swift formatting after the fact
         val config = AWSServiceConfig(writer, ctx)
         if (config.serviceSpecificConfigProperties().any { it.memberName == "accountIdEndpointMode" }) {
@@ -45,7 +49,7 @@ abstract class AWSHTTPProtocolCustomizations : DefaultHTTPProtocolCustomizations
     override fun renderEventStreamAttributes(
         ctx: ProtocolGenerator.GenerationContext,
         writer: SwiftWriter,
-        op: OperationShape
+        op: OperationShape,
     ) {
         if (op.isInputEventStream(ctx.model) && op.isOutputEventStream(ctx.model)) {
             writer.write("\$N(context: context)", AWSSDKEventStreamsAuthTypes.setupBidirectionalStreaming)
@@ -67,10 +71,8 @@ abstract class AWSHTTPProtocolCustomizations : DefaultHTTPProtocolCustomizations
     override fun serviceClient(
         ctx: ProtocolGenerator.GenerationContext,
         writer: SwiftWriter,
-        serviceConfig: ServiceConfig
-    ): HttpProtocolServiceClient {
-        return AWSHttpProtocolServiceClient(ctx, writer, serviceConfig)
-    }
+        serviceConfig: ServiceConfig,
+    ): HttpProtocolServiceClient = AWSHttpProtocolServiceClient(ctx, writer, serviceConfig)
 
     override val endpointMiddlewareSymbol: Symbol = AWSClientRuntimeTypes.Core.AWSEndpointResolverMiddleware
 

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolClientGeneratorFactory.kt

@@ -21,9 +21,17 @@ class AWSHttpProtocolClientGeneratorFactory : HttpProtocolClientGeneratorFactory
         serviceName: String,
         defaultContentType: String,
         httpProtocolCustomizable: HTTPProtocolCustomizable,
-        operationMiddleware: OperationMiddleware
+        operationMiddleware: OperationMiddleware,
     ): HttpProtocolClientGenerator {
         val config = AWSServiceConfig(writer, ctx)
-        return HttpProtocolClientGenerator(ctx, writer, config, httpBindingResolver, defaultContentType, httpProtocolCustomizable, operationMiddleware)
+        return HttpProtocolClientGenerator(
+            ctx,
+            writer,
+            config,
+            httpBindingResolver,
+            defaultContentType,
+            httpProtocolCustomizable,
+            operationMiddleware,
+        )
     }
 }

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt

@@ -30,7 +30,7 @@ import software.amazon.smithy.swift.codegen.utils.toUpperCamelCase
 class AWSHttpProtocolServiceClient(
     private val ctx: ProtocolGenerator.GenerationContext,
     private val writer: SwiftWriter,
-    private val serviceConfig: ServiceConfig
+    private val serviceConfig: ServiceConfig,
 ) : HttpProtocolServiceClient(ctx, writer, serviceConfig) {
     override fun renderConvenienceInitFunctions(serviceSymbol: Symbol) {
         writer.openBlock("public convenience init(region: \$N) throws {", "}", SwiftTypes.String) {
@@ -44,22 +44,26 @@ class AWSHttpProtocolServiceClient(
         }
     }
 
-    override fun overrideConfigProperties(properties: List<ConfigProperty>): List<ConfigProperty> {
-        return properties.mapNotNull { property ->
+    override fun overrideConfigProperties(properties: List<ConfigProperty>): List<ConfigProperty> =
+        properties.mapNotNull { property ->
             when (property.name) {
                 "authSchemeResolver" -> {
                     ConfigProperty("authSchemeResolver", SmithyHTTPAuthAPITypes.AuthSchemeResolver, authSchemeResolverDefaultProvider)
                 }
                 "authSchemes" -> {
-                    ConfigProperty("authSchemes", SmithyHTTPAuthAPITypes.AuthSchemes.toOptional(), AWSAuthUtils(ctx).authSchemesDefaultProvider)
+                    ConfigProperty(
+                        "authSchemes",
+                        SmithyHTTPAuthAPITypes.AuthSchemes.toOptional(),
+                        AWSAuthUtils(ctx).authSchemesDefaultProvider,
+                    )
                 }
                 "bearerTokenIdentityResolver" -> {
                     if (AuthUtils(ctx).isSupportedAuthScheme(HttpBearerAuthTrait.ID)) {
                         ConfigProperty(
                             "bearerTokenIdentityResolver",
                             SmithyIdentityTypes.BearerTokenIdentityResolver.toGeneric(),
                             { it.format("\$N()", AWSSDKIdentityTypes.DefaultBearerTokenIdentityResolverChain) },
-                            true
+                            true,
                         )
                     } else {
                         property
@@ -70,7 +74,7 @@ class AWSHttpProtocolServiceClient(
                         "retryStrategyOptions",
                         SmithyRetriesAPITypes.RetryStrategyOptions,
                         { it.format("AWSClientConfigDefaultsProvider.retryStrategyOptions(awsRetryMode, maxAttempts)") },
-                        true
+                        true,
                     )
                 }
                 "clientLogMode" -> {
@@ -112,13 +116,12 @@ class AWSHttpProtocolServiceClient(
                                 AWSClientRuntimeTypes.Core.AWSClientConfigDefaultsProvider,
                             )
                         },
-                        true
+                        true,
                     )
                 }
                 else -> property
             }
         }
-    }
 
     override fun renderCustomConfigInitializer(properties: List<ConfigProperty>) {
         renderRegionConfigInitializer(properties)
@@ -173,9 +176,10 @@ class AWSHttpProtocolServiceClient(
         writer.write("")
     }
 
-    private val authSchemeResolverDefaultProvider = DefaultProvider(
-        { writer.format("Default\$LAuthSchemeResolver()", AuthSchemeResolverGenerator.getSdkId(ctx)) },
-        false,
-        false
-    )
+    private val authSchemeResolverDefaultProvider =
+        DefaultProvider(
+            { writer.format("Default\$LAuthSchemeResolver()", AuthSchemeResolverGenerator.getSdkId(ctx)) },
+            false,
+            false,
+        )
 }

codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSServiceConfig.kt

@@ -22,9 +22,10 @@ import software.amazon.smithy.swift.codegen.utils.toLowerCamelCase
 const val ENDPOINT_RESOLVER = "endpointResolver"
 const val AUTH_SCHEME_RESOLVER = "authSchemeResolver"
 
-class AWSServiceConfig(writer: SwiftWriter, val ctx: ProtocolGenerator.GenerationContext) :
-    ServiceConfig(writer, ctx.symbolProvider.toSymbol(ctx.service).name, ctx.service.sdkId) {
-
+class AWSServiceConfig(
+    writer: SwiftWriter,
+    val ctx: ProtocolGenerator.GenerationContext,
+) : ServiceConfig(writer, ctx.symbolProvider.toSymbol(ctx.service).name, ctx.service.sdkId) {
     override fun serviceSpecificConfigProperties(): List<ConfigField> {
         var configs = mutableListOf<ConfigField>()
 
@@ -41,10 +42,9 @@ class AWSServiceConfig(writer: SwiftWriter, val ctx: ProtocolGenerator.Generatio
     }
 }
 
-fun ShapeType.toSwiftType(): Symbol {
-    return when (this) {
+fun ShapeType.toSwiftType(): Symbol =
+    when (this) {
         ShapeType.STRING -> SwiftTypes.String
         ShapeType.BOOLEAN -> SwiftTypes.Bool
         else -> throw IllegalArgumentException("Unsupported shape type: $this")
     }
-}