From 151281320663b64b868362f60c9dab2d97575bb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Tue, 8 Mar 2022 13:56:26 +0100
Subject: [PATCH] Improve code readability
---
.../theodolite/benchmark/ConfigMapResourceSet.kt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/theodolite/src/main/kotlin/theodolite/benchmark/ConfigMapResourceSet.kt b/theodolite/src/main/kotlin/theodolite/benchmark/ConfigMapResourceSet.kt
index f85b83497..19999c780 100644
--- a/theodolite/src/main/kotlin/theodolite/benchmark/ConfigMapResourceSet.kt
+++ b/theodolite/src/main/kotlin/theodolite/benchmark/ConfigMapResourceSet.kt
@@ -43,14 +43,14 @@ class ConfigMapResourceSet : ResourceSet, KubernetesResource {
resources
.map {
Pair(
- getKind(resource = it.value),
+ getKind(resourceYaml = it.value),
it
)
}
.map {
Pair(
- it.second.key,
- loader.loadK8sResource(it.first, it.second.value)
+ it.second.key, // filename
+ loader.loadK8sResource(kind = it.first, resourceString = it.second.value) // K8s resource
)
}
} catch (e: IllegalArgumentException) {
@@ -59,11 +59,11 @@ class ConfigMapResourceSet : ResourceSet, KubernetesResource {
}
- private fun getKind(resource: String): String {
+ private fun getKind(resourceYaml: String): String {
val parser = YamlParserFromString()
- val resourceAsMap = parser.parse(resource, HashMap<String, String>()::class.java)
+ val resourceAsMap = parser.parse(resourceYaml, HashMap<String, String>()::class.java)
return resourceAsMap?.get("kind")
- ?: throw DeploymentFailedException("Could not find field kind of Kubernetes resource: ${resourceAsMap?.get("name")}")
+ ?: throw DeploymentFailedException("Could not find 'kind' field of Kubernetes resource: ${resourceAsMap?.get("name")}")
}
}
\ No newline at end of file
--
GitLab