refactor: allow environments to be deleted if the deploytarget is disabled

services/api/src/resources/deployment/resolvers.ts

@@ -502,7 +502,7 @@ export const cancelDeployment: ResolverFn = async (
  });
 
  // check if the deploytarget for this environment is disabled
- const deploytarget = await query(sqlClientPool, Sql.selectDeployTarget(environment.openshift));
+ const deploytarget = await environmentHelpers(sqlClientPool).getEnvironmentsDeploytarget(environment.openshift);
  if (deploytarget[0].disabled) {
  // if it is, proceed to mark the build as cancelled
  var date = new Date();

services/api/src/resources/deployment/sql.ts

@@ -63,10 +63,6 @@ export const Sql = {
  .where('id', id)
  .update(patch)
  .toString(),
- selectDeployTarget: (id: number) =>
- knex('openshift')
- .where('id', '=', id)
- .toString(),
  selectPermsForDeployment: (id: number) =>
  knex('deployment')
  .select({ pid: 'environment.project' })

services/api/src/resources/environment/helpers.ts

@@ -49,6 +49,13 @@ export const Helpers = (sqlClientPool: Pool) => {
  Sql.deleteEnvironment(name, pid)
  );
  },
+ getEnvironmentsDeploytarget: async (eid) => {
+ const rows = await query(
+ sqlClientPool,
+ Sql.selectDeployTarget(eid)
+ );
+ return aliasOpenshiftToK8s(rows);
+ },
  getEnvironmentsByProjectId: async (projectId) => {
  const rows = await query(
  sqlClientPool,

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

@@ -642,6 +642,14 @@ export const deleteEnvironment: ResolverFn = async (
  }
  });
 
+ // if the deploytarget of this environment is marked as disabled or doesn't exist, just delete the environment
+ // the removetask will never work if the deploytarget is disabled and the environment will remain undeleted in the api
+ const deploytarget = await Helpers(sqlClientPool).getEnvironmentsDeploytarget(environment.openshift);
+ if (deploytarget.length == 0 || deploytarget[0].disabled) {
+ await Helpers(sqlClientPool).deleteEnvironment(name, environment.id, projectId);
+ return 'success';
+ }
+
  await createRemoveTask(data);
  sendToLagoonLogs(
  'info',

services/api/src/resources/environment/sql.ts

@@ -48,6 +48,10 @@ export const Sql = {
  name,
  })
  .toString(),
+ selectDeployTarget: (id: number) =>
+ knex('openshift')
+ .where('id', '=', id)
+ .toString(),
  selectServicesByEnvironmentId: (id: number) =>
  knex('environment_service')
  .where('environment', '=', id)