From 19073b96a7ed53dbda61337465ca898c1482e090 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 31 May 2023 20:43:35 +0200 Subject: [PATCH] [Build] Add a property to disable usernames obfuscation for build scans The property is `kotlin.build.scan.obfuscate.username` --- .../kotlin/gradle-enterprise.settings.gradle.kts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/repo/gradle-settings-conventions/gradle-enterprise/src/main/kotlin/gradle-enterprise.settings.gradle.kts b/repo/gradle-settings-conventions/gradle-enterprise/src/main/kotlin/gradle-enterprise.settings.gradle.kts index 807e50e0024..071a48a3091 100644 --- a/repo/gradle-settings-conventions/gradle-enterprise/src/main/kotlin/gradle-enterprise.settings.gradle.kts +++ b/repo/gradle-settings-conventions/gradle-enterprise/src/main/kotlin/gradle-enterprise.settings.gradle.kts @@ -6,7 +6,6 @@ plugins { val buildProperties = getKotlinBuildPropertiesForSettings(settings) val buildScanServer = buildProperties.buildScanServer -val isTeamCity = buildProperties.isTeamcityBuild if (buildProperties.buildScanServer != null) { plugins.apply("com.gradle.common-custom-user-data-gradle-plugin") @@ -29,11 +28,19 @@ gradleEnterprise { termsOfServiceAgree = "yes" } - val username = if (isTeamCity) "TeamCity" else "concealed" + val overridenName = (buildProperties.getOrNull("kotlin.build.scan.username") as? String)?.trim() + val isTeamCity = buildProperties.isTeamcityBuild obfuscation { ipAddresses { _ -> listOf("0.0.0.0") } hostname { _ -> "concealed" } - username { _ -> username } + username { originalUsername -> + when { + isTeamCity -> "TeamCity" + overridenName == null || overridenName.isEmpty() -> "concealed" + overridenName == "" -> originalUsername + else -> overridenName + } + } } } }