Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 0 additions & 78 deletions .gitlab-ci-dso.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .prototools

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cd console
- [Docker >= v27](https://docs.docker.com/get-docker/) Orchestrateur de conteneurs
- [Plugin compose >= v2.35](https://github.com/docker/compose) (attention à ne pas avoir une vieille version qui traînerait dans `~/.docker/cli-plugins/` !). Permet de composer plusieurs conteneurs Docker
- [Plugin buildx](https://github.com/docker/buildx) Permet d'étendre les capacités de Docker à l'aide de BuildKit
- [Node.js >= v22](https://nodejs.org/en/download/) Environnement d'exécution JavaScript. Vous pouvez utiliser [Volta](https://volta) pour gérer automatiquement l'installation de la version approuvée
- [Node.js >= v24](https://nodejs.org/en/download/) Environnement d'exécution JavaScript
- [PnPM >= v10](https://pnpm.io/installation) Gestionnaire de paquets pour JavaScript

#### Prérequis de configuration du projet
Expand Down
2 changes: 1 addition & 1 deletion apps/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dev stage ------------------------------------------------------------------------
FROM docker.io/node:22.14.0-bullseye-slim AS dev
FROM docker.io/node:24.12.0-bullseye-slim AS dev

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@faker-js/faker": "^9.3.0",
"@iconify/types": "^2.0.0",
"@types/jsdom": "^21.1.7",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@unocss/transformer-directives": "^0.65.1",
"@vitejs/plugin-vue": "^6.0.1",
"@vitest/coverage-v8": "^2.1.8",
Expand Down
4 changes: 2 additions & 2 deletions apps/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base stage -----------------------------------------------------------------------
FROM docker.io/node:22.14.0-bullseye-slim AS dev
FROM docker.io/node:24.12.0-bullseye-slim AS dev

WORKDIR /app

Expand Down Expand Up @@ -50,7 +50,7 @@ RUN pnpm --filter @cpn-console/server --prod deploy build


# Prod stage -----------------------------------------------------------------------
FROM docker.io/node:22.14.0-bullseye-slim AS prod
FROM docker.io/node:24.12.0-bullseye-slim AS prod

ARG APP_VERSION
ENV APP_VERSION=$APP_VERSION
Expand Down
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"@cpn-console/test-utils": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@faker-js/faker": "^9.3.0",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"fastify-plugin": "^5.0.1",
"nodemon": "^3.1.7",
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"version": "9.11.0",
"private": true,
"packageManager": "pnpm@10.20.0",
"engines": {
"node": ">=24.0.0",
"npm": ">=11.0.0"
},
"scripts": {
"build": "turbo run build --color --no-daemon",
"build:clean": "turbo run build:clean --no-daemon",
Expand Down Expand Up @@ -73,7 +77,7 @@
"eslint": "^9.39.1",
"husky": "^9.1.7",
"lint-staged": "^15.5.2",
"turbo": "^2.6.0"
"turbo": "^2.7.1"
},
"pnpm": {
"patchedDependencies": {
Expand All @@ -90,8 +94,5 @@
"prisma",
"vue-demi"
]
},
"volta": {
"node": "22.14.0"
}
}
2 changes: 1 addition & 1 deletion packages/hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@types/json-schema": "^7.0.15",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@cpn-console/ts-config": "workspace:^",
"@faker-js/faker": "^9.3.0",
"@kubernetes/client-node": "^0.22.3",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
54 changes: 30 additions & 24 deletions packages/shared/src/api-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,38 @@ export const apiPrefix: string = '/api/v1'
export const contractInstance: ReturnType<typeof initContract> = initContract()

export async function getContract() {
return contractInstance.router(
{
AdminTokens: (await import('./contracts/index.js')).adminTokenContract,
AdminRoles: (await import('./contracts/index.js')).adminRoleContract,
Clusters: (await import('./contracts/index.js')).clusterContract,
ServiceChains: (await import('./contracts/index.js')).serviceChainContract,
Environments: (await import('./contracts/index.js')).environmentContract,
Logs: (await import('./contracts/index.js')).logContract,
PersonalAccessTokens: (await import('./contracts/index.js')).personalAccessTokenContract,
Projects: (await import('./contracts/index.js')).projectContract,
ProjectsMembers: (await import('./contracts/index.js')).projectMemberContract,
ProjectsRoles: (await import('./contracts/index.js')).projectRoleContract,
ProjectServices: (await import('./contracts/index.js')).projectServiceContract,
Repositories: (await import('./contracts/index.js')).repositoryContract,
Stages: (await import('./contracts/index.js')).stageContract,
Services: (await import('./contracts/index.js')).serviceContract,
Users: (await import('./contracts/index.js')).userContract,
Zones: (await import('./contracts/index.js')).zoneContract,
System: (await import('./contracts/index.js')).systemContract,
SystemPlugin: (await import('./contracts/index.js')).systemPluginContract,
SystemSettings: (await import('./contracts/index.js')).systemSettingsContract,
},
)
return contractInstance.router({
AdminTokens: (await import('./contracts/index.js')).adminTokenContract,
AdminRoles: (await import('./contracts/index.js')).adminRoleContract,
Clusters: (await import('./contracts/index.js')).clusterContract,
ServiceChains: (await import('./contracts/index.js')).serviceChainContract,
Environments: (await import('./contracts/index.js')).environmentContract,
Logs: (await import('./contracts/index.js')).logContract,
PersonalAccessTokens: (await import('./contracts/index.js'))
.personalAccessTokenContract,
Projects: (await import('./contracts/index.js')).projectContract,
ProjectsMembers: (await import('./contracts/index.js'))
.projectMemberContract,
ProjectsRoles: (await import('./contracts/index.js')).projectRoleContract,
ProjectServices: (await import('./contracts/index.js'))
.projectServiceContract,
Repositories: (await import('./contracts/index.js')).repositoryContract,
Stages: (await import('./contracts/index.js')).stageContract,
Services: (await import('./contracts/index.js')).serviceContract,
Users: (await import('./contracts/index.js')).userContract,
Zones: (await import('./contracts/index.js')).zoneContract,
System: (await import('./contracts/index.js')).systemContract,
SystemPlugin: (await import('./contracts/index.js')).systemPluginContract,
SystemSettings: (await import('./contracts/index.js'))
.systemSettingsContract,
})
}

export async function getApiClient(baseUrl: string, baseHeaders: Record<string, string>, api: ApiFetcher | undefined) {
export async function getApiClient(
baseUrl: string,
baseHeaders: Record<string, string>,
api: ApiFetcher | undefined,
): Promise<any> {
return initClient(await getContract(), {
baseUrl,
baseHeaders,
Expand Down
2 changes: 1 addition & 1 deletion packages/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"rimraf": "^6.0.1",
"typescript": "^5.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion playwright/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@cpn-console/ts-config": "workspace:^",
"@faker-js/faker": "^9.3.0",
"@playwright/test": "^1.56.1",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"dotenv": "^16.4.7"
}
}
2 changes: 1 addition & 1 deletion plugins/argocd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@faker-js/faker": "^9.3.0",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/gitlab/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@types/js-yaml": "4.0.9",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
5 changes: 1 addition & 4 deletions plugins/gitlab/src/class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,13 @@ export class GitlabApi extends PluginApi {
this.api = getApi()
}

public async createEmptyRepository({ createFirstCommit, groupId, repoName, description, ciConfigPath }: CreateEmptyRepositoryArgs & {
public async createEmptyRepository({ createFirstCommit, groupId, repoName, description }: CreateEmptyRepositoryArgs & {
createFirstCommit: boolean
groupId: number
ciConfigPath?: string
}) {
const project = await this.api.Projects.create({
name: repoName,
path: repoName,
ciConfigPath,
namespaceId: groupId,
description,
})
Expand Down Expand Up @@ -413,7 +411,6 @@ export class GitlabProjectApi extends GitlabApi {
repoName,
groupId: namespaceId,
description,
ciConfigPath: clone ? '.gitlab-ci-dso.yml' : undefined,
createFirstCommit: !clone,
})
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/harbor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/keycloak/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@cpn-console/vault-plugin": "workspace:^",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/kubernetes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/nexus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/sonarqube/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/vault/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/kubernetes-plugin": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@types/node": "^22.10.2",
"@types/node": "^24.1.0",
"@vitest/coverage-v8": "^2.1.8",
"nodemon": "^3.1.7",
"rimraf": "^6.0.1",
Expand Down
Loading
Loading