Small fixes

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/proxysharing/DelegateProxyKey.java

@@ -28,7 +28,7 @@ public class DelegateProxyKey extends RuntimeValueKey<Boolean> {
 
     private DelegateProxyKey() {
         super("openanalytics.eu/sp-delegate-proxy",
-            "SHINYPROXY_DELEGATE_PROXYS",
+            "SHINYPROXY_DELEGATE_PROXY",
             true,
             false,
             false,

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

@@ -325,7 +325,7 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
 
 
             Pod startupPod = podBuilder.withSpec(podSpec).build();
-            Pod patchedPod = applyPodPatches(user, proxySpec, specExtension, proxy, startupPod);
+            Pod patchedPod = applyPodPatches(user, proxySpec, specExtension, proxy, startupPod, initialContainer);
             final String effectiveKubeNamespace = patchedPod.getMetadata().getNamespace(); // use the namespace of the patched Pod, in case the patch changes the namespace.
             // set the BackendContainerName now, so that the pod can be deleted in case other steps of this function fails
             rContainerBuilder.addRuntimeValue(new RuntimeValue(BackendContainerNameKey.inst, effectiveKubeNamespace + "/" + patchedPod.getMetadata().getName()), false);
@@ -404,11 +404,11 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
         }
     }
 
-    private Pod applyPodPatches(Authentication auth, ProxySpec proxySpec, KubernetesSpecExtension specExtension, Proxy proxy, Pod startupPod) throws JsonProcessingException {
+    private Pod applyPodPatches(Authentication auth, ProxySpec proxySpec, KubernetesSpecExtension specExtension, Proxy proxy, Pod startupPod, Container container) throws JsonProcessingException {
         Pod patchedPod = podPatcher.patchWithDebug(proxy, startupPod, readPatchFromSpec(specExtension.kubernetesPodPatches));
 
         for (AuthorizedPodPatches authorizedPodPatches : specExtension.kubernetesAuthorizedPodPatches) {
-            if (accessControlEvaluationService.checkAccess(auth, proxySpec, authorizedPodPatches.accessControl)) {
+            if (accessControlEvaluationService.checkAccess(auth, proxySpec, authorizedPodPatches.accessControl, proxy, container)) {
                 patchedPod = podPatcher.patchWithDebug(proxy, patchedPod, readPatchFromSpec(authorizedPodPatches.patches));
             }
         }

src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RuntimeValueKeyRegistry.java

@@ -52,7 +52,6 @@ public class RuntimeValueKeyRegistry {
         addRuntimeValueKey(PublicPathKey.inst);
         addRuntimeValueKey(HttpHeadersKey.inst);
         addRuntimeValueKey(TargetIdKey.inst);
-        addRuntimeValueKey(TaskDefinitionKey.inst);
         addRuntimeValueKey(CacheHeadersModeKey.inst);
     }
 

src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/TaskDefinitionKey.java

@@ -127,7 +127,6 @@ public ProxySpec firstResolve(SpecExpressionResolver resolver, SpecExpressionCon
         return toBuilder()
             .heartbeatTimeout(heartbeatTimeout.resolve(resolver, context))
             .maxLifeTime(maxLifeTime.resolve(resolver, context))
-            .maxTotalInstances(maxTotalInstances)
             .specExtensions(
                 specExtensions.entrySet()
                     .stream()
@@ -140,7 +139,6 @@ public ProxySpec firstResolve(SpecExpressionResolver resolver, SpecExpressionCon
                     .map(c -> c.firstResolve(resolver, context.copy(c)))
                     .toList()
             )
-            .cacheHeadersMode(cacheHeadersMode)
             .build();
     }