From 0f5cbf055cd64c71f36e3c7146c6b79aa860ccc6 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Wed, 14 May 2025 13:25:58 -0700 Subject: [PATCH 1/4] remove limit --- backend/src/services/project/project-service.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.ts index 38631a8fa..4c6860058 100644 --- a/backend/src/services/project/project-service.ts +++ b/backend/src/services/project/project-service.ts @@ -776,12 +776,12 @@ export const projectServiceFactory = ({ }); } - const plan = await licenseService.getPlan(project.orgId); - if (!plan.auditLogs || auditLogsRetentionDays > plan.auditLogsRetentionDays) { - throw new BadRequestError({ - message: "Failed to update audit logs retention due to plan limit reached. Upgrade plan to increase." - }); - } + // const plan = await licenseService.getPlan(project.orgId); + // if (!plan.auditLogs || auditLogsRetentionDays > plan.auditLogsRetentionDays) { + // throw new BadRequestError({ + // message: "Failed to update audit logs retention due to plan limit reached. Upgrade plan to increase." + // }); + // } return projectDAL.updateById(project.id, { auditLogsRetentionDays }); }; From f97826ea820bed8d533dbeb3e325b27cc67a88f6 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 19 May 2025 17:42:42 -0700 Subject: [PATCH 2/4] allow hyphens in host name --- .../routes/v1/identity-kubernetes-auth-router.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts b/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts index de7927573..02663adb5 100644 --- a/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts +++ b/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts @@ -114,10 +114,11 @@ export const registerIdentityKubernetesRouter = async (server: FastifyZodProvide CharacterType.Numbers, CharacterType.Colon, CharacterType.Period, - CharacterType.ForwardSlash + CharacterType.ForwardSlash, + CharacterType.Hyphen ])(val), { - message: "Kubernetes host must only contain alphabets, numbers, colons, periods, and forward slashes." + message: "Kubernetes host must only contain alphabets, numbers, colons, periods, hyphen, and forward slashes." } ), caCert: z.string().trim().default("").describe(KUBERNETES_AUTH.ATTACH.caCert), @@ -234,11 +235,12 @@ export const registerIdentityKubernetesRouter = async (server: FastifyZodProvide CharacterType.Numbers, CharacterType.Colon, CharacterType.Period, - CharacterType.ForwardSlash + CharacterType.ForwardSlash, + CharacterType.Hyphen ])(val); }, { - message: "Kubernetes host must only contain alphabets, numbers, colons, periods, and forward slashes." + message: "Kubernetes host must only contain alphabets, numbers, colons, periods, hyphen, and forward slashes." } ), caCert: z.string().trim().optional().describe(KUBERNETES_AUTH.UPDATE.caCert), From 36c428f152330b0853e66ad8638ffcba27af64ae Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 19 May 2025 17:42:42 -0700 Subject: [PATCH 3/4] allow hyphens in host name --- backend/src/services/project/project-service.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.ts index 4c6860058..38631a8fa 100644 --- a/backend/src/services/project/project-service.ts +++ b/backend/src/services/project/project-service.ts @@ -776,12 +776,12 @@ export const projectServiceFactory = ({ }); } - // const plan = await licenseService.getPlan(project.orgId); - // if (!plan.auditLogs || auditLogsRetentionDays > plan.auditLogsRetentionDays) { - // throw new BadRequestError({ - // message: "Failed to update audit logs retention due to plan limit reached. Upgrade plan to increase." - // }); - // } + const plan = await licenseService.getPlan(project.orgId); + if (!plan.auditLogs || auditLogsRetentionDays > plan.auditLogsRetentionDays) { + throw new BadRequestError({ + message: "Failed to update audit logs retention due to plan limit reached. Upgrade plan to increase." + }); + } return projectDAL.updateById(project.id, { auditLogsRetentionDays }); }; From 565340dc50afd3992884e33707596d3e1685c5e9 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 19 May 2025 18:13:45 -0700 Subject: [PATCH 4/4] fix lint --- .../src/server/routes/v1/identity-kubernetes-auth-router.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts b/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts index 02663adb5..d9ef62087 100644 --- a/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts +++ b/backend/src/server/routes/v1/identity-kubernetes-auth-router.ts @@ -118,7 +118,8 @@ export const registerIdentityKubernetesRouter = async (server: FastifyZodProvide CharacterType.Hyphen ])(val), { - message: "Kubernetes host must only contain alphabets, numbers, colons, periods, hyphen, and forward slashes." + message: + "Kubernetes host must only contain alphabets, numbers, colons, periods, hyphen, and forward slashes." } ), caCert: z.string().trim().default("").describe(KUBERNETES_AUTH.ATTACH.caCert), @@ -240,7 +241,8 @@ export const registerIdentityKubernetesRouter = async (server: FastifyZodProvide ])(val); }, { - message: "Kubernetes host must only contain alphabets, numbers, colons, periods, hyphen, and forward slashes." + message: + "Kubernetes host must only contain alphabets, numbers, colons, periods, hyphen, and forward slashes." } ), caCert: z.string().trim().optional().describe(KUBERNETES_AUTH.UPDATE.caCert),