Merge pull request 'Make compatible with shinyproxy-operator' (#7) from feature/23003 into develop

Good point!

Author: fmichielssen

.settings/org.eclipse.jdt.core.prefs

@@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

pom.xml

@@ -132,6 +132,14 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.lettuce</groupId>
+			<artifactId>lettuce-core</artifactId>
+		</dependency>
 
 		<!-- Spring social security components -->
 		<!-- Note: also includes an embedded datasource (H2) to remember social logins -->

src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java

@@ -48,8 +48,8 @@
 @SpringBootApplication
 @ComponentScan("eu.openanalytics")
 public class ContainerProxyApplication {
-	private static final String CONFIG_FILENAME = "application.yml";
-	private static final String CONFIG_DEMO_PROFILE = "demo";
+	public static final String CONFIG_FILENAME = "application.yml";
+	public static final String CONFIG_DEMO_PROFILE = "demo";
 
 	@Inject
 	private Environment environment;
@@ -123,6 +123,9 @@ private static void setDefaultProperties(SpringApplication app ) {
 		Properties properties = new Properties();
 		properties.put("management.health.ldap.enabled", false);
 		properties.put("management.endpoint.health.probes.enabled", true);
+	
+		// use in-memory session storage by default. Can be overwritten in application.yml
+		properties.put("spring.session.store-type", "none");
 		app.setDefaultProperties(properties);
 	}
 

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

@@ -21,12 +21,16 @@
 package eu.openanalytics.containerproxy.backend.kubernetes;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.math.BigInteger;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -40,8 +44,16 @@
 
 import org.apache.commons.io.IOUtils;
 
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.google.common.base.Charsets;
 import com.google.common.base.Splitter;
 
+import eu.openanalytics.containerproxy.ContainerProxyApplication;
 import eu.openanalytics.containerproxy.ContainerProxyException;
 import eu.openanalytics.containerproxy.backend.AbstractContainerBackend;
 import eu.openanalytics.containerproxy.model.runtime.Container;
@@ -97,6 +109,10 @@ public class KubernetesBackend extends AbstractContainerBackend {
 
 	private static final String SECRET_KEY_REF = "secretKeyRef";
 
+	private static final String LABEL_PROXIED_APP = "openanalytics.eu/containerproxy-proxied-app";
+	private static final String LABEL_INSTANCE = "openanalytics.eu/sp-instance";
+		
+	
 	@Inject
 	private PodPatcher podPatcher;
 
@@ -122,6 +138,11 @@ public void initialize() throws ContainerProxyException {
 		}
 
 		kubeClient = new DefaultKubernetesClient(configBuilder.build());
+		try {
+			log.info("Hash of config is: " + getInstanceId());
+		} catch(Exception e) {
+			throw new RuntimeException("Cannot compute hash of config", e);
+		}
 	}
 
 	public void initialize(KubernetesClient client) {
@@ -222,7 +243,9 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 					.withName("sp-pod-" + container.getId())
 					.addToLabels(spec.getLabels())
 					.addToLabels("app", container.getId())
-					.endMetadata();
+					.addToLabels(LABEL_INSTANCE, getInstanceId())
+					.addToLabels(LABEL_PROXIED_APP, "true")
+				.endMetadata();
 
 		PodSpec podSpec = new PodSpec();
 		podSpec.setContainers(Collections.singletonList(containerBuilder.build()));
@@ -262,6 +285,8 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 					.withKind("Service")
 					.withNewMetadata()
 						.withName("sp-service-" + container.getId())
+						.addToLabels(LABEL_INSTANCE, getInstanceId())
+						.addToLabels(LABEL_PROXIED_APP, "true")
 						.endMetadata()
 					.withNewSpec()
 						.addToSelector("app", container.getId())
@@ -406,6 +431,42 @@ public BiConsumer<OutputStream, OutputStream> getOutputAttacher(Proxy proxy) {
 	protected String getPropertyPrefix() {
 		return PROPERTY_PREFIX;
 	}
+	
+	private String instanceId = null;
+	
+	/**
+	 * Calculates a hash of the config file (i.e. application.yaml).
+	 */
+	private String getInstanceId() throws JsonParseException, JsonMappingException, IOException, NoSuchAlgorithmException {
+		if (instanceId != null) {
+			return instanceId;
+		}
+		
+		/**
+		 * We need a hash of some "canonical" version of the config file.
+		 * The hash should not change when e.g. comments are added to the file.
+		 * Therefore we read the application.yml file into an Object and then 
+		 * dump it again into YAML. We also sort the keys of maps and properties so that
+		 * the order does not matter for the resulting hash.
+		 */
+		ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
+		objectMapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
+		objectMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
+        
+		File file = Paths.get(ContainerProxyApplication.CONFIG_FILENAME).toFile();
+		if (!file.exists()) {
+			file = Paths.get(ContainerProxyApplication.CONFIG_DEMO_PROFILE).toFile();
+		}
+
+		Object parsedConfig = objectMapper.readValue(file, Object.class);
+		String canonicalConfigFile =  objectMapper.writeValueAsString(parsedConfig);
+		
+		MessageDigest digest = MessageDigest.getInstance("SHA-1");
+		digest.reset();
+		digest.update(canonicalConfigFile.getBytes(Charsets.UTF_8));
+		instanceId = String.format("%040x", new BigInteger(1, digest.digest()));
+		return instanceId;
+	}
 
 
 }