Revise PR based on coderabbit, greptile review

backend/src/ee/services/audit-log/audit-log-types.ts

@@ -1603,6 +1603,7 @@ interface GetSshHostGroupHostsEvent {
   type: EventType.GET_SSH_HOST_GROUP_HOSTS;
   metadata: {
     sshHostGroupId: string;
+    name: string;
   };
 }
 

backend/src/ee/services/license/__mocks__/license-fns.ts

@@ -22,7 +22,7 @@ export const getDefaultOnPremFeatures = () => {
     samlSSO: false,
     scim: false,
     ldap: false,
-    groups: true,
+    groups: false,
     status: null,
     trial_end: null,
     has_used_trial: true,

backend/src/ee/services/license/license-fns.ts

@@ -35,7 +35,7 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   oidcSSO: false,
   scim: false,
   ldap: false,
-  groups: true,
+  groups: false,
   status: null,
   trial_end: null,
   has_used_trial: true,

backend/src/ee/services/license/license-types.ts

@@ -52,7 +52,7 @@ export type TFeatureSet = {
   secretAccessInsights: false;
   scim: false;
   ldap: false;
-  groups: true;
+  groups: false;
   status: null;
   trial_end: null;
   has_used_trial: true;

backend/src/ee/services/ssh-host-group/ssh-host-group-dal.ts

@@ -2,7 +2,7 @@ import { Knex } from "knex";
 
 import { TDbClient } from "@app/db";
 import { TableName } from "@app/db/schemas";
-import { DatabaseError } from "@app/lib/errors";
+import { BadRequestError, DatabaseError } from "@app/lib/errors";
 import { groupBy, unique } from "@app/lib/fn";
 import { ormify } from "@app/lib/knex";
 
@@ -155,7 +155,9 @@ export const sshHostGroupDALFactory = (db: TDbClient) => {
         .first();
 
       if (!sshHostGroup) {
-        throw new Error(`SSH host group with ID ${sshHostGroupId} not found`);
+        throw new BadRequestError({
+          message: `SSH host group with ID ${sshHostGroupId} not found`
+        });
       }
 
       const query = db

backend/src/ee/services/ssh-host-group/ssh-host-group-service.ts

@@ -89,18 +89,24 @@ export const sshHostGroupServiceFactory = ({
     const newSshHostGroup = await sshHostGroupDAL.transaction(async (tx) => {
       // (dangtony98): room to optimize check to ensure that
       // the SSH host group name is unique across the whole org
-      const project = await projectDAL.findById(projectId);
+      const project = await projectDAL.findById(projectId, tx);
       if (!project) throw new NotFoundError({ message: `Project with ID '${projectId}' not found` });
-      const projects = await projectDAL.find({
-        orgId: project.orgId
-      });
+      const projects = await projectDAL.find(
+        {
+          orgId: project.orgId
+        },
+        { tx }
+      );
 
-      const existingSshHostGroup = await sshHostGroupDAL.find({
-        name,
-        $in: {
-          projectId: projects.map((p) => p.id)
-        }
-      });
+      const existingSshHostGroup = await sshHostGroupDAL.find(
+        {
+          name,
+          $in: {
+            projectId: projects.map((p) => p.id)
+          }
+        },
+        { tx }
+      );
 
       if (existingSshHostGroup.length) {
         throw new BadRequestError({
@@ -307,7 +313,7 @@ export const sshHostGroupServiceFactory = ({
     }
 
     if (sshHostGroup.projectId !== sshHost.projectId) {
-      throw new NotFoundError({
+      throw new BadRequestError({
         message: `SSH host with ID ${hostId} not found in project ${sshHostGroup.projectId}`
       });
     }
@@ -347,7 +353,7 @@ export const sshHostGroupServiceFactory = ({
     }
 
     if (sshHostGroup.projectId !== sshHost.projectId) {
-      throw new NotFoundError({
+      throw new BadRequestError({
         message: `SSH host with ID ${hostId} not found in project ${sshHostGroup.projectId}`
       });
     }