Merge pull request '#27576: allow accessing apps of older instances' (#62) from feature/27576/access-old into develop

Author: LEDfan

kubernetesPod.yaml

@@ -12,10 +12,17 @@ spec:
    - name: containerproxy-build
      image: 196229073436.dkr.ecr.eu-west-1.amazonaws.com/openanalytics/containerproxy-build
      securityContext:
-      privileged: true  
+      privileged: true
      command: ["sh"]
      args: ["/usr/src/app/docker-entrypoint.sh"]
      tty: true
      volumeMounts:
       - mountPath: ~/.m2
-        name: maven-repo
+        name: maven-repo
+     resources:
+       requests:
+         memory: "2Gi"
+         cpu: "1.0"
+       limits:
+         memory: "4Gi"
+         cpu: "1.5"

src/main/java/eu/openanalytics/containerproxy/backend/AbstractContainerBackend.java

@@ -120,7 +120,6 @@ public void initialize() throws ContainerProxyException {
 
 	@Override
 	public SuccessOrFailure<Proxy> startProxy(Proxy proxy) throws ContainerProxyException {
-		proxy.setId(UUID.randomUUID().toString());
 		proxy.setStatus(ProxyStatus.Starting);
 		proxy.setCreatedTimestamp(System.currentTimeMillis());
 		setRuntimeValues(proxy);

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

@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiConsumer;
@@ -250,7 +251,7 @@ public List<Proxy> getProxiesOfCurrentUser(Predicate<Proxy> filter) {
 	 * @throws ContainerProxyException If the proxy fails to start for any reason.
 	 */
 	public Proxy startProxy(ProxySpec spec, boolean ignoreAccessControl) throws ContainerProxyException {
-	    return startProxy(spec, ignoreAccessControl, null);
+	    return startProxy(spec, ignoreAccessControl, null, UUID.randomUUID().toString());
     }
 
 	/**
@@ -262,12 +263,13 @@ public Proxy startProxy(ProxySpec spec, boolean ignoreAccessControl) throws Cont
 	 * @return The newly launched proxy.
 	 * @throws ContainerProxyException If the proxy fails to start for any reason.
 	 */
-	public Proxy startProxy(ProxySpec spec, boolean ignoreAccessControl, List<RuntimeValue> runtimeValues) throws ContainerProxyException {
+	public Proxy startProxy(ProxySpec spec, boolean ignoreAccessControl, List<RuntimeValue> runtimeValues, String proxyId) throws ContainerProxyException {
 		if (!ignoreAccessControl && !userService.canAccess(spec)) {
 			throw new AccessDeniedException(String.format("Cannot start proxy %s: access denied", spec.getId()));
 		}
 
 		Proxy proxy = new Proxy();
+		proxy.setId(proxyId);
 		proxy.setStatus(ProxyStatus.New);
 		proxy.setUserId(userService.getCurrentUserId());
 		proxy.setSpec(spec);