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
9 changes: 9 additions & 0 deletions apps/nginx-strangler/conf.d/routing.conf
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
}

location /api/v1/deployments {
proxy_pass http://server-nestjs;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

# ── Routes par défaut (pour l'instant dans le legacy) ─────────────────────────
location /api/ {
proxy_pass http://server-legacy;
Expand Down
4 changes: 4 additions & 0 deletions apps/server-nestjs/src/main.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { Module } from '@nestjs/common'
import { EventEmitterModule } from '@nestjs/event-emitter'
import { ScheduleModule } from '@nestjs/schedule'
import { DeploymentModule } from './modules/deployment/deployment.module'
import { HealthzModule } from './modules/healthz/healthz.module'
import { KeycloakModule } from './modules/keycloak/keycloak.module'
import { ProjectModule } from './modules/project/project.module'
import { ServiceChainModule } from './modules/service-chain/service-chain.module'
import { SystemSettingsModule } from './modules/system-settings/system-settings.module'
import { VersionModule } from './modules/version/version.module'
Expand All @@ -15,6 +17,8 @@ import { VersionModule } from './modules/version/version.module'
ScheduleModule.forRoot(),
SystemSettingsModule,
ServiceChainModule,
ProjectModule,
DeploymentModule,
VersionModule,
],
controllers: [],
Expand Down
51 changes: 46 additions & 5 deletions apps/server-nestjs/src/modules/argocd/argocd-datastore.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,61 @@ export const projectSelect = {
select: {
id: true,
name: true,
clusterId: true,
cpu: true,
gpu: true,
memory: true,
autosync: true,
cluster: {
select: {
id: true,
label: true,
zone: {
select: {
slug: true,
},
},
},
},
},
},
clusters: {
deployments: {
select: {
id: true,
label: true,
zone: {
name: true,
autosync: true,
environment: {
select: {
id: true,
name: true,
cluster: {
select: {
id: true,
label: true,
zone: {
select: {
slug: true,
},
},
},
},
cpu: true,
gpu: true,
memory: true,
autosync: true,
},
},
deploymentSources: {
select: {
slug: true,
type: true,
path: true,
targetRevision: true,
helmValuesFiles: true,
repository: {
select: {
id: true,
internalRepoName: true,
},
},
},
},
},
Expand Down
94 changes: 94 additions & 0 deletions apps/server-nestjs/src/modules/argocd/argocd-testing.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import type { ProjectWithDetails } from './argocd-datastore.service'

import { faker } from '@faker-js/faker'

export function makeProjectDeploymentSource(
overrides: Partial<ProjectWithDetails['deployments'][number]['deploymentSources'][number]> = {},
): ProjectWithDetails['deployments'][number]['deploymentSources'][number] {
return {
type: 'git',
path: '.',
targetRevision: 'HEAD',
helmValuesFiles: '',
repository: makeProjectRepository(),
...overrides,
} satisfies ProjectWithDetails['deployments'][number]['deploymentSources'][number]
}

export function makeProjectDeployment(
overrides: Partial<ProjectWithDetails['deployments'][number]> = {},
): ProjectWithDetails['deployments'][number] {
return {
id: faker.string.uuid(),
name: faker.word.noun(),
environment: makeProjectEnvironment(),
autosync: true,
deploymentSources: [
{
type: 'git',
path: '.',
targetRevision: 'HEAD',
helmValuesFiles: '',
repository: makeProjectRepository(),
},
],
...overrides,
} satisfies ProjectWithDetails['deployments'][number]
}

export function makeProjectRepository(
overrides: Partial<ProjectWithDetails['repositories'][number]> = {},
): ProjectWithDetails['repositories'][number] {
return {
id: faker.string.uuid(),
internalRepoName: faker.word.noun(),
isInfra: false,
deployRevision: 'HEAD',
deployPath: '.',
helmValuesFiles: '',
...overrides,
} satisfies ProjectWithDetails['repositories'][number]
}

export function makeCluster(
overrides: Partial<ProjectWithDetails['environments'][number]['cluster']> = {},
): ProjectWithDetails['environments'][number]['cluster'] {
return {
id: faker.string.uuid(),
label: faker.word.noun(),
zone: {
slug: faker.word.noun(),
},
...overrides,
} satisfies ProjectWithDetails['environments'][number]['cluster']
}

export function makeProjectEnvironment(
overrides: Partial<ProjectWithDetails['environments'][number]> = {},
): ProjectWithDetails['environments'][number] {
return {
id: faker.string.uuid(),
name: faker.word.noun(),
cluster: makeCluster(),
cpu: 1,
gpu: 0,
memory: 1,
autosync: true,
...overrides,
} satisfies ProjectWithDetails['environments'][number]
}

export function makeProjectWithDetails(
overrides: Partial<ProjectWithDetails> = {},
): ProjectWithDetails {
return {
id: faker.string.uuid(),
slug: faker.helpers.slugify(faker.word.words({ count: 2 })).toLowerCase(),
name: faker.word.noun(),
environments: [makeProjectEnvironment()],
repositories: [makeProjectRepository()],
plugins: [],
deployments: [makeProjectDeployment()],
...overrides,
} satisfies ProjectWithDetails
}
Loading
Loading