refactor: yaml and autogen route cleanup

Author: shreddedbacon

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

@@ -93,13 +93,13 @@ export const Helpers = (sqlClientPool: Pool) => {
         );
 
         // remove all route associations from environment
-        // but leave the routes in the api attached to the project
-        await routeHelpers(sqlClientPool).removeAllRoutesFromEnvironment(eid)
         // delete any autogenerated routes, these are not reusable and are only associated to the environment they are on
         await routeHelpers(sqlClientPool).deleteAutogeneratedRoutesForEnvironment(eid)
         // delete any lagoon.yml managed routes from the api, if they want to manage them in the api
         // they should be modified in the api to update the source to the api to nullify the lagoon.yml source
         await routeHelpers(sqlClientPool).deleteLagoonYAMLRoutesForEnvironment(eid)
+        // but leave the routes in the api attached to the project
+        await routeHelpers(sqlClientPool).removeAllRoutesFromEnvironment(eid)
 
         // delete the environment backups rows
         // logger.debug(`deleting environment ${name}/id:${eid}/project:${pid} environment backups`)

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

@@ -560,7 +560,7 @@ export const removeRouteFromEnvironment: ResolverFn = async (
       environment,
     }
   },
-  { sqlClientPool, hasPermission, userActivityLogger }
+  { sqlClientPool, hasPermission, userActivityLogger, adminScopes }
 ) => {
   const projectId = await projectHelpers(sqlClientPool).getProjectIdByName(project)
   const projectData = await projectHelpers(sqlClientPool).getProjectById(projectId)
@@ -570,17 +570,28 @@ export const removeRouteFromEnvironment: ResolverFn = async (
   const env = await environmentHelpers(sqlClientPool).getEnvironmentByNameAndProject(environment, projectId)
   const environmentData = env[0]
 
+  const existsProject = await query(
+    sqlClientPool,
+    Sql.selectRouteByDomainAndProjectID(domain, projectId)
+  )
+  if (existsProject.length == 0) {
+    throw Error(`Route doesn't exist on this project`)
+  }
+  const route = existsProject[0]
+
+  if (!adminScopes.platformOwner) {
+    if (route.source.toLowerCase() === RouteSource.YAML) {
+      throw Error(`This route cannot be removed from the environment as it is managed by a lagoon.yml file`)
+    }
+    if (route.source.toLowerCase() === RouteSource.AUTOGENERATED) {
+      throw Error(`Cannot remove autogenerated routes from an environment using this endpoint`)
+    }
+  }
+
   const routeId = await Helpers(sqlClientPool).removeRouteFromEnvironment(domain, environmentData.id)
 
   const ret = await query(sqlClientPool, Sql.selectRouteByID(routeId));
-  const route = ret[0];
-
-  if (route.source.toLowerCase() === RouteSource.YAML) {
-    throw Error(`This route cannot be removed from the environment as it is managed by a lagoon.yml file`)
-  }
-  if (route.source.toLowerCase() === RouteSource.AUTOGENERATED) {
-    throw Error(`Cannot remove autogenerated routes from an environment using this endpoint`)
-  }
+  const returnRoute = ret[0];
 
   const auditLog: AuditLog = {
     resource: {
@@ -599,18 +610,18 @@ export const removeRouteFromEnvironment: ResolverFn = async (
   if (projectData.organization) {
     auditLog.organizationId = projectData.organization;
   }
-  userActivityLogger(`User removed route '${route.domain}' from environment '${environmentData.name}'`, {
+  userActivityLogger(`User removed route '${returnRoute.domain}' from environment '${environmentData.name}'`, {
     project: '',
     event: 'api:removeRouteFromEnvironment',
     payload: {
       project: projectData.id,
       environment: environmentData.id,
-      route: route.id,
+      route: returnRoute.id,
       ...auditLog
     }
   });
 
-  return route;
+  return returnRoute;
 }
 
 /*