Add Integration tests for Expressions in patches/manifests

Author: LEDfan

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnKube.java

@@ -60,6 +60,7 @@
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
 import eu.openanalytics.containerproxy.service.ProxyService;
+import eu.openanalytics.containerproxy.service.UserService;
 import eu.openanalytics.containerproxy.test.proxy.TestIntegrationOnKube.TestConfiguration;
 import eu.openanalytics.containerproxy.util.ProxyMappingManager;
 import io.fabric8.kubernetes.api.model.ContainerStatus;
@@ -77,6 +78,7 @@
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.ServiceAccountBuilder;
 import io.fabric8.kubernetes.api.model.ServiceList;
+import io.fabric8.kubernetes.api.model.Volume;
 import io.fabric8.kubernetes.api.model.VolumeMount;
 import io.fabric8.kubernetes.client.KubernetesClient;
 
@@ -248,7 +250,7 @@ public void launchProxyWithEnv() throws Exception {
 		List<EnvVar> envList = pod.getSpec().getContainers().get(0).getEnv();
 		Map<String, EnvVar> env = envList.stream().collect(Collectors.toMap(EnvVar::getName, e -> e));
 		assertTrue(env.containsKey("SHINYPROXY_USERNAME"));
-		assertEquals("null", env.get("SHINYPROXY_USERNAME").getValue()); // value is a String "null"
+		assertEquals("jack", env.get("SHINYPROXY_USERNAME").getValue()); // value is a String "null"
 		assertTrue(env.containsKey("SHINYPROXY_USERGROUPS"));
 		assertEquals(null, env.get("SHINYPROXY_USERGROUPS").getValue());
 		assertTrue(env.containsKey("VAR1"));
@@ -672,6 +674,64 @@ public void launchProxyWithAdditionalManifestsOfWhichOneAlreadyExists() throws E
 		}
 	}
 
+	
+	/**
+	 * Tests the use of Spring Epxression in kubernetes patches and additional manifests.
+	 */
+	@Test
+	public void launchProxyWithExpressionInPatchAndManifests() throws Exception {
+		String specId = environment.getProperty("proxy.specs[9].id");
+
+		ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
+		ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
+		Proxy proxy = proxyService.startProxy(spec, true);
+		String containerId = proxy.getContainers().get(0).getId();
+
+		PodList podList = client.pods().inNamespace(session.getNamespace()).list();
+		assertEquals(1, podList.getItems().size());
+		Pod pod = podList.getItems().get(0);
+		assertEquals("Running", pod.getStatus().getPhase());
+		assertEquals(session.getNamespace(), pod.getMetadata().getNamespace());
+		assertEquals("sp-pod-" + containerId, pod.getMetadata().getName());
+		assertEquals(1, pod.getStatus().getContainerStatuses().size());
+		ContainerStatus container = pod.getStatus().getContainerStatuses().get(0);
+		assertEquals(true, container.getReady());
+		assertEquals("openanalytics/shinyproxy-demo:latest", container.getImage());
+		
+		
+		// check env variables
+		List<EnvVar> envList = pod.getSpec().getContainers().get(0).getEnv();
+		Map<String, EnvVar> env = envList.stream().collect(Collectors.toMap(EnvVar::getName, e -> e));
+		assertTrue(env.containsKey("CUSTOM_USERNAME"));
+		assertTrue(env.containsKey("PROXY_ID"));
+		assertEquals("jack", env.get("CUSTOM_USERNAME").getValue());
+		assertEquals(proxy.getId(), env.get("PROXY_ID").getValue());
+		
+		PersistentVolumeClaimList claimList = client.persistentVolumeClaims().inNamespace(session.getNamespace()).list();
+		assertEquals(1, claimList.getItems().size());
+		PersistentVolumeClaim claim = claimList.getItems().get(0);
+		assertEquals(session.getNamespace(), claim.getMetadata().getNamespace());
+		assertEquals("home-dir-pvc-jack", claim.getMetadata().getName());
+		
+		// check volume mount
+		Volume volume = pod.getSpec().getVolumes().get(0);
+		assertEquals("home-dir-pvc-jack", volume.getName());
+		assertEquals("home-dir-pvc-jack", volume.getPersistentVolumeClaim().getClaimName());
+
+		proxyService.stopProxy(proxy, false, true);
+
+		// Give Kube the time to clean
+		Thread.sleep(2000);
+
+		// all pods should be deleted
+		podList = client.pods().inNamespace(session.getNamespace()).list();
+		assertEquals(0, podList.getItems().size());
+		// all additional manifests should be deleted
+		assertEquals(0, client.persistentVolumeClaims().inNamespace(session.getNamespace()).list().getItems().size());
+
+		assertEquals(0, proxyService.getProxies(null, true).size());
+	}
+	
 	private final String overridenNamespace = "it-b9fa0a24-overriden";
 
 	private void createOverridenNamespace() throws InterruptedException {
@@ -695,6 +755,12 @@ private void deleteOverridenNamespace() throws InterruptedException {
 		}
 	}
 
+	public static class MockedUserService extends UserService {
+		public String getCurrentUserId() {
+			return "jack";
+		}
+	}
+
 	public static class TestConfiguration {
 		@Bean
 		@Primary
@@ -708,6 +774,12 @@ public AbstractFactoryBean<IContainerBackend> backendFactory() {
 			return new TestContainerBackendFactory();
 		}
 
+		@Bean
+		@Primary
+		public UserService mockedUserService() {
+			return new MockedUserService();
+		}
+
 	}
 
 	public static class TestContainerBackendFactory extends AbstractFactoryBean<IContainerBackend>

src/test/resources/application-test.yml

@@ -149,6 +149,46 @@ proxy:
          data:
            password: cGFzc3dvcmQ=
 
+  - id: 01_hello_manifests_espression
+    container-specs:
+    - image: "openanalytics/shinyproxy-demo"
+      cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
+      port-mapping:
+        default: 3838
+    kubernetes-pod-patches: |
+      - op: add
+        path: /spec/containers/0/env/-
+        value: 
+           name: CUSTOM_USERNAME
+           value: "#{proxy.userId}"
+      - op: add
+        path: /spec/containers/0/env/-
+        value: 
+           name: PROXY_ID
+           value: "#{proxy.id}"
+      - op: add
+        path: /spec/volumes
+        value:
+          - name: "home-dir-pvc-#{proxy.userId}"
+            persistentVolumeClaim:
+              claimName: "home-dir-pvc-#{proxy.userId}"
+      - op: add
+        path: /spec/containers/0/volumeMounts
+        value:
+          - mountPath: "/home/#{proxy.userId}"
+            name: "home-dir-pvc-#{proxy.userId}"
+    kubernetes-additional-manifests:
+      - |
+        apiVersion: v1
+        kind: PersistentVolumeClaim
+        metadata:
+          name: "home-dir-pvc-#{proxy.userId}"
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 5Gi
   - id: 02_hello
     container-specs:
     - image: "openanalytics/shinyproxy-demo"