Fix pullrequest environment deletes in api

Author: rocketeerbkw

services/api/src/resources/environment/resolvers.js

@@ -530,16 +530,42 @@ const deleteEnvironment = async (
     return 'success';
   }
 
-  const data = {
+  let data = {
     projectName: project.name,
-    branch: name,
     type: environment.deployType,
     forceDeleteProductionEnvironment: role === 'admin',
   };
 
+  const meta = {
+    projectName: data.projectName,
+    environmentName: environment.name,
+  };
+
+  switch (environment.deployType) {
+    case 'branch':
+      data = {
+        ...data,
+        branch: name,
+      };
+      break;
+
+    case 'pullrequest':
+      data = {
+        ...data,
+        pullrequestNumber: environment.name.replace('pr-', ''),
+      };
+      break;
+
+    default:
+      sendToLagoonLogs('error', data.projectName, '', 'api:deleteEnvironment:error', meta,
+        `*[${data.projectName}]* Unknown deploy type ${environment.deployType} \`${environment.name}\``
+      );
+      return `Error: unknown deploy type ${environment.deployType}`;
+  }
+
   await createRemoveTask(data);
-  sendToLagoonLogs('info', data.projectName, '', 'api:deleteEnvironment', {},
-    `*[${data.projectName}]* Deleting environment \`${data.branch}\``
+  sendToLagoonLogs('info', data.projectName, '', 'api:deleteEnvironment', meta,
+    `*[${data.projectName}]* Deleting environment \`${environment.name}\``
   );
 
   return 'success';

services/rest2tasks/src/index.js

@@ -143,72 +143,6 @@ app.post('/pullrequest/deploy', async (req, res) => {
 
 })
 
-
-app.post('/pullrequest/remove', async (req, res) => {
-
-  req.checkBody({
-    'projectName': {
-      notEmpty: true,
-      matches: {
-        options: [/^[a-zA-Z0-9-_]+$/],
-        errorMessage: 'projectName must be defined and must only contain alphanumeric, dashes and underline'
-      },
-    },
-    'pullrequestNumber': {
-      notEmpty: true,
-      isInt: {},
-      matches: {
-        errorMessage: 'pullrequestNumber must be defined and a number'
-      },
-    }
-  });
-
-  const result = await req.getValidationResult()
-
-  if (!result.isEmpty()) {
-    res.status(400).send('There have been validation errors: ' + util.inspect(result.mapped()));
-    return;
-  }
-
-  const data = {
-    projectName: req.body.projectName,
-    pullrequestNumber: req.body.pullrequestNumber,
-    type: 'pullrequest'
-  }
-
-  const meta = {
-    projectName: data.projectName,
-    pullrequestNumber: data.pullrequestNumber
-  }
-
-  try {
-    const taskResult = await createRemoveTask(data);
-
-    sendToLagoonLogs('info', data.projectName, '', `rest:pullrequest:remove`, meta,
-      `*[${data.projectName}]* REST remove trigger \`${data.pullrequestNumber}\``
-    )
-
-    res.status(200).type('json').send({ "ok": "true", "message": taskResult})
-    return;
-  } catch (error) {
-    switch (error.name) {
-      case "ProjectNotFound":
-      case "ActiveSystemsNotFound":
-      case "UnknownActiveSystem":
-          res.status(404).type('json').send({ "ok": "false", "message": error.message})
-          return;
-        break;
-
-      default:
-          logger.error(error)
-          res.status(500).type('json').send({ "ok": "false", "message": `Internal Error: ${error}`})
-          return;
-        break;
-    }
-  }
-
-})
-
 app.post('/deploy', async (req, res) => {
 
   req.checkBody({

tests/tasks/rest/pullrequest-remove.yaml

@@ -107,13 +107,14 @@
     expected_pr_head_sha: "{{ pr_2nd_commit_hash }}"
     expected_pr_title: "PR Title - UPDATE"
 
-- name: "{{ testname }} - rest pull request delete"
+- name: "{{ testname }} - api deleteEnvironment on {{ project }}, which should remove all resources"
   hosts: localhost
   serial: 1
   vars:
-    git_pr_number: "1"
+    project: "{{ project }}"
+    branch: "pr-1"
   tasks:
-  - include: ../../tasks/rest/pullrequest-remove.yaml
+  - include: ../../tasks/api/remove.yaml
 
 - name: "{{ testname }} - check if site for project does not exist anymore"
   hosts: localhost