chore: adjust for copilot feedback

Author: shreddedbacon

services/actions-handler/handler/controller_tasks.go

@@ -135,10 +135,10 @@ type Project struct {
 
 // @TODO: add to machinery
 type Route struct {
-	Domain     string              `json:"domain"`
-	Service    string              `json:"service"`
-	Enviroment *schema.Environment `json:"environment"`
-	Type       string              `json:"type"`
+	Domain      string              `json:"domain"`
+	Service     string              `json:"service"`
+	Environment *schema.Environment `json:"environment"`
+	Type        string              `json:"type"`
 }
 
 /*
@@ -170,10 +170,10 @@ func updateActiveStandbyRoutes(l *lclient.Client, project, prod, standby, prefix
 	json.Unmarshal(d, &p)
 	for _, route := range p.APIRoutes {
 		// only patch routes with an environment attached
-		if route.Type == "ACTIVE" && route.Enviroment != nil {
+		if route.Type == "ACTIVE" && route.Environment != nil {
 			updateRouteType(l, route, prod, project, prefix)
 		}
-		if route.Type == "STANDBY" && route.Enviroment != nil {
+		if route.Type == "STANDBY" && route.Environment != nil {
 			updateRouteType(l, route, standby, project, prefix)
 		}
 	}

services/api/database/migrations/20250925000000_routes.js

@@ -3,7 +3,7 @@
  * @returns { Promise<void> }
  */
 exports.up = async function(knex) {
-    route = await knex.schema.hasTable('routes');
+    const route = await knex.schema.hasTable('routes');
     if (!route) {
         return knex.schema
         .createTable('routes', function (table) {

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

@@ -114,7 +114,7 @@ export function addServicePathRoute(
   );
   const combinedPathRoutesCount = pathRoutes.length + 1
   if (combinedPathRoutesCount >= 10) {
-    throw Error(`Limit of 10 path rotues, consider removing some from this route`)
+    throw Error(`Limit of 10 path routes, consider removing some from this route`)
   }
   if (!exists) {
     return [...pathRoutes, { toService: newToService, path: newPath }];

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

@@ -10,7 +10,6 @@ import { addServicePathRoute, removeServicePathRoute, Helpers, PathRoutes } from
 import { AuditLog } from '../audit/types';
 import { isDNS1123Subdomain } from '../../util/func';
 import { AuditType, RouteSource, RouteType } from '@lagoon/commons/dist/types';
-import { logger } from '../../loggers/logger';
 
 // check array for duplicates that are trimmed and lowercased
 function hasDuplicates(arr) {
@@ -545,7 +544,7 @@ export const activeStandbyRouteMove: ResolverFn = async (
       project: '',
       event: 'api:activeStandbyRouteMove',
       payload: {
-        project: project.id,
+        project: projectId,
         environment: environmentData.id,
         route: route.id
       }

services/api/src/typeDefs.js

@@ -1098,7 +1098,7 @@ const typeDefs = gql`
     updated: String
     created: String
     """
-    Used to set automatic certificate generation using the default ceritificate provisioning system.
+    Used to set automatic certificate generation using the default certificate provisioning system.
     Typically this will be LetsEncrypt.
     """
     tlsAcme: Boolean

services/keycloak/lagoon-realm-base-import.json

@@ -2759,7 +2759,7 @@
             }
           },
           {
-            "name": "View Project Rotues",
+            "name": "View Project Routes",
             "type": "scope",
             "logic": "POSITIVE",
             "decisionStrategy": "UNANIMOUS",

services/keycloak/startup-scripts/00-configure-lagoon.sh

@@ -981,10 +981,10 @@ function add_route_permissions {
   echo Creating resource route
   echo '{"name":"route","displayName":"route","scopes":[{"name":"add"},{"name":"view"},{"name":"update"},{"name":"add:environment"},{"name":"remove:environment"},{"name":"delete"}],"attributes":{},"uris":[],"ownerManagedAccess":""}' | /opt/keycloak/bin/kcadm.sh create clients/$api_client_id/authz/resource-server/resource --config $CONFIG_PATH -r ${KEYCLOAK_REALM:-master} -f -
 
-  # Create "View Project Rotues" permission
+  # Create "View Project Routes" permission
   /opt/keycloak/bin/kcadm.sh create clients/$api_client_id/authz/resource-server/permission/scope --config $CONFIG_PATH -r lagoon -f - <<EOF
   {
-    "name": "View Project Rotues",
+    "name": "View Project Routes",
     "type": "scope",
     "logic": "POSITIVE",
     "decisionStrategy": "UNANIMOUS",
@@ -1020,7 +1020,7 @@ EOF
   }
 EOF
 
-  # Create "VAdd Route to Environment in Project" permission
+  # Create "Add Route to Environment in Project" permission
   /opt/keycloak/bin/kcadm.sh create clients/$api_client_id/authz/resource-server/permission/scope --config $CONFIG_PATH -r lagoon -f - <<EOF
   {
     "name": "Add Route to Environment in Project",

tests/tests/api-routes/api-routes.yaml

@@ -67,7 +67,7 @@
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/api/get-latest-deployment-source.yaml
 
-- name: "{{ testname }} - check if autogenerated route for ${service}. {{ project }} does not exist anymore after disabling"
+- name: "{{ testname }} - check if autogenerated route {{ project }} does not exist anymore after disabling"
   hosts: localhost
   serial: 1
   vars:
@@ -103,7 +103,7 @@
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/api/update-project-routerpattern.yaml
 
-- name: "{{ testname }} - check if site for ${service}. {{ project }} does not exist anymore"
+- name: "{{ testname }} - check if site for {{ project }} does not exist anymore"
   hosts: localhost
   serial: 1
   vars: