Add more secret key names and switch to java 21

Author: ogesaku

build-logic/settings.gradle.kts

@@ -1,7 +1,6 @@
 rootProject.name = "build-logic"
 
 dependencyResolutionManagement {
-    @Suppress("UnstableApiUsage")
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # build tools
-java = "17"
+java = "21"
 jacoco = "0.8.11"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/coditory/quark/config/SecretHidingValueMapper.java

@@ -11,7 +11,9 @@ public class SecretHidingValueMapper implements ConfigEntryMapper {
     private static final Set<String> DEFAULT_SECRET_NAMES = Set.of(
             "password", "passwords",
             "secret", "secrets",
-            "token", "tokens"
+            "token", "tokens",
+            "key", "keys",
+            "apiKey", "apiKeys"
     );
 
     private static final SecretHidingValueMapper DEFAULT_SECRET_HIDING_VALUE_MAPPER =

src/test/groovy/com/coditory/quark/config/HideSecretValuesSpec.groovy

@@ -30,7 +30,7 @@ class HideSecretValuesSpec extends Specification {
             ]
         where:
             field << [
-                    "secret", "secrets", "password", "passwords", "token", "tokens"
+                    "secret", "secrets", "password", "passwords", "token", "tokens", "key", "keys", "apiKey", "apiKeys"
             ]
     }