Skip to content

Commit 9f11d1c

Browse files
LEDfanLEDfan
committed
Fix tests
1 parent dfc6f5a commit 9f11d1c

2 files changed

Lines changed: 72 additions & 86 deletions

File tree

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

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -766,8 +766,7 @@ public void launchProxyWithManifestPolicyCreateOnce() {
766766
setup((client, namespace, overriddenNamespace) -> {
767767
String specId = environment.getProperty("proxy.specs[13].id");
768768

769-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
770-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
769+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
771770
Proxy proxy = proxyService.startProxy(spec, true);
772771
String containerId = proxy.getContainers().get(0).getId();
773772

@@ -820,8 +819,7 @@ public void launchProxyWithManifestPolicyCreateOnce() {
820819

821820
String specId = environment.getProperty("proxy.specs[13].id");
822821

823-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
824-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
822+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
825823
Proxy proxy = proxyService.startProxy(spec, true);
826824
String containerId = proxy.getContainers().get(0).getId();
827825

@@ -870,8 +868,7 @@ public void launchProxyWithManifestPolicyPatch() {
870868
setup((client, namespace, overriddenNamespace) -> {
871869
String specId = environment.getProperty("proxy.specs[14].id");
872870

873-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
874-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
871+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
875872
Proxy proxy = proxyService.startProxy(spec, true);
876873
String containerId = proxy.getContainers().get(0).getId();
877874

@@ -930,8 +927,7 @@ public void launchProxyWithManifestPolicyPatch() {
930927

931928
String specId = environment.getProperty("proxy.specs[14].id");
932929

933-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
934-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
930+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
935931
Proxy proxy = proxyService.startProxy(spec, true);
936932
String containerId = proxy.getContainers().get(0).getId();
937933

@@ -990,8 +986,7 @@ public void launchProxyWithManifestPolicyDelete() {
990986

991987
String specId = environment.getProperty("proxy.specs[15].id");
992988

993-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
994-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
989+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
995990
Proxy proxy = proxyService.startProxy(spec, true);
996991
String containerId = proxy.getContainers().get(0).getId();
997992

@@ -1028,8 +1023,7 @@ public void launchProxyWithManifestPolicyReplace() {
10281023
setup((client, namespace, overriddenNamespace) -> {
10291024
String specId = environment.getProperty("proxy.specs[16].id");
10301025

1031-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
1032-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
1026+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
10331027
Proxy proxy = proxyService.startProxy(spec, true);
10341028
String containerId = proxy.getContainers().get(0).getId();
10351029

@@ -1088,8 +1082,7 @@ public void launchProxyWithManifestPolicyReplace() {
10881082

10891083
String specId = environment.getProperty("proxy.specs[16].id");
10901084

1091-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
1092-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
1085+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
10931086
Proxy proxy = proxyService.startProxy(spec, true);
10941087
String containerId = proxy.getContainers().get(0).getId();
10951088

@@ -1140,8 +1133,7 @@ public void launchProxyWithPersistentManifestPolicyCreateOnce() {
11401133
setup((client, namespace, overriddenNamespace) -> {
11411134
String specId = environment.getProperty("proxy.specs[17].id");
11421135

1143-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
1144-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
1136+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
11451137
Proxy proxy = proxyService.startProxy(spec, true);
11461138
String containerId = proxy.getContainers().get(0).getId();
11471139

@@ -1218,8 +1210,7 @@ public void launchProxyWithPersistentManifestPolicyPatch() {
12181210
setup((client, namespace, overriddenNamespace) -> {
12191211
String specId = environment.getProperty("proxy.specs[18].id");
12201212

1221-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
1222-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
1213+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
12231214
Proxy proxy = proxyService.startProxy(spec, true);
12241215
String containerId = proxy.getContainers().get(0).getId();
12251216

@@ -1262,8 +1253,7 @@ public void launchProxyWithPersistentManifestPolicyPatch() {
12621253

12631254
// same spec, different value
12641255
String specId2 = environment.getProperty("proxy.specs[19].id");
1265-
baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId2), true);
1266-
spec = proxyService.resolveProxySpec(baseSpec, null, null);
1256+
spec = proxyService.findProxySpec(s -> s.getId().equals(specId2), true);
12671257
proxy = proxyService.startProxy(spec, true);
12681258

12691259
// secret has no namespace defined -> should be created in the default namespace
@@ -1308,8 +1298,7 @@ public void launchProxyWithPersistentManifestPolicyDelete() {
13081298

13091299
String specId = environment.getProperty("proxy.specs[20].id");
13101300

1311-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
1312-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
1301+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
13131302
Proxy proxy = proxyService.startProxy(spec, true);
13141303
String containerId = proxy.getContainers().get(0).getId();
13151304

@@ -1346,8 +1335,7 @@ public void launchProxyWithPersistentManifestPolicyReplace() {
13461335
setup((client, namespace, overriddenNamespace) -> {
13471336
String specId = environment.getProperty("proxy.specs[21].id");
13481337

1349-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
1350-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
1338+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
13511339
Proxy proxy = proxyService.startProxy(spec, true);
13521340
String containerId = proxy.getContainers().get(0).getId();
13531341

@@ -1390,8 +1378,7 @@ public void launchProxyWithPersistentManifestPolicyReplace() {
13901378

13911379
// same spec, different value
13921380
String specId2 = environment.getProperty("proxy.specs[22].id");
1393-
baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId2), true);
1394-
spec = proxyService.resolveProxySpec(baseSpec, null, null);
1381+
spec = proxyService.findProxySpec(s -> s.getId().equals(specId2), true);
13951382
proxy = proxyService.startProxy(spec, true);
13961383

13971384
// secret has no namespace defined -> should be created in the default namespace
@@ -1517,7 +1504,7 @@ public void launchProxyWithParameters() {
15171504

15181505
Assertions.assertEquals(true, container.getReady());
15191506
Assertions.assertEquals("ledfan/rstudio_base_r:4_0_5", container.getImage());
1520-
Assertions.assertEquals("2G", pod.getSpec().getContainers().get(0).getResources().getLimits().get("memory").getAmount());
1507+
Assertions.assertEquals("2", pod.getSpec().getContainers().get(0).getResources().getLimits().get("memory").getAmount());
15211508
List<EnvVar> envList = pod.getSpec().getContainers().get(0).getEnv();
15221509
Map<String, EnvVar> env = envList.stream().collect(Collectors.toMap(EnvVar::getName, e -> e));
15231510

@@ -1562,7 +1549,7 @@ public void launchProxyWithParametersWithNullValueSetName() {
15621549

15631550
Assertions.assertEquals(true, container.getReady());
15641551
Assertions.assertEquals("ledfan/rstudio_base_r:4_0_5", container.getImage());
1565-
Assertions.assertEquals("2G", pod.getSpec().getContainers().get(0).getResources().getLimits().get("memory").getAmount());
1552+
Assertions.assertEquals("2", pod.getSpec().getContainers().get(0).getResources().getLimits().get("memory").getAmount());
15661553
List<EnvVar> envList = pod.getSpec().getContainers().get(0).getEnv();
15671554
Map<String, EnvVar> env = envList.stream().collect(Collectors.toMap(EnvVar::getName, e -> e));
15681555

@@ -1645,7 +1632,7 @@ public Class<?> getObjectType() {
16451632
}
16461633

16471634
@Override
1648-
protected IContainerBackend createInstance() throws Exception {
1635+
protected IContainerBackend createInstance() {
16491636
KubernetesBackend backend = new KubernetesBackend();
16501637
applicationContext.getAutowireCapableBeanFactory().autowireBean(backend);
16511638
backend.initialize(client);

‎src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnSwarm.java‎

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import eu.openanalytics.containerproxy.ContainerProxyApplication;
3030
import eu.openanalytics.containerproxy.model.runtime.Proxy;
3131
import eu.openanalytics.containerproxy.model.spec.ProxySpec;
32+
import eu.openanalytics.containerproxy.service.InvalidParametersException;
3233
import eu.openanalytics.containerproxy.service.ProxyService;
3334
import eu.openanalytics.containerproxy.service.UserService;
3435
import eu.openanalytics.containerproxy.util.ProxyMappingManager;
@@ -88,69 +89,67 @@ public void beforeEach() throws DockerCertificateException, DockerException, Int
8889
}
8990

9091
@Test
91-
public void launchProxy() throws DockerCertificateException, DockerException, InterruptedException {
92-
DefaultDockerClient dockerClient = DefaultDockerClient.fromEnv().build();
93-
94-
String specId = environment.getProperty("proxy.specs[0].id");
95-
96-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
97-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
98-
Proxy proxy = proxyService.startProxy(spec, true);
92+
public void launchProxy() throws DockerCertificateException, DockerException, InterruptedException, InvalidParametersException {
93+
try (DefaultDockerClient dockerClient = DefaultDockerClient.fromEnv().build()) {
94+
String specId = environment.getProperty("proxy.specs[0].id");
9995

100-
List<Service> services = dockerClient.listServices();
101-
Assertions.assertEquals(1, services.size());
102-
Service service = services.get(0);
103-
Assertions.assertEquals("openanalytics/shinyproxy-demo", service.spec().taskTemplate().containerSpec().image());
96+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
97+
Proxy proxy = proxyService.startProxy(spec, true);
10498

99+
List<Service> services = dockerClient.listServices();
100+
Assertions.assertEquals(1, services.size());
101+
Service service = services.get(0);
102+
Assertions.assertEquals("openanalytics/shinyproxy-demo", service.spec().taskTemplate().containerSpec().image());
105103

106-
proxyService.stopProxy(proxy, false, true);
104+
proxyService.stopProxy(proxy, false, true);
105+
}
107106
}
108107

109108
@Test
110-
public void launchProxyWithSecret() throws DockerCertificateException, DockerException, InterruptedException {
111-
DefaultDockerClient dockerClient = DefaultDockerClient.fromEnv().build();
112-
String secret1Id = dockerClient.createSecret(SecretSpec.builder()
113-
.data(Base64.getEncoder().encodeToString("MySecret1".getBytes(StandardCharsets.UTF_8)))
114-
.name("my_secret")
115-
.build()).id();
116-
117-
String secret2Id = dockerClient.createSecret(SecretSpec.builder()
118-
.data(Base64.getEncoder().encodeToString("MySecret2".getBytes(StandardCharsets.UTF_8)))
119-
.name("my_secret_2")
120-
.build()).id();
121-
122-
String specId = environment.getProperty("proxy.specs[1].id");
123-
124-
ProxySpec baseSpec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
125-
ProxySpec spec = proxyService.resolveProxySpec(baseSpec, null, null);
126-
Proxy proxy = proxyService.startProxy(spec, true);
127-
128-
List<Service> services = dockerClient.listServices();
129-
Assertions.assertEquals(1, services.size());
130-
Service service = services.get(0);
131-
Assertions.assertEquals("openanalytics/shinyproxy-demo", service.spec().taskTemplate().containerSpec().image());
132-
133-
SecretBind secret1 = service.spec().taskTemplate().containerSpec().secrets().get(0);
134-
135-
Assertions.assertEquals(secret1Id, secret1.secretId());
136-
Assertions.assertEquals("my_secret", secret1.secretName());
137-
Assertions.assertEquals("my_secret", secret1.file().name());
138-
Assertions.assertEquals("0", secret1.file().gid());
139-
Assertions.assertEquals("0", secret1.file().uid());
140-
Assertions.assertEquals(292, secret1.file().mode()); // 0444 in decimal
141-
142-
SecretBind secret2 = service.spec().taskTemplate().containerSpec().secrets().get(1);
143-
144-
Assertions.assertEquals(secret2Id, secret2.secretId());
145-
Assertions.assertEquals("my_secret_2", secret2.secretName());
146-
Assertions.assertEquals("/var/pass", secret2.file().name());
147-
Assertions.assertEquals("1000", secret2.file().gid());
148-
Assertions.assertEquals("1000", secret2.file().uid());
149-
Assertions.assertEquals(384, secret2.file().mode()); // 0444 in decimal
150-
151-
proxyService.stopProxy(proxy, false, true);
152-
dockerClient.deleteSecret(secret1Id);
153-
dockerClient.deleteSecret(secret2Id);
109+
public void launchProxyWithSecret() throws DockerCertificateException, DockerException, InterruptedException, InvalidParametersException {
110+
try (DefaultDockerClient dockerClient = DefaultDockerClient.fromEnv().build()) {
111+
String secret1Id = dockerClient.createSecret(SecretSpec.builder()
112+
.data(Base64.getEncoder().encodeToString("MySecret1".getBytes(StandardCharsets.UTF_8)))
113+
.name("my_secret")
114+
.build()).id();
115+
116+
String secret2Id = dockerClient.createSecret(SecretSpec.builder()
117+
.data(Base64.getEncoder().encodeToString("MySecret2".getBytes(StandardCharsets.UTF_8)))
118+
.name("my_secret_2")
119+
.build()).id();
120+
121+
String specId = environment.getProperty("proxy.specs[1].id");
122+
123+
ProxySpec spec = proxyService.findProxySpec(s -> s.getId().equals(specId), true);
124+
Proxy proxy = proxyService.startProxy(spec, true);
125+
126+
List<Service> services = dockerClient.listServices();
127+
Assertions.assertEquals(1, services.size());
128+
Service service = services.get(0);
129+
Assertions.assertEquals("openanalytics/shinyproxy-demo", service.spec().taskTemplate().containerSpec().image());
130+
131+
SecretBind secret1 = service.spec().taskTemplate().containerSpec().secrets().get(0);
132+
133+
Assertions.assertEquals(secret1Id, secret1.secretId());
134+
Assertions.assertEquals("my_secret", secret1.secretName());
135+
Assertions.assertEquals("my_secret", secret1.file().name());
136+
Assertions.assertEquals("0", secret1.file().gid());
137+
Assertions.assertEquals("0", secret1.file().uid());
138+
Assertions.assertEquals(292, secret1.file().mode()); // 0444 in decimal
139+
140+
SecretBind secret2 = service.spec().taskTemplate().containerSpec().secrets().get(1);
141+
142+
Assertions.assertEquals(secret2Id, secret2.secretId());
143+
Assertions.assertEquals("my_secret_2", secret2.secretName());
144+
Assertions.assertEquals("/var/pass", secret2.file().name());
145+
Assertions.assertEquals("1000", secret2.file().gid());
146+
Assertions.assertEquals("1000", secret2.file().uid());
147+
Assertions.assertEquals(384, secret2.file().mode()); // 0444 in decimal
148+
149+
proxyService.stopProxy(proxy, false, true);
150+
dockerClient.deleteSecret(secret1Id);
151+
dockerClient.deleteSecret(secret2Id);
152+
}
154153
}
155154

156155

0 commit comments

Comments
 (0)