[exoframe-server] Fix container removal by domain, add test

Author: yamalight

packages/exoframe-server/src/routes/remove.js

@@ -16,15 +16,14 @@ const removeUserContainer = async ({ username, id, reply }) => {
   }
 
   // if not found by name - try to find by domain.
-  const containersByUrl = allContainers.filter((c) => {
+  const containerByUrl = allContainers.find((c) => {
     return (
       c.Labels['exoframe.user'] === username &&
       c.Labels[`traefik.http.routers.${c.Labels['exoframe.deployment']}.rule`].includes(id)
     );
   });
-
-  if (containersByUrl.length) {
-    await Promise.all(containersByUrl.map(removeContainer));
+  if (containerByUrl) {
+    await removeContainer(containerByUrl);
     return reply.code(204).send('removed');
   }
 

packages/exoframe-server/test/remove.test.js

@@ -32,6 +32,8 @@ const generateContainerConfig = ({ name, username, project, url }) => ({
   },
 });
 
+const testUrl = 'rmtest.example.com';
+
 beforeAll(async () => {
   // start server
   const port = await getPort();
@@ -50,6 +52,17 @@ beforeAll(async () => {
   });
   const container = await docker.createContainer(containerConfig);
   await container.start();
+  // create test container with url to remove
+  // second project container
+  const urlContainerConfig = generateContainerConfig({
+    name: 'rmtest12',
+    username: 'admin',
+    project: 'rmtest12',
+    baseName: 'exo-admin-rmtest12',
+    url: testUrl,
+  });
+  const urlContainer = await docker.createContainer(urlContainerConfig);
+  await urlContainer.start();
   // create test project to remove
   // first project container
   const prjContainerConfig1 = generateContainerConfig({
@@ -88,6 +101,22 @@ test('Should remove current deployment', async () => {
   expect(exContainer).toBeUndefined();
 });
 
+test('Should remove container by url', async () => {
+  // options base
+  const options = Object.assign({}, baseOptions, { url: `/remove/${encodeURIComponent(testUrl)}` });
+
+  const response = await fastify.inject(options);
+  // check response
+  expect(response.statusCode).toEqual(204);
+
+  // check docker services
+  const allContainers = await docker.listContainers();
+  const urlContainers = allContainers.filter((c) =>
+    c.Labels[`traefik.http.routers.${c.Labels['exoframe.deployment']}.rule`].includes(testUrl)
+  );
+  expect(urlContainers.length).toEqual(0);
+});
+
 test('Should remove current project', async () => {
   // options base
   const options = Object.assign({}, baseOptions, { url: `/remove/${projectName}` });