Fix: allow SpEL when recovering apps

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/model/runtime/Proxy.java

@@ -16,7 +16,7 @@
  * 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/>
+ * along with this program.  If not, see http://www.apache.org/licenses/>
  */
 package eu.openanalytics.containerproxy.model.runtime;
 

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

@@ -20,6 +20,7 @@
  */
 package eu.openanalytics.containerproxy.service;
 
+import com.spotify.docker.client.messages.ContainerInfo;
 import eu.openanalytics.containerproxy.backend.IContainerBackend;
 import eu.openanalytics.containerproxy.model.runtime.Container;
 import eu.openanalytics.containerproxy.model.runtime.ExistingContainerInfo;
@@ -32,6 +33,8 @@
 import eu.openanalytics.containerproxy.model.spec.ContainerSpec;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
 import eu.openanalytics.containerproxy.spec.IProxySpecProvider;
+import eu.openanalytics.containerproxy.spec.expression.ExpressionAwareContainerSpec;
+import eu.openanalytics.containerproxy.spec.expression.SpecExpressionResolver;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -70,6 +73,9 @@ public class AppRecoveryService {
 	@Inject
 	private HeartbeatService heartbeatService;
 
+	@Inject
+	private SpecExpressionResolver expressionResolver;
+
 	private boolean isReady = false;
 
 	@EventListener(ApplicationReadyEvent.class)
@@ -115,7 +121,7 @@ public void recoverRunningApps() throws Exception {
 				proxy.addContainer(container);
 				proxy.setStatus(ProxyStatus.Up);
 
-				containerBackend.setupPortMappingExistingProxy(proxy, container, containerInfo.getPortBindings());
+				setupPortMapping(proxy, container, containerInfo);
 			}
 
 			for (Proxy proxy: proxies.values()) {
@@ -130,6 +136,14 @@ public void recoverRunningApps() throws Exception {
 		isReady = true;
 	}
 
+	private void setupPortMapping(Proxy proxy, Container container, ExistingContainerInfo containerInfo) throws Exception {
+		// interpret SpEL
+		ExpressionAwareContainerSpec eContainerSpec = new ExpressionAwareContainerSpec(container.getSpec(), proxy, expressionResolver);
+		container.setSpec(eContainerSpec);
+		containerBackend.setupPortMappingExistingProxy(proxy, container, containerInfo.getPortBindings());
+		container.setSpec(eContainerSpec);
+	}
+
 	public boolean isReady() {
         return isReady;
 	}

src/main/java/eu/openanalytics/containerproxy/spec/expression/ExpressionAwareContainerSpec.java

@@ -54,6 +54,15 @@ public ExpressionAwareContainerSpec(ContainerSpec source, Proxy proxy, SpecExpre
 				);
 	}
 
+	public ExpressionAwareContainerSpec(ContainerSpec source, Proxy proxy, SpecExpressionResolver resolver) {
+		this.source = source;
+		this.resolver = resolver;
+		this.context = SpecExpressionContext.create(source,
+				proxy,
+				proxy.getSpec()
+		);
+	}
+
 	public String getImage() {
 		return resolve(source.getImage());
 	}