chore: use custom ktlint-rules from repo tools (#1018)

awslabs · Aug 18, 2023 · 9a0b4b7 · 9a0b4b7
1 parent c2d89a0
commit 9a0b4b7
Show file tree

Hide file tree

Showing 28 changed files with 101 additions and 43 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import aws.sdk.kotlin.gradle.kmp.typedProp
+import aws.sdk.kotlin.gradle.dsl.configureLinting
+import aws.sdk.kotlin.gradle.util.typedProp
 import java.net.URL
 import java.time.Duration
 
@@ -13,7 +14,7 @@ buildscript {
         // only need to include it here, imports in subprojects will work automagically
         classpath("aws.sdk.kotlin:build-plugins") {
             version {
-                require("0.1.1")
+                require("0.2.0")
             }
         }
     }
@@ -144,43 +145,10 @@ if (
     }
 }
 
-val ktlint: Configuration by configurations.creating {
-    attributes {
-        attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
-    }
-}
-val ktlintVersion: String by project
-dependencies {
-    ktlint("com.pinterest:ktlint:$ktlintVersion")
-}
-
 val lintPaths = listOf(
     "**/*.{kt,kts}",
     "!**/generated-src/**",
     "!**/smithyprojections/**",
 )
 
-tasks.register<JavaExec>("ktlint") {
-    description = "Check Kotlin code style."
-    group = "Verification"
-    classpath = configurations.getByName("ktlint")
-    main = "com.pinterest.ktlint.Main"
-    args = lintPaths
-    jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
-}
-
-tasks.register<JavaExec>("ktlintFormat") {
-    description = "Auto fix Kotlin code style violations"
-    group = "formatting"
-    classpath = configurations.getByName("ktlint")
-    main = "com.pinterest.ktlint.Main"
-    args = listOf("-F") + lintPaths
-    jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
-}
-
-tasks.register("showRepos") {
-    doLast {
-        println("All repos:")
-        println(repositories.map { it.name })
-    }
-}
+configureLinting(lintPaths)
diff --git a/...tlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ServiceClientCompanionObjectWriter.kt b/...tlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/ServiceClientCompanionObjectWriter.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen
 
 import software.amazon.smithy.kotlin.codegen.core.KotlinWriter

