Update detekt to 1.23.0 (#3551)

Author: rli

buildSrc/src/main/kotlin/toolkit-detekt.gradle.kts

@@ -1,6 +1,13 @@
 // Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
+import kotlin.reflect.KVisibility
+import kotlin.reflect.full.companionObject
+import kotlin.reflect.full.companionObjectInstance
+import kotlin.reflect.full.functions
+import kotlin.reflect.full.memberFunctions
+import kotlin.reflect.full.memberProperties
 
 plugins {
     id("io.gitlab.arturbosch.detekt")
@@ -16,13 +23,12 @@ dependencies {
 
 detekt {
     val rulesProject = project(":detekt-rules").projectDir
-    source.setFrom("$projectDir")
+    source.setFrom(projectDir)
     buildUponDefaultConfig = true
     parallel = true
     allRules = false
-    config = files("$rulesProject/detekt.yml")
+    config.setFrom("$rulesProject/detekt.yml")
     autoCorrect = true
-
 }
 
 tasks.withType<Detekt> {
@@ -31,3 +37,26 @@ tasks.withType<Detekt> {
         xml.required.set(true) // Checkstyle like format for CI tool integrations
     }
 }
+
+tasks.withType<DetektCreateBaselineTask> {
+    // weird issue where the baseline tasks can't find the source code
+    source.plus(projectDir)
+
+    // hack around https://github.com/detekt/detekt/issues/6167
+    doLast {
+        Class.forName("io.gitlab.arturbosch.detekt.invoke.DetektInvoker").kotlin.let { detektInvoker ->
+            val invokerInstance = detektInvoker.companionObject!!.memberFunctions.find { it.name == "create" }!!.call(detektInvoker.companionObjectInstance, false)
+            val invokeCliMethod = detektInvoker.memberFunctions.find { it.name == "invokeCli" }
+            val jdkHomeArgumentClass = Class.forName("io.gitlab.arturbosch.detekt.invoke.JdkHomeArgument").kotlin
+            val jdkHomeArgument = jdkHomeArgumentClass.constructors.first().call(jdkHome)
+            val jdkHomeArgs = jdkHomeArgumentClass.memberFunctions.find { it.name == "toArgument" }!!.call(jdkHomeArgument) as List<String>
+            val taskArgs = this::class.memberProperties.find { it.name == "arguments" }!!.call(this) as List<String>
+
+            val cliArgs = taskArgs + jdkHomeArgs
+            val ignoreFailures = ignoreFailures.getOrElse(false)
+            val classpath = detektClasspath.plus(pluginClasspath)
+            val taskName = name
+            invokeCliMethod!!.call(invokerInstance, cliArgs, classpath, taskName, ignoreFailures)
+        }
+    }
+}

buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts

@@ -60,6 +60,7 @@ tasks.withType<KotlinCompile>().all {
 tasks.withType<Detekt>().configureEach {
     jvmTarget = javaVersion.majorVersion
     dependsOn(":detekt-rules:assemble")
+    include("**/*.kt")
     exclude("build/**")
     exclude("**/*.Generated.kt")
     exclude("**/TelemetryDefinitions.kt")
@@ -68,14 +69,15 @@ tasks.withType<Detekt>().configureEach {
 tasks.withType<DetektCreateBaselineTask>().configureEach {
     jvmTarget = javaVersion.majorVersion
     dependsOn(":detekt-rules:assemble")
+    include("**/*.kt")
     exclude("build/**")
     exclude("**/*.Generated.kt")
     exclude("**/TelemetryDefinitions.kt")
 }
 
 project.afterEvaluate {
     tasks.check {
-        dependsOn(tasks.detekt, tasks.named("detektMain"), tasks.named("detektTest"))
+        dependsOn(tasks.detekt, tasks.detektMain, tasks.detektTest)
 
         tasks.findByName("detektIntegrationTest")?.let {
             dependsOn(it)

core/detekt-baseline-main.xml

@@ -2,6 +2,7 @@
 <SmellBaseline>
   <ManuallySuppressedIssues/>
   <CurrentIssues>
+    <ID>SleepInsteadOfDelay:Waiter.kt$sleep(delay.toMillis())</ID>
     <ID>UseCheckOrError:LambdaRuntime.kt$LambdaRuntime$throw IllegalStateException("LambdaRuntime has no runtime or override string")</ID>
     <ID>UseCheckOrError:ToolkitRegionProvider.kt$ToolkitRegionProvider$throw IllegalStateException("$serviceId in ${region.partitionId} lacks a partitionEndpoint")</ID>
     <ID>UseCheckOrError:ToolkitRegionProvider.kt$ToolkitRegionProvider$throw IllegalStateException("$serviceId is not global in ${region.partitionId}")</ID>

core/detekt-baseline-test.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='UTF-8'?>
 <SmellBaseline>
-  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <ManuallySuppressedIssues/>
   <CurrentIssues>
     <ID>UnsafeCallOnNullableType:EnvironmentVariableHelper.kt$EnvironmentVariableHelper$getField(System.getenv().javaClass, System.getenv(), "m")!!</ID>
     <ID>UnsafeCallOnNullableType:PartitionParserTest.kt$PartitionParserTest$PartitionParser.parse(BundledResources.ENDPOINTS_FILE)!!</ID>

core/tst/software/aws/toolkits/core/parser/EndpointsJsonValidatorTest.kt

@@ -14,6 +14,7 @@ class EndpointsJsonValidatorTest {
             assertThat(EndpointsJsonValidator.canBeParsed(it)).isTrue
         }
     }
+
     @Test
     fun `endpoints json file parsing fails`() {
         EndpointsJsonValidatorTest::class.java.getResourceAsStream("/jsonSampleFailure.json").use {

core/tst/software/aws/toolkits/core/parser/LambdaManifestValidatorTest.kt

@@ -15,6 +15,7 @@ class LambdaManifestValidatorTest {
             assertThat(LambdaManifestValidator.canBeParsed(it)).isTrue
         }
     }
+
     @Test
     fun `manifest xml file parsing fails`() {
         LambdaManifestValidatorTest::class.java.getResourceAsStream("/xmlSampleFailure.xml").use {

core/tst/software/aws/toolkits/core/parser/LambdaSampleEventJsonValidatorTest.kt

@@ -13,6 +13,7 @@ class LambdaSampleEventJsonValidatorTest {
             assertThat(LambdaSampleEventJsonValidator.canBeParsed(it)).isTrue
         }
     }
+
     @Test
     fun `lambda sample event json file parsing fails`() {
         LambdaSampleEventJsonValidatorTest::class.java.getResourceAsStream("/jsonSampleFailure.json").use {

core/tst/software/aws/toolkits/core/rules/EnvironmentVariableHelper.kt

@@ -14,6 +14,7 @@ import java.security.PrivilegedAction
 class EnvironmentVariableHelper : ExternalResource() {
     private val originalEnvironmentVariables = System.getenv().toMap()
     private val modifiableMap = getProcessEnvMap() ?: getEnvMap()
+
     @Volatile
     private var mutated = false
 

core/tst/software/aws/toolkits/core/utils/RemoteResourceResolverTest.kt

@@ -69,6 +69,7 @@ class RemoteResourceResolverTest {
         assertThat(secondCall).hasContent("data2")
         verify(urlFetcher, times(2)).fetch(eq(PRIMARY_URL), any())
     }
+
     @Test
     fun downloadedParseFailedSkippedMove() {
         val urlFetcher = mock<UrlFetcher> {

detekt-rules/build.gradle.kts

@@ -20,3 +20,7 @@ dependencies {
 tasks.test {
     useJUnitPlatform()
 }
+
+tasks.jar {
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}