refactor(server-nestjs): inject cluster deps via Effect Context.Tags

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I93db2e1e646d689dee53abaf14959ba66a6a6964

Author: shikanime

apps/client/scripts/generate-icons.sh

@@ -3,7 +3,7 @@
 set -e
 
 echo "Create temporary file"
-FILE=$(mktemp -p . --suffix=".js")
+FILE=$(mktemp ./icons.XXXXXX).js && : > ${FILE}
 
 echo "Add header"
 tee -a ${FILE} << EOF

apps/server-nestjs/package.json

@@ -68,7 +68,7 @@
     "@ts-rest/open-api": "catalog:runtime",
     "cache-manager": "catalog:runtime",
     "date-fns": "catalog:runtime",
-    "effect": "catalog:",
+    "effect": "catalog:runtime",
     "fastify": "catalog:runtime",
     "fastify-keycloak-adapter": "catalog:runtime",
     "json-2-csv": "catalog:runtime",
@@ -86,6 +86,7 @@
     "@cpn-console/eslint-config": "workspace:^",
     "@cpn-console/test-utils": "workspace:^",
     "@cpn-console/ts-config": "workspace:^",
+    "@effect/vitest": "catalog:",
     "@eslint/eslintrc": "catalog:tools",
     "@eslint/js": "catalog:tools",
     "@faker-js/faker": "catalog:test",

apps/server-nestjs/src/modules/cluster/cluster-queries.utils.ts

@@ -1,5 +1,5 @@
 import type { Kubeconfig as KubeconfigBody } from '@cpn-console/shared'
-import type { Cluster, Prisma, Project, Stage, User, Zone } from '@prisma/client'
+import type { Cluster, Prisma as PrismaClient, Project, Stage, User, Zone } from '@prisma/client'
 import { ClusterPrivacySchema } from '@cpn-console/shared'
 
 const CLUSTER_PUBLIC = ClusterPrivacySchema.enum.public
@@ -19,8 +19,8 @@ export const clusterListSelect = {
   createdAt: true,
   updatedAt: true,
   stages: true,
-} satisfies Prisma.ClusterSelect
-export type ClusterListRecord = Prisma.ClusterGetPayload<{ select: typeof clusterListSelect }>
+} satisfies PrismaClient.ClusterSelect
+export type ClusterListRecord = PrismaClient.ClusterGetPayload<{ select: typeof clusterListSelect }>
 
 export const clusterDetailsSelect = {
   id: true,
@@ -39,8 +39,8 @@ export const clusterDetailsSelect = {
   projects: { select: { id: true } },
   kubeconfig: true,
   stages: true,
-} satisfies Prisma.ClusterSelect
-export type ClusterDetailsRecord = Prisma.ClusterGetPayload<{ select: typeof clusterDetailsSelect }>
+} satisfies PrismaClient.ClusterSelect
+export type ClusterDetailsRecord = PrismaClient.ClusterGetPayload<{ select: typeof clusterDetailsSelect }>
 
 export const clusterEnvironmentsSelect = {
   id: true,
@@ -62,42 +62,10 @@ export const clusterEnvironmentsSelect = {
       members: true,
     },
   },
-} satisfies Prisma.EnvironmentSelect
-export type ClusterEnvironmentsRecord = Prisma.EnvironmentGetPayload<{ select: typeof clusterEnvironmentsSelect }>
+} satisfies PrismaClient.EnvironmentSelect
+export type ClusterEnvironmentsRecord = PrismaClient.EnvironmentGetPayload<{ select: typeof clusterEnvironmentsSelect }>
 
