Ref #25533: support SpEL for max lifetime setting

Author: LEDfan

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

@@ -0,0 +1,36 @@
+/**
+ * ContainerProxy
+ *
+ * Copyright (C) 2016-2021 Open Analytics
+ *
+ * ===========================================================================
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Apache License as published by
+ * The Apache Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * Apache License for more details.
+ *
+ * You should have received a copy of the Apache License
+ * along with this program.  If not, see <http://www.apache.org/licenses/>
+ */
+package eu.openanalytics.containerproxy.model.runtime.runtimevalues;
+
+public class MaxLifetimeKey extends RuntimeValueKey<Long> {
+
+    private MaxLifetimeKey() {
+        super("openanalytics.eu/sp-max-lifetime",
+                "SHINYPROXY_MAX_LIFETIME",
+                false,
+                true,
+                false,
+                true, Long.class);
+    }
+
+    public static MaxLifetimeKey inst = new MaxLifetimeKey();
+
+}

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

@@ -60,6 +60,8 @@ public static RuntimeValueKey<?> getRuntimeValue(String key) {
         addRuntimeValueKey(UserGroupsKey.inst);
         addRuntimeValueKey(UserIdKey.inst);
         addRuntimeValueKey(ParametersKey.inst);
+        addRuntimeValueKey(HeartbeatTimeoutKey.inst);
+        addRuntimeValueKey(MaxLifetimeKey.inst);
     }
 
 }

src/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java

@@ -39,7 +39,7 @@ public class ProxySpec {
 
     private Parameters parameters;
 
-	private Long maxLifeTime;
+	private String maxLifeTime;
 	private Boolean stopOnLogout;
 	private String heartbeatTimeout;
 
@@ -132,11 +132,11 @@ public List<String> getKubernetesAdditionalPersistentManifests() {
 		return kubernetesAdditionalPersistentManifests;
 	}
 
-	public Long getMaxLifeTime() {
+	public String getMaxLifeTime() {
 		return maxLifeTime;
 	}
 
-	public void setMaxLifeTime(Long maxLifeTime) {
+	public void setMaxLifeTime(String maxLifeTime) {
 		this.maxLifeTime = maxLifeTime;
 	}
 

src/main/java/eu/openanalytics/containerproxy/service/ProxyMaxLifetimeService.java

@@ -22,6 +22,7 @@
 
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.model.runtime.ProxyStatus;
+import eu.openanalytics.containerproxy.model.runtime.runtimevalues.MaxLifetimeKey;
 import org.apache.commons.lang.time.DurationFormatUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -42,22 +43,15 @@
 public class ProxyMaxLifetimeService {
 
     private static final Integer CLEANUP_INTERVAL = 5 * 60 * 1000;
-    private static final String PROP_DEFAULT_PROXY_MAX_LIFETIME = "proxy.default-proxy-max-lifetime";
 
     private final Logger log = LogManager.getLogger(ProxyMaxLifetimeService.class);
 
     @Inject
     private ProxyService proxyService;
 
-    @Inject
-    private Environment environment;
-
-    private Long defaultMaxLifetime;
 
     @PostConstruct
     public void init() {
-        defaultMaxLifetime = environment.getProperty(PROP_DEFAULT_PROXY_MAX_LIFETIME, Long.class, -1L);
-
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
@@ -84,10 +78,7 @@ private Boolean mustBeReleased(Proxy proxy) {
             return false;
         }
 
-        Long maxLifeTime = proxy.getSpec().getMaxLifeTime();
-        if (maxLifeTime == null) {
-            maxLifeTime = defaultMaxLifetime;
-        }
+        Long maxLifeTime = proxy.getRuntimeObject(MaxLifetimeKey.inst);
 
         if (maxLifeTime > 0) {
             Instant notBeforeTime = Instant.now().minus(maxLifeTime, ChronoUnit.MINUTES);

src/main/java/eu/openanalytics/containerproxy/service/RuntimeValueService.java

@@ -23,6 +23,7 @@
 import eu.openanalytics.containerproxy.model.runtime.ProvidedParameters;
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.HeartbeatTimeoutKey;
+import eu.openanalytics.containerproxy.model.runtime.runtimevalues.MaxLifetimeKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.ParametersKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValue;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
@@ -41,9 +42,14 @@ public class RuntimeValueService {
 
     private static final String PROP_TIMEOUT = "proxy.heartbeat-timeout";
 
+    private static final String PROP_DEFAULT_PROXY_MAX_LIFETIME = "proxy.default-proxy-max-lifetime";
+
     private static final Long DEFAULT_TIMEOUT = 60000L;
 
     private long defaultHeartbeatTimeout;
+
+    private long defaultMaxLifetime;
+
     @Inject
     private ParametersService parametersService;
 
@@ -58,6 +64,7 @@ public class RuntimeValueService {
 
     public void init() {
         defaultHeartbeatTimeout = environment.getProperty(PROP_TIMEOUT, Long.class, DEFAULT_TIMEOUT);
+        defaultMaxLifetime = environment.getProperty(PROP_DEFAULT_PROXY_MAX_LIFETIME, Long.class, -1L);
     }
 
     public void createRuntimeValues(ProxySpec spec, ProvidedParameters parameters, Proxy proxy) throws InvalidParametersException {
@@ -76,6 +83,13 @@ public void createRuntimeValues(ProxySpec spec, ProvidedParameters parameters, P
         } else {
             proxy.addRuntimeValue(new RuntimeValue(HeartbeatTimeoutKey.inst, defaultHeartbeatTimeout));
         }
+
+        if (spec.getMaxLifeTime() != null) {
+            Long maxLifetime = expressionResolver.evaluateToLong(spec.getMaxLifeTime(), context);
+            proxy.addRuntimeValue(new RuntimeValue(MaxLifetimeKey.inst, maxLifetime));
+        } else {
+            proxy.addRuntimeValue(new RuntimeValue(MaxLifetimeKey.inst, defaultMaxLifetime));
+        }
     }
 
 }