Use Spotless with ktlint

.github/workflows/app-test.yaml

@@ -38,8 +38,8 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
 
-      - name: Run ktlint Check
-        run: ./gradlew :ktlintCheck --stacktrace --configuration-cache
+      - name: Run Spotless Check
+        run: ./gradlew :spotlessCheck --stacktrace --configuration-cache
 
   unit-tests:
     name: Run Unit Tests

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     kotlin("jvm")
     application
     alias(libs.plugins.fabric8.generator)
-    alias(libs.plugins.ktlint)
+    alias(libs.plugins.spotless)
 }
 
 group = "no.fintlabs"
@@ -187,6 +187,15 @@ tasks {
     }
 }
 
+spotless {
+    kotlin {
+        ktlint(libs.versions.ktlint.get())
+    }
+    kotlinGradle {
+        ktlint(libs.versions.ktlint.get())
+    }
+}
+
 fun fetchNumCores(): Int =
     Runtime
         .getRuntime()

gradle/libs.versions.toml

@@ -11,6 +11,8 @@ jackson = "2.21.5"
 logunit = "2.0.0"
 http4k = "6.53.0.0"
 micrometer = "1.17.0"
+ktlint = "1.8.0"
+spotless = "8.8.0"
 
 [libraries]
 fabric8-kubernetes-client = { module = "io.fabric8:kubernetes-client", version.ref = "fabric8" }
@@ -51,7 +53,7 @@ koin-test-junit5 = { module = "io.insert-koin:koin-test-junit5" }
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.4.0"}
 fabric8-generator = { id = "io.fabric8.java-generator", version.ref = "fabric8" }
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version="14.2.0" }
+spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 
 [bundles]
 operator = ["operator-framework-core", "operator-micrometer-support"]

scripts/hooks/pre-commit

@@ -3,21 +3,21 @@
 repository_root=$(git rev-parse --show-toplevel)
 cd "$repository_root" || exit 1
 
-echo "[git pre-commit hook] Running ktlintFormat before commit."
+echo "[git pre-commit hook] Running spotlessApply before commit."
 
 staged_files=$(git diff --name-only --cached --diff-filter=d)
 if [ -z "$staged_files" ]; then
     echo "No staged files, skipping formatting."
     exit 0
 fi
 
-./gradlew :ktlintFormat --configuration-cache
+./gradlew :spotlessApply --configuration-cache --daemon
 status=$?
 
-echo "Finished ktlintFormat with status: $status"
+echo "Finished spotlessApply with status: $status"
 
 if [ "$status" -ne 0 ]; then
-    echo "Error running ktlintFormat, aborting commit."
+    echo "Error running spotlessApply, aborting commit."
     exit "$status"
 fi
 

src/main/kotlin/no/fintlabs/application/matcher/CustomGenericKubernetesResourceMatcher.kt

@@ -138,16 +138,25 @@ class CustomGenericKubernetesResourceMatcher<R : HasMetadata> {
         resourceMap: MutableMap<String, Any>,
     ) {
         when (resource) {
-            is Pod -> resource.spec.containers.normalizeContainers(resourceMap)
-            is Deployment ->
+            is Pod -> {
+                resource.spec.containers.normalizeContainers(resourceMap)
+            }
+
+            is Deployment -> {
                 resource.spec.template.spec.containers
                     .normalizeContainers(resourceMap)
-            is Job ->
+            }
+
+            is Job -> {
                 resource.spec.template.spec.containers
                     .normalizeContainers(resourceMap)
-            is ReplicaSet ->
+            }
+
+            is ReplicaSet -> {
                 resource.spec.template.spec.containers
                     .normalizeContainers(resourceMap)
+            }
+
             is StatefulSet -> {
                 resource.spec.template.spec.containers
                     .normalizeContainers(resourceMap)
@@ -162,10 +171,14 @@ class CustomGenericKubernetesResourceMatcher<R : HasMetadata> {
                     )
                 }
             }
-            is PersistentVolumeClaim ->
+
+            is PersistentVolumeClaim -> {
                 resource.spec.resources?.normalizeResources(resourceMap, "spec", "resources")
-            is PersistentVolume ->
+            }
+
+            is PersistentVolume -> {
                 resource.spec.capacity?.normalizeQuantity(resourceMap, "spec", "capacity")
+            }
         }
     }
 

src/test/integration/kotlin/no/fintlabs/extensions/KubernetesResourceSource.kt

@@ -28,9 +28,13 @@ class KubernetesResourceSource(
 
         private fun fromPath(path: Path): List<KubernetesResourceSource> =
             when {
-                Files.isDirectory(path) ->
+                Files.isDirectory(path) -> {
                     path.toFile().listFiles()?.flatMap { fromPath(it.toPath()) } ?: emptyList()
-                else -> listOf(KubernetesResourceSource(path.toFile()))
+                }
+
+                else -> {
+                    listOf(KubernetesResourceSource(path.toFile()))
+                }
             }
 
         fun fromResources(resources: List<String>): List<KubernetesResourceSource> =