-export function getClusterById(prisma: Prisma.TransactionClient, id: Cluster['id']) {
-  return prisma.cluster.findUnique({
-    where: { id },
-    include: { kubeconfig: true },
-  })
-}
-
-export function getClusterEnvironments(prisma: Prisma.TransactionClient, clusterId: Cluster['id']) {
-  return prisma.environment.findMany({
-    where: { clusterId },
-    select: clusterEnvironmentsSelect,
-  })
-}
-
-export function getClusterDetails(prisma: Prisma.TransactionClient, id: Cluster['id']) {
-  return prisma.cluster.findUniqueOrThrow({
-    where: { id },
-    select: clusterDetailsSelect,
-  })
-}
-
-export function getClusterByLabel(prisma: Prisma.TransactionClient, label: Cluster['label']) {
-  return prisma.cluster.findUnique({ where: { label } })
-}
-
-export function listClusters(prisma: Prisma.TransactionClient, where: Prisma.ClusterWhereInput) {
-  return prisma.cluster.findMany({
-    where,
-    select: clusterListSelect,
-  })
-}
-
-export function listClustersWhere(userId?: User['id']): Prisma.ClusterWhereInput {
+export function generateClusterWhereInput(userId?: User['id']): PrismaClient.ClusterWhereInput {
   return userId
     ? {
         OR: [
@@ -110,27 +78,27 @@ export function listClustersWhere(userId?: User['id']): Prisma.ClusterWhereInput
     : {}
 }
 
-export async function getProjectsByClusterId(prisma: Prisma.TransactionClient, id: Cluster['id']) {
-  return (await prisma.cluster.findUniqueOrThrow({
+export async function getProjectsByClusterId(tx: PrismaClient.TransactionClient, id: Cluster['id']) {
+  return (await tx.cluster.findUniqueOrThrow({
     where: { id },
     select: { projects: true },
   }))?.projects
 }
 
-export async function listStagesByClusterId(prisma: Prisma.TransactionClient, id: Cluster['id']) {
-  return (await prisma.cluster.findUniqueOrThrow({
+export async function listStagesByClusterId(tx: PrismaClient.TransactionClient, id: Cluster['id']) {
+  return (await tx.cluster.findUniqueOrThrow({
     where: { id },
     select: { stages: true },
   }))?.stages
 }
 
 export function createCluster(
-  prisma: Prisma.TransactionClient,
+  tx: PrismaClient.TransactionClient,
   data: Omit<Cluster, 'id' | 'updatedAt' | 'createdAt' | 'kubeConfigId' | 'secretName' | 'zoneId'>,
   kubeconfig: Pick<KubeconfigBody, 'user' | 'cluster'>,
   zoneId: string,
 ) {
-  return prisma.cluster.create({
+  return tx.cluster.create({
     data: {
       ...data,
       kubeconfig: {
@@ -145,12 +113,12 @@ export function createCluster(
 }
 
 export function updateCluster(
-  prisma: Prisma.TransactionClient,
+  tx: PrismaClient.TransactionClient,
   id: Cluster['id'],
   data: Partial<Omit<Cluster, 'id' | 'updatedAt' | 'createdAt' | 'kubeConfigId' | 'zoneId'>>,
   kubeconfig?: Pick<KubeconfigBody, 'user' | 'cluster'>,
 ) {
-  return prisma.cluster.update({
+  return tx.cluster.update({
     where: { id },
     data: kubeconfig
       ? {
@@ -166,63 +134,51 @@ export function updateCluster(
   })
 }
 
-export function linkClusterToProjects(prisma: Prisma.TransactionClient, id: Cluster['id'], projectIds: Project['id'][]) {
-  return prisma.cluster.update({
+export function linkClusterToProjects(tx: PrismaClient.TransactionClient, id: Cluster['id'], projectIds: Project['id'][]) {
+  return tx.cluster.update({
     where: { id },
     data: {
       projects: { connect: projectIds.map(projectId => ({ id: projectId })) },
     },
   })
 }
 
-export function linkClusterToStages(prisma: Prisma.TransactionClient, id: Cluster['id'], stageIds: Stage['id'][]) {
-  return prisma.cluster.update({
+export function linkClusterToStages(tx: PrismaClient.TransactionClient, id: Cluster['id'], stageIds: Stage['id'][]) {
+  return tx.cluster.update({
     where: { id },
     data: {
       stages: { connect: stageIds.map(stageId => ({ id: stageId })) },
     },
   })
 }
 
-export function removeClusterFromProject(prisma: Prisma.TransactionClient, id: Cluster['id'], projectId: Project['id']) {
-  return prisma.cluster.update({
+export function removeClusterFromProject(tx: PrismaClient.TransactionClient, id: Cluster['id'], projectId: Project['id']) {
+  return tx.cluster.update({
     where: { id },
     data: {
       projects: { disconnect: { id: projectId } },
     },
   })
 }
 
-export function removeClusterFromStage(prisma: Prisma.TransactionClient, id: Cluster['id'], stageId: Stage['id']) {
-  return prisma.cluster.update({
+export function removeClusterFromStage(tx: PrismaClient.TransactionClient, id: Cluster['id'], stageId: Stage['id']) {
+  return tx.cluster.update({
     where: { id },
     data: {
       stages: { disconnect: { id: stageId } },
     },
   })
 }
 
-export function deleteCluster(prisma: Prisma.TransactionClient, id: Cluster['id']) {
-  return prisma.cluster.delete({ where: { id } })
+export function deleteCluster(tx: PrismaClient.TransactionClient, id: Cluster['id']) {
+  return tx.cluster.delete({ where: { id } })
 }
 
-export function linkZoneToClusters(prisma: Prisma.TransactionClient, zoneId: Zone['id'], clusterIds: Cluster['id'][]) {
-  return prisma.zone.update({
+export function linkZoneToClusters(tx: PrismaClient.TransactionClient, zoneId: Zone['id'], clusterIds: Cluster['id'][]) {
+  return tx.zone.update({
     where: { id: zoneId },
     data: {
       clusters: { connect: clusterIds.map(clusterId => ({ id: clusterId })) },
     },
   })
 }
-
-export async function getClusterUsage(prisma: Prisma.TransactionClient, clusterId: Cluster['id']) {
-  const clusterUsage = await prisma.environment.aggregate({
-    _sum: { memory: true, cpu: true, gpu: true },
-    where: { clusterId },
-  })
-  return {
-    cpu: clusterUsage._sum.cpu ?? 0,
-    gpu: clusterUsage._sum.gpu ?? 0,
-    memory: clusterUsage._sum.memory ?? 0,
-  }
-}

apps/server-nestjs/src/modules/cluster/cluster.controller.ts

@@ -15,11 +15,11 @@ import { UserGuard } from '../infrastructure/permission/user/user.guard'
 import { ZodValidationPipe } from '../infrastructure/pipe/zod-validation.pipe'
 import {
   ClusterNotFound,
+  ClusterService,
   EnvironmentsActive,
   HookFailed,
   LabelTaken,
-} from './cluster.pipeline'
-import { ClusterService } from './cluster.service'
+} from './cluster.service'
 
 type ClusterList = ClientInferResponseBody<typeof clusterContract.listClusters, 200>
 type ClusterDetails = ClientInferResponseBody<typeof clusterContract.getClusterDetails, 200>
@@ -32,7 +32,8 @@ function toHttpError(clusterId: string | undefined) {
     if (error instanceof LabelTaken) return new ConflictException('Ce label existe déjà pour un autre cluster')
     if (error instanceof EnvironmentsActive) return new BadRequestException('Impossible de supprimer le cluster, des environnements en activité y sont déployés')
     if (error instanceof HookFailed) return new UnprocessableEntityException('Echec des services à la création/mise à jour du cluster')
-    return error instanceof Error ? error : new Error(String(error))
+    if (error instanceof Error) return error
+    return new Error(String(error))
   }
 }