Replace resource-name lable by realm-id

Author: LEDfan

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/LabelFactory.kt

@@ -25,33 +25,25 @@ import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 
 object LabelFactory {
 
-    fun labelsForCurrentShinyProxyInstance(shinyProxy: ShinyProxy): Map<String, String> {
-        return mapOf(
-            APP_LABEL to APP_LABEL_VALUE,
-            NAME_LABEL to shinyProxy.metadata.name,
-            INSTANCE_LABEL to shinyProxy.hashOfCurrentSpec
-        )
-    }
-
     fun labelsForShinyProxyInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance): Map<String, String> {
         val hashOfSpec = shinyProxyInstance.hashOfSpec
         return mapOf(
             APP_LABEL to APP_LABEL_VALUE,
-            NAME_LABEL to shinyProxy.metadata.name,
+            REALM_ID_LABEL to shinyProxy.realmId,
             INSTANCE_LABEL to hashOfSpec
         )
     }
 
     fun labelsForShinyProxy(shinyProxy: ShinyProxy): Map<String, String> {
         return mapOf(
             APP_LABEL to APP_LABEL_VALUE,
-            NAME_LABEL to shinyProxy.metadata.name
+            REALM_ID_LABEL to shinyProxy.realmId
         )
     }
 
     const val APP_LABEL = "app"
     const val APP_LABEL_VALUE = "shinyproxy"
-    const val NAME_LABEL = "openanalytics.eu/sp-resource-name"
+    const val REALM_ID_LABEL = "openanalytics.eu/sp-realm-id"
     const val INSTANCE_LABEL = "openanalytics.eu/sp-instance"
     const val LATEST_INSTANCE_LABEL = "openanalytics.eu/sp-latest-instance"
     const val PROXIED_APP = "openanalytics.eu/sp-proxied-app"

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/PodTemplateSpecFactory.kt

@@ -74,7 +74,7 @@ class PodTemplateSpecFactory {
                             .build(),
                             EnvVarBuilder()
                                 .withName("PROXY_REALM_ID")
-                                .withValue(shinyProxy.metadata.name + '-' + shinyProxy.metadata.namespace)
+                                .withValue(shinyProxy.realmId)
                             .build()))
                         .withVolumeMounts(VolumeMountBuilder()
                             .withName("config-volume")

src/main/kotlin/eu/openanalytics/shinyproxyoperator/crd/ShinyProxy.kt

@@ -156,6 +156,11 @@ class ShinyProxy : CustomResource<JsonNode, ShinyProxyStatus>(), Namespaced {
         return@lazy specAsYaml.sha1()
     }
 
+    @get:JsonIgnore
+    val realmId: String by lazy {
+        return@lazy "${metadata.name}-${metadata.namespace}"
+    }
+
 
     fun logPrefix(shinyProxyInstance: ShinyProxyInstance): String {
         return "[${metadata.namespace}/${metadata.name}/${shinyProxyInstance.hashOfSpec}]"

src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ShinyProxyTestInstance.kt

@@ -106,7 +106,7 @@ class ShinyProxyTestInstance(private val namespace: String,
 
         assertEquals(mapOf(
             LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
-            LabelFactory.NAME_LABEL to sp.metadata.name
+            LabelFactory.REALM_ID_LABEL to sp.metadata.name
         ), ingress.metadata.labels)
 
         assertOwnerReferenceIsCorrect(ingress, sp)
@@ -131,7 +131,7 @@ class ShinyProxyTestInstance(private val namespace: String,
 
         assertEquals(mapOf(
             LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
-            LabelFactory.NAME_LABEL to sp.metadata.name,
+            LabelFactory.REALM_ID_LABEL to sp.metadata.name,
             LabelFactory.LATEST_INSTANCE_LABEL to sp.status.latestInstance()!!.hashOfSpec
         ), service.metadata.labels)
 
@@ -143,7 +143,7 @@ class ShinyProxyTestInstance(private val namespace: String,
         assertEquals(IntOrString(8080), service.spec.ports[0].targetPort)
         assertEquals(mapOf(
             LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
-            LabelFactory.NAME_LABEL to sp.metadata.name,
+            LabelFactory.REALM_ID_LABEL to sp.metadata.name,
             LabelFactory.INSTANCE_LABEL to sp.status.latestInstance()!!.hashOfSpec // TODO
         ), service.spec.selector)
 
@@ -223,7 +223,7 @@ class ShinyProxyTestInstance(private val namespace: String,
     fun assertLabelsAreCorrect(resource: HasMetadata, sp: ShinyProxy) {
         assertEquals(mapOf(
             LabelFactory.APP_LABEL to LabelFactory.APP_LABEL_VALUE,
-            LabelFactory.NAME_LABEL to sp.metadata.name,
+            LabelFactory.REALM_ID_LABEL to sp.metadata.name,
             LabelFactory.INSTANCE_LABEL to hash
         ), resource.metadata.labels)
     }