From 9e79528edb0f2dfabbcfcc0fa6aca94c22ff2eb4 Mon Sep 17 00:00:00 2001 From: Nathan Klick Date: Fri, 25 Aug 2023 16:26:27 -0500 Subject: [PATCH] chore: ensure only the appropriate Helm chart versions are updated on release Signed-off-by: Nathan Klick --- buildSrc/src/main/kotlin/Utils.kt | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/buildSrc/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt index 9b77c9f16..1fcc3c6b1 100644 --- a/buildSrc/src/main/kotlin/Utils.kt +++ b/buildSrc/src/main/kotlin/Utils.kt @@ -30,7 +30,7 @@ class Utils { @JvmStatic fun updateHelmChartVersion(project: Project, chartName: String, newVersion: SemVer) { val manifestFile = File(project.rootProject.projectDir, "charts/${chartName}/Chart.yaml") - updateStringInFile(manifestFile, "version:", "version: $newVersion") + updateStringInFile(manifestFile, "version:", "version: $newVersion", false) } @JvmStatic @@ -39,31 +39,30 @@ class Utils { updateStringInFile(manifestFile, "appVersion:", "appVersion: \"${newVersion}\"") } - private fun updateStringInFile(file: File, startsWith: String, newString: String) { + private fun updateStringInFile(file: File, startsWith: String, newString: String, ignoreLeadingSpace: Boolean = true) { var lines: List = mutableListOf() if (file.exists()) { lines = file.readLines(Charsets.UTF_8) } - val finalLines: List - - if (lines.isNotEmpty()) { - finalLines = lines.map { - if (it.trimStart().startsWith(startsWith)) { + val finalLines: List = if (lines.isNotEmpty()) { + lines.map { + if (ignoreLeadingSpace && it.trimStart().startsWith(startsWith)) { + newString + } else if (it.startsWith(startsWith)) { newString } else { it } } } else { - finalLines = listOf(newString) + listOf(newString) } - file.bufferedWriter(Charsets.UTF_8).use { - val writer = it - finalLines.forEach { - writer.write(it) + file.bufferedWriter(Charsets.UTF_8).use { writer -> + finalLines.forEach { lines -> + writer.write(lines) writer.newLine() } writer.flush()