diff --git a/...kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/S3SigningConfig.kt b/...kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/S3SigningConfig.kt
@@ -29,9 +29,8 @@ class S3SigningConfig : KotlinIntegration {
     override fun enabledForService(model: Model, settings: KotlinSettings) =
         model.expectShape<ServiceShape>(settings.service).isS3
 
-    override fun authSchemes(ctx: ProtocolGenerator.GenerationContext): List<AuthSchemeHandler> {
-        return listOf(S3AuthSchemeHandler())
-    }
+    override fun authSchemes(ctx: ProtocolGenerator.GenerationContext): List<AuthSchemeHandler> =
+        listOf(S3AuthSchemeHandler())
 }
 
 private class S3AuthSchemeHandler : SigV4AuthSchemeHandler() {

diff --git a/...c/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/TruncatablePaginationIntegration.kt b/...c/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/TruncatablePaginationIntegration.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.customization.s3
 
 import software.amazon.smithy.kotlin.codegen.KotlinSettings

diff --git a/...en/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/testutil/ModelUtil.kt b/...en/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/testutil/ModelUtil.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.codegen.testutil
 
 import software.amazon.smithy.kotlin.codegen.test.prependNamespaceAndService

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 plugins {
     kotlin("jvm") version "1.8.22"
 }

diff --git a/examples/client-generator/build.gradle.kts b/examples/client-generator/build.gradle.kts
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 plugins {
     kotlin("jvm")
     id("software.amazon.smithy").version("0.5.3")

diff --git a/examples/dynamodb-movies/build.gradle.kts b/examples/dynamodb-movies/build.gradle.kts
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 plugins {
     kotlin("jvm")
     application

diff --git a/examples/s3-media-ingestion/build.gradle.kts b/examples/s3-media-ingestion/build.gradle.kts
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 plugins {
     kotlin("jvm")
     application

diff --git a/examples/settings.gradle.kts b/examples/settings.gradle.kts
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 rootProject.name = "aws-sdk-kotlin-examples"
 
 include(":client-generator")

diff --git a/gradle.properties b/gradle.properties
@@ -29,7 +29,6 @@ ktorVersion=2.2.2
 
 # testing/utility
 junitVersion=5.9.2
-ktlintVersion=0.48.1
 kotestVersion=5.5.4
 jacocoVersion=0.8.8
 mockkVersion=1.13.3

diff --git a/...mon/src/aws/sdk/kotlin/services/route53/internal/ChangeResourceRecordSetsUnmarshalling.kt b/...mon/src/aws/sdk/kotlin/services/route53/internal/ChangeResourceRecordSetsUnmarshalling.kt
@@ -9,9 +9,8 @@ import aws.smithy.kotlin.runtime.awsprotocol.ErrorDetails
 import aws.smithy.kotlin.runtime.serde.*
 import aws.smithy.kotlin.runtime.serde.xml.*
 
-internal fun parseRestXmlInvalidChangeBatchResponse(payload: ByteArray): InvalidChangeBatchErrorResponse? {
-    return deserializeInvalidChangeBatchError(InvalidChangeBatch.Builder(), payload)
-}
+internal fun parseRestXmlInvalidChangeBatchResponse(payload: ByteArray): InvalidChangeBatchErrorResponse? =
+    deserializeInvalidChangeBatchError(InvalidChangeBatch.Builder(), payload)
 
 internal fun deserializeInvalidChangeBatchError(builder: InvalidChangeBatch.Builder, payload: ByteArray): InvalidChangeBatchErrorResponse? {
     val deserializer = XmlDeserializer(payload)

diff --git a/services/s3/e2eTest/src/PaginatorTest.kt b/services/s3/e2eTest/src/PaginatorTest.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.e2etest
 
 import aws.sdk.kotlin.services.s3.S3Client

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,6 +24,7 @@ pluginManagement {
 sourceControl {
     gitRepository(java.net.URI("https://github.com/awslabs/aws-kotlin-repo-tools.git")) {
         producesModule("aws.sdk.kotlin:build-plugins")
+        producesModule("aws.sdk.kotlin:ktlint-rules")
     }
 }
 

diff --git a/...marks/service-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/BenchmarkHarness.kt b/...marks/service-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/BenchmarkHarness.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service
 
 import aws.sdk.kotlin.benchmarks.service.definitions.*

diff --git a/...enchmarks/service-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/ResultsTable.kt b/...enchmarks/service-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/ResultsTable.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service
 
 import aws.sdk.kotlin.benchmarks.service.telemetry.MetricSummary

diff --git a/...enchmarks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/CloudwatchBenchmark.kt b/...enchmarks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/CloudwatchBenchmark.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.definitions
 
 import aws.sdk.kotlin.benchmarks.service.Common

diff --git a/...rks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/CloudwatchEventsBenchmark.kt b/...rks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/CloudwatchEventsBenchmark.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.definitions
 
 import aws.sdk.kotlin.benchmarks.service.Common

diff --git a/...-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/PinpointBenchmark.kt b/...-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/PinpointBenchmark.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.definitions
 
 import aws.sdk.kotlin.benchmarks.service.Common

diff --git a/...rvice-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/SnsBenchmark.kt b/...rvice-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/SnsBenchmark.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.definitions
 
 import aws.sdk.kotlin.benchmarks.service.Common

diff --git a/...rvice-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/StsBenchmark.kt b/...rvice-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/definitions/StsBenchmark.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.definitions
 
 import aws.sdk.kotlin.benchmarks.service.Common

diff --git a/...arks/common/src/aws/sdk/kotlin/benchmarks/service/telemetry/BenchmarkTelemetryProvider.kt b/...arks/common/src/aws/sdk/kotlin/benchmarks/service/telemetry/BenchmarkTelemetryProvider.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.telemetry
 
 import aws.smithy.kotlin.runtime.ExperimentalApi

diff --git a/...enchmarks/common/src/aws/sdk/kotlin/benchmarks/service/telemetry/ConcurrentListBuilder.kt b/...enchmarks/common/src/aws/sdk/kotlin/benchmarks/service/telemetry/ConcurrentListBuilder.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.telemetry
 
 import kotlinx.atomicfu.atomic

diff --git a/...ice-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/telemetry/MetricAggregator.kt b/...ice-benchmarks/common/src/aws/sdk/kotlin/benchmarks/service/telemetry/MetricAggregator.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.telemetry
 
 import kotlin.math.roundToInt

diff --git a/...arks/common/test/aws/sdk/kotlin/benchmarks/service/telemetry/ConcurrentListBuilderTest.kt b/...arks/common/test/aws/sdk/kotlin/benchmarks/service/telemetry/ConcurrentListBuilderTest.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.telemetry
 
 import kotlin.test.Test

diff --git a/...enchmarks/common/test/aws/sdk/kotlin/benchmarks/service/telemetry/MetricAggregatorTest.kt b/...enchmarks/common/test/aws/sdk/kotlin/benchmarks/service/telemetry/MetricAggregatorTest.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package aws.sdk.kotlin.benchmarks.service.telemetry
 
 import org.junit.jupiter.api.Test

diff --git a/tests/integration-tests/ecs-credentials/app/build.gradle.kts b/tests/integration-tests/ecs-credentials/app/build.gradle.kts
@@ -1,3 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 plugins {
     kotlin("jvm") version "1.8.22"
     application

diff --git a/tests/integration-tests/ecs-credentials/settings.gradle.kts b/tests/integration-tests/ecs-credentials/settings.gradle.kts
@@ -1,2 +1,6 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 rootProject.name = "ecs-credentials-test"
 include("app")