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
1 change: 1 addition & 0 deletions apps/client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ COPY --chown=node:root apps/client/package.json ./apps/client/package.json
COPY --chown=node:root packages/eslintconfig/package.json ./packages/eslintconfig/package.json
COPY --chown=node:root packages/shared/package.json ./packages/shared/package.json
COPY --chown=node:root packages/logger/package.json ./packages/logger/package.json
COPY --chown=node:root packages/hooks/package.json ./packages/hooks/package.json
COPY --chown=node:root packages/test-utils/package.json ./packages/test-utils/package.json
COPY --chown=node:root packages/tsconfig/package.json ./packages/tsconfig/package.json

Expand Down
92 changes: 46 additions & 46 deletions apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,57 +28,57 @@
"dependencies": {
"@cpn-console/logger": "workspace:^",
"@cpn-console/shared": "workspace:^",
"@gouvfr/dsfr": "^1.14.4",
"@gouvminint/vue-dsfr": "^8.15.0",
"@iconify-json/ri": "^1.2.10",
"@iconify/vue": "^4.3.0",
"@ts-rest/core": "^3.52.1",
"@vue/tsconfig": "^0.7.0",
"axios": "^1.15.1",
"javascript-time-ago": "^2.6.4",
"jszip": "^3.10.1",
"keycloak-js": "^26.2.3",
"nanoid": "5.0.9",
"p-debounce": "^4.0.0",
"pinia": "^2.3.1",
"vue": "^3.5.30",
"vue-router": "^4.6.4",
"vue3-json-viewer": "^2.4.1",
"xbytes": "^1.9.1",
"yaml": "^2.7.1"
"@gouvfr/dsfr": "catalog:runtime",
"@gouvminint/vue-dsfr": "catalog:runtime",
"@iconify-json/ri": "catalog:runtime",
"@iconify/vue": "catalog:runtime",
"@ts-rest/core": "catalog:runtime",
"@vue/tsconfig": "catalog:build",
"axios": "catalog:runtime",
"javascript-time-ago": "catalog:runtime",
"jszip": "catalog:runtime",
"keycloak-js": "catalog:runtime",
"nanoid": "catalog:runtime",
"p-debounce": "catalog:runtime",
"pinia": "catalog:runtime",
"vue": "catalog:runtime",
"vue-router": "catalog:runtime",
"vue3-json-viewer": "catalog:runtime",
"xbytes": "catalog:runtime",
"yaml": "catalog:runtime"
},
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/test-utils": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@faker-js/faker": "^9.9.0",
"@iconify/types": "^2.0.0",
"@types/jsdom": "^21.1.7",
"@types/node": "^24.12.0",
"@unocss/transformer-directives": "^0.65.4",
"@vitejs/plugin-vue": "^6.0.4",
"@vitest/coverage-v8": "^4.1.5",
"@vue/eslint-config-typescript": "^14.7.0",
"chalk": "^5.6.2",
"eslint": "^10.1.0",
"eslint-plugin-vue": "^10.8.0",
"jsdom": "^25.0.1",
"rimraf": "^6.1.3",
"stylelint": "^17.11.0",
"stylelint-config-html": "^1.1.0",
"stylelint-config-recommended-vue": "^1.6.1",
"stylelint-config-standard": "^40.0.0",
"typescript": "^5.9.3",
"unocss": "^66.6.6",
"unplugin-auto-import": "^0.18.6",
"unplugin-vue-components": "^0.27.5",
"vite": "^7.3.2",
"vite-node": "^6.0.0",
"vite-plugin-pwa": "^1.2.0",
"vitest": "^4.1.5",
"vue-eslint-parser": "^10.4.0",
"vue-tsc": "^2.2.12",
"workbox-window": "^7.4.0"
"@faker-js/faker": "catalog:test",
"@iconify/types": "catalog:build",
"@types/jsdom": "catalog:types",
"@types/node": "catalog:types",
"@unocss/transformer-directives": "catalog:build",
"@vitejs/plugin-vue": "catalog:build",
"@vitest/coverage-v8": "catalog:test",
"@vue/eslint-config-typescript": "catalog:tools",
"chalk": "catalog:tools",
"eslint": "catalog:tools",
"eslint-plugin-vue": "catalog:tools",
"jsdom": "catalog:test",
"rimraf": "catalog:tools",
"stylelint": "catalog:tools",
"stylelint-config-html": "catalog:tools",
"stylelint-config-recommended-vue": "catalog:tools",
"stylelint-config-standard": "catalog:tools",
"typescript": "catalog:build",
"unocss": "catalog:build",
"unplugin-auto-import": "catalog:build",
"unplugin-vue-components": "catalog:build",
"vite": "catalog:build",
"vite-node": "catalog:build",
"vite-plugin-pwa": "catalog:build",
"vitest": "catalog:test",
"vue-eslint-parser": "catalog:tools",
"vue-tsc": "catalog:build",
"workbox-window": "catalog:build"
Comment thread
shikanime marked this conversation as resolved.
},
"publishConfig": {
"registry": "https://registry.npmjs.org/",
Expand Down
120 changes: 60 additions & 60 deletions apps/server-nestjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,71 +39,71 @@
"@cpn-console/shared": "workspace:^",
"@cpn-console/sonarqube-plugin": "workspace:^",
"@cpn-console/vault-plugin": "workspace:^",
"@gitbeaker/core": "^40.6.0",
"@gitbeaker/requester-utils": "^40.6.0",
"@gitbeaker/rest": "^40.6.0",
"@keycloak/keycloak-admin-client": "^24.0.0",
"@kubernetes-models/argo-cd": "^2.7.2",
"@nestjs/cache-manager": "^3.1.2",
"@nestjs/common": "^11.1.16",
"@nestjs/config": "^4.0.3",
"@nestjs/core": "^11.1.16",
"@nestjs/event-emitter": "^3.0.1",
"@nestjs/jwt": "^11.0.2",
"@nestjs/platform-fastify": "^11.1.16",
"@nestjs/schedule": "^6.1.1",
"@nestjs/swagger": "^11.4.1",
"@nestjs/terminus": "^11.1.1",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/auto-instrumentations-node": "^0.70.1",
"@opentelemetry/exporter-metrics-otlp-proto": "^0.213.0",
"@opentelemetry/exporter-trace-otlp-proto": "^0.213.0",
"@opentelemetry/instrumentation-nestjs-core": "^0.58.0",
"@opentelemetry/instrumentation-pino": "^0.59.0",
"@opentelemetry/sdk-metrics": "^2.5.1",
"@opentelemetry/sdk-node": "^0.212.0",
"@prisma/client": "^6.19.2",
"@ts-rest/core": "^3.52.1",
"@ts-rest/fastify": "^3.52.1",
"@ts-rest/open-api": "^3.52.1",
"cache-manager": "^7.2.8",
"date-fns": "^4.1.0",
"fastify": "^5.8.5",
"fastify-keycloak-adapter": "2.3.2",
"json-2-csv": "^5.5.10",
"mustache": "^4.2.0",
"nestjs-pino": "^4.6.0",
"prisma": "^6.19.2",
"reflect-metadata": "^0.2.2",
"rxjs": "^7.8.2",
"undici": "^7.24.0",
"vitest-mock-extended": "^2.0.2",
"yaml": "^2.7.1",
"zod": "^3.25.76"
"@gitbeaker/core": "catalog:runtime",
"@gitbeaker/requester-utils": "catalog:runtime",
"@gitbeaker/rest": "catalog:runtime",
"@keycloak/keycloak-admin-client": "catalog:runtime",
"@kubernetes-models/argo-cd": "catalog:runtime",
"@nestjs/cache-manager": "catalog:runtime",
"@nestjs/common": "catalog:runtime",
"@nestjs/config": "catalog:runtime",
"@nestjs/core": "catalog:runtime",
"@nestjs/event-emitter": "catalog:runtime",
"@nestjs/jwt": "catalog:runtime",
"@nestjs/platform-fastify": "catalog:runtime",
"@nestjs/schedule": "catalog:runtime",
"@nestjs/swagger": "catalog:runtime",
"@nestjs/terminus": "catalog:runtime",
"@opentelemetry/api": "catalog:otel",
"@opentelemetry/auto-instrumentations-node": "catalog:otel",
Comment thread
shikanime marked this conversation as resolved.
"@opentelemetry/exporter-metrics-otlp-proto": "catalog:otel",
"@opentelemetry/exporter-trace-otlp-proto": "catalog:otel",
"@opentelemetry/instrumentation-nestjs-core": "catalog:otel",
"@opentelemetry/instrumentation-pino": "catalog:otel",
"@opentelemetry/sdk-metrics": "catalog:otel",
"@opentelemetry/sdk-node": "catalog:otel",
"@prisma/client": "catalog:runtime",
"@ts-rest/core": "catalog:runtime",
"@ts-rest/fastify": "catalog:runtime",
"@ts-rest/open-api": "catalog:runtime",
"cache-manager": "catalog:runtime",
"date-fns": "catalog:runtime",
"fastify": "catalog:runtime",
"fastify-keycloak-adapter": "catalog:runtime",
"json-2-csv": "catalog:runtime",
"mustache": "catalog:runtime",
"nestjs-pino": "catalog:runtime",
"prisma": "catalog:runtime",
"reflect-metadata": "catalog:runtime",
"rxjs": "catalog:runtime",
"undici": "catalog:runtime",
"vitest-mock-extended": "catalog:runtime",
"yaml": "catalog:runtime",
"zod": "catalog:runtime"
},
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/test-utils": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@eslint/eslintrc": "^3.3.5",
"@eslint/js": "^9.39.4",
"@faker-js/faker": "^9.9.0",
"@nestjs/cli": "^11.0.16",
"@nestjs/schematics": "^11.0.9",
"@nestjs/testing": "^11.1.16",
"@types/node": "^24.12.0",
"@vitest/coverage-v8": "^4.1.5",
"eslint": "^9.39.4",
"globals": "^16.5.0",
"msw": "^2.12.10",
"pino-pretty": "^13.1.3",
"rimraf": "^6.1.3",
"ts-patch": "^3.3.0",
"typescript": "^5.9.3",
"typescript-eslint": "^8.57.0",
"vite": "^7.3.2",
"vite-node": "^6.0.0",
"vitest": "^4.1.5"
"@eslint/eslintrc": "catalog:tools",
"@eslint/js": "catalog:tools",
"@faker-js/faker": "catalog:test",
"@nestjs/cli": "catalog:build",
"@nestjs/schematics": "catalog:build",
"@nestjs/testing": "catalog:build",
"@types/node": "catalog:types",
"@vitest/coverage-v8": "catalog:test",
"eslint": "catalog:tools",
"globals": "catalog:test",
"msw": "catalog:test",
"pino-pretty": "catalog:tools",
"rimraf": "catalog:tools",
"ts-patch": "catalog:build",
"typescript": "catalog:build",
"typescript-eslint": "catalog:tools",
"vite": "catalog:build",
"vite-node": "catalog:build",
"vitest": "catalog:test"
},
"publishConfig": {
"tag": "latest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import type { AdminToken, PersonalAccessToken, User } from '@prisma/client'
import type { FastifyRequest } from 'fastify'
import type { DeepMockProxy } from 'vitest-mock-extended'
import type { UserContext } from './auth-user.decorator'
import { mockDeep } from 'vitest-mock-extended'
import { faker } from '@faker-js/faker'
import { mockDeep } from 'vitest-mock-extended'

export function makeAuthRequest(headers: FastifyRequest['headers'] = {}): FastifyRequest {
const request = mockDeep<FastifyRequest>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ describe('keycloakClientService authentication lifecycle', () => {
it('should rethrow when the initial authentication fails', async () => {
const tokenRequests = useTokenEndpoint({ rejectGrant: () => true })

await expect(module.init()).rejects.toThrow('Network response was not OK.')
await expect(module.init()).rejects.toThrow('invalid_grant')
expect(client.realmName).toBe('master')

await vi.advanceTimersByTimeAsync(ADMIN_TOKEN_REFRESH_INTERVAL_MS * 2)
Expand Down Expand Up @@ -252,7 +252,7 @@ describe('getOrCreateSubGroupByName', () => {
HttpResponse.json({ errorMessage: 'Sibling group named \'sub\' already exists.' }, { status: 409 })),
)

await expect(service.getOrCreateSubGroupByName('parent-id', 'sub')).rejects.toThrow('Network response was not OK.')
await expect(service.getOrCreateSubGroupByName('parent-id', 'sub')).rejects.toThrow('Sibling group named')
})

it('should rethrow non-409 errors without re-fetching', async () => {
Expand All @@ -266,7 +266,7 @@ describe('getOrCreateSubGroupByName', () => {
HttpResponse.json({ error: 'unauthorized' }, { status: 401 })),
)

await expect(service.getOrCreateSubGroupByName('parent-id', 'sub')).rejects.toThrow('Network response was not OK.')
await expect(service.getOrCreateSubGroupByName('parent-id', 'sub')).rejects.toThrow('unauthorized')
expect(listCalls).toBe(1)
})
})
84 changes: 42 additions & 42 deletions apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,53 +53,53 @@
"@cpn-console/shared": "workspace:^",
"@cpn-console/sonarqube-plugin": "workspace:^",
"@cpn-console/vault-plugin": "workspace:^",
"@fastify/cookie": "^11.0.2",
"@fastify/helmet": "^13.0.2",
"@fastify/otel": "^0.18.1",
"@fastify/session": "^11.1.1",
"@fastify/swagger": "^9.7.0",
"@fastify/swagger-ui": "^5.2.6",
"@gitbeaker/core": "^40.6.0",
"@gitbeaker/rest": "^40.6.0",
"@kubernetes-models/argo-cd": "^2.7.2",
"@opentelemetry/auto-instrumentations-node": "^0.70.1",
"@opentelemetry/exporter-metrics-otlp-proto": "^0.213.0",
"@opentelemetry/exporter-trace-otlp-proto": "^0.213.0",
"@opentelemetry/instrumentation-nestjs-core": "^0.58.0",
"@opentelemetry/instrumentation-pino": "^0.59.0",
"@opentelemetry/sdk-metrics": "^2.5.1",
"@opentelemetry/sdk-node": "^0.212.0",
"@prisma/client": "^6.19.2",
"@ts-rest/core": "^3.52.1",
"@ts-rest/fastify": "^3.52.1",
"@ts-rest/open-api": "^3.52.1",
"axios": "^1.15.1",
"date-fns": "^4.1.0",
"fastify": "^5.8.5",
"fastify-keycloak-adapter": "^3.0.0",
"json-2-csv": "^5.5.10",
"mustache": "^4.2.0",
"prisma": "^6.19.2",
"undici": "^7.24.0",
"vitest-mock-extended": "^2.0.2"
"@fastify/cookie": "catalog:runtime",
"@fastify/helmet": "catalog:runtime",
"@fastify/otel": "catalog:runtime",
"@fastify/session": "catalog:runtime",
"@fastify/swagger": "catalog:runtime",
"@fastify/swagger-ui": "catalog:runtime",
"@gitbeaker/core": "catalog:runtime",
"@gitbeaker/rest": "catalog:runtime",
"@kubernetes-models/argo-cd": "catalog:runtime",
"@opentelemetry/auto-instrumentations-node": "catalog:otel",
"@opentelemetry/exporter-metrics-otlp-proto": "catalog:otel",
"@opentelemetry/exporter-trace-otlp-proto": "catalog:otel",
"@opentelemetry/instrumentation-nestjs-core": "catalog:otel",
"@opentelemetry/instrumentation-pino": "catalog:otel",
"@opentelemetry/sdk-metrics": "catalog:otel",
"@opentelemetry/sdk-node": "catalog:otel",
"@prisma/client": "catalog:runtime",
"@ts-rest/core": "catalog:runtime",
"@ts-rest/fastify": "catalog:runtime",
"@ts-rest/open-api": "catalog:runtime",
"axios": "catalog:runtime",
"date-fns": "catalog:runtime",
"fastify": "catalog:runtime",
"fastify-keycloak-adapter": "catalog:runtime",
"json-2-csv": "catalog:runtime",
"mustache": "catalog:runtime",
"prisma": "catalog:runtime",
"undici": "catalog:runtime",
"vitest-mock-extended": "catalog:runtime"
},
"devDependencies": {
"@cpn-console/eslint-config": "workspace:^",
"@cpn-console/test-utils": "workspace:^",
"@cpn-console/ts-config": "workspace:^",
"@faker-js/faker": "^9.9.0",
"@types/node": "^24.12.0",
"@vitest/coverage-v8": "^4.1.5",
"fastify-plugin": "^5.1.0",
"nodemon": "^3.1.14",
"pino-pretty": "^13.1.3",
"rimraf": "^6.1.3",
"ts-patch": "^3.3.0",
"typescript": "^5.9.3",
"typescript-transform-paths": "^3.5.6",
"vite": "^7.3.2",
"vite-node": "^6.0.0",
"vitest": "^4.1.5"
"@faker-js/faker": "catalog:test",
"@types/node": "catalog:types",
"@vitest/coverage-v8": "catalog:test",
"fastify-plugin": "catalog:build",
"nodemon": "catalog:tools",
"pino-pretty": "catalog:tools",
"rimraf": "catalog:tools",
"ts-patch": "catalog:build",
"typescript": "catalog:build",
"typescript-transform-paths": "catalog:build",
"vite": "catalog:build",
"vite-node": "catalog:build",
"vitest": "catalog:test"
},
"publishConfig": {
"registry": "https://registry.npmjs.org/",
Expand Down
6 changes: 3 additions & 3 deletions migrations/v9/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start": "node migrate.js"
},
"dependencies": {
"@gitbeaker/rest": "~40.6.0",
"axios": "^1.7.9"
"@gitbeaker/rest": "catalog:runtime",
"axios": "catalog:runtime"
}
}
}
Comment thread
StephaneTrebel marked this conversation as resolved.
Loading