Skip to content
Closed
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
10 changes: 10 additions & 0 deletions apps/client/src/components/RepoForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const props = withDefaults(defineProps<{
repo: () => ({
isInfra: false,
isPrivate: false,
isAutoSynced: false,
internalRepoName: '',
externalRepoUrl: '',
isStandalone: false,
Expand Down Expand Up @@ -174,6 +175,15 @@ function toggleStandalone(e: boolean) {
@update:model-value="updateRepo('externalRepoUrl', $event)"
/>
</div>
<DsfrCheckbox
id="autoSyncCheckbox"
v-model="localRepo.isAutoSynced"
:disabled="props.isProjectLocked || !canManage"
label="Synchronisation automatique du projet"
hint="Si vous travaillez depuis GitHub ou un repo publique, vous pouvez cocher cette case pour synchroniser automatiquement le projet"
name="isAutoSynced"
@update:model-value="updateRepo('isAutoSynced', $event)"
/>
<DsfrCheckbox
id="privateRepoCbx"
v-model="localRepo.isPrivate"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "Repository" ADD COLUMN "isAutoSynced" BOOLEAN NOT NULL DEFAULT false;
1 change: 1 addition & 0 deletions apps/server/src/prisma/schema/project.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ model Repository {
externalUserName String @default("")
isInfra Boolean @default(false)
isPrivate Boolean @default(false)
isAutoSynced Boolean @default(false)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
project Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
Expand Down
21 changes: 20 additions & 1 deletion apps/server/src/resources/repository/business.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
import type { Project, Repository, User } from '@prisma/client'
import type { CreateRepositoryBody, UpdateRepositoryBody } from '@cpn-console/shared'
import { addLogs, deleteRepository as deleteRepositoryQuery, getProjectInfosAndRepos, getProjectRepositories as getProjectRepositoriesQuery, initializeRepository, updateRepository as updateRepositoryQuery } from '@/resources/queries-index.js'
import { addLogs, deleteRepository as deleteRepositoryQuery, getProjectInfosAndRepos, getProjectRepositories as getProjectRepositoriesQuery, initializeRepository, getAutoSyncedRepositories as getAutoSyncedRepositoriesQuery, updateRepository as updateRepositoryQuery } from '@/resources/queries-index.js'
import { BadRequest400, Unprocessable422 } from '@/utils/errors.js'
import { hook } from '@/utils/hook-wrapper.js'

export async function getProjectRepositories(projectId: Project['id']) {
return getProjectRepositoriesQuery(projectId)
}

export async function autoSyncRepositories({
requestId,
userId,
}: {
requestId: string
userId: User['id']
}) {
const repositories = await getAutoSyncedRepositoriesQuery()

repositories.forEach(async (r) => {
await syncRepository({
repositoryId: r.id,
userId,
syncAllBranches: true,
requestId,
})
})
}

export async function syncRepository({
repositoryId,
userId,
Expand Down
13 changes: 11 additions & 2 deletions apps/server/src/resources/repository/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,19 @@ export function getProjectRepositories(projectId: Project['id']) {
return prisma.repository.findMany({ where: { projectId } })
}

export function getAutoSyncedRepositories() {
return prisma.repository.findMany({
where: {
isAutoSynced: true,
},
})
}

// CREATE
type RepositoryCreate = Pick<Repository, 'projectId' | 'internalRepoName' | 'isInfra' | 'isPrivate'> &
type RepositoryCreate = Pick<Repository, 'projectId' | 'internalRepoName' | 'isInfra' | 'isPrivate' | 'isAutoSynced'> &
Partial<Pick<Repository, 'externalUserName' | 'externalRepoUrl'>>

export function initializeRepository({ projectId, internalRepoName, externalRepoUrl, isInfra, isPrivate, externalUserName }: RepositoryCreate) {
export function initializeRepository({ projectId, internalRepoName, externalRepoUrl, isInfra, isPrivate, externalUserName, isAutoSynced }: RepositoryCreate) {
return prisma.repository.create({
data: {
projectId,
Expand All @@ -23,6 +31,7 @@ export function initializeRepository({ projectId, internalRepoName, externalRepo
externalUserName,
isInfra,
isPrivate,
isAutoSynced,
},
})
}
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/resources/repository/router.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ describe('repositoryRouter tests', () => {
projectId,
externalRepoUrl: `${faker.internet.url()}.git`,
isPrivate: true,
isAutoSynced: false,
externalToken: faker.string.alpha(),
externalUserName: faker.internet.username(),
isInfra: false,
Expand Down
19 changes: 19 additions & 0 deletions apps/server/src/resources/repository/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
deleteRepository,
getProjectRepositories,
syncRepository,
autoSyncRepositories,
updateRepository,
} from './business.js'
import { serverInstance } from '@/app.js'
Expand Down Expand Up @@ -49,6 +50,23 @@ export function repositoryRouter() {
}
},

// Synchroniser les repo marqués avec le flag `isAutoSynced`
autoSyncRepositories: async ({ request: req }) => {
const perms = await authUser(req)
if (!perms.user) return new Unauthorized401('Require to be requested from user or api key')

if (!AdminAuthorized.isAdmin(perms.adminPermissions)) {
return new Forbidden403()
}

await autoSyncRepositories({ requestId: req.id, userId: perms.user.id })

return {
status: 204,
body: null,
}
},

// Créer un repository
createRepository: async ({ request: req, body: data }) => {
const projectId = data.projectId
Expand Down Expand Up @@ -83,6 +101,7 @@ export function repositoryRouter() {
const keysAllowedForUpdate = [
'externalRepoUrl',
'isPrivate',
'isAutoSynced',
'externalToken',
'externalUserName',
'isInfra',
Expand Down
3 changes: 2 additions & 1 deletion docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ services:
container_name: dso-console_keycloak
ports:
- 8090:8080
- 9000:9000
volumes:
- ../keycloak/realms:/opt/bitnami/keycloak/data/import
- ../keycloak/data/dev:/opt/bitnami/keycloak/data/h2
Expand All @@ -17,7 +18,7 @@ services:
entrypoint: /opt/bitnami/keycloak/bin/kc.sh
command: start-dev --import-realm
healthcheck:
test: [CMD, curl, --head, fsS, "http://localhost:8080/health/ready"]
test: [CMD, curl, --head, -fsS, "http://localhost:9000/health/ready"]
interval: 5s
timeout: 5s
retries: 10
Expand Down
12 changes: 12 additions & 0 deletions packages/shared/src/contracts/repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ export const repositoryContract = contractInstance.router({
},
},

autoSyncRepositories: {
method: 'POST',
path: `/sync`,
summary: 'Update auto synced repos',
description: 'Update all repo marked for auto sync.',
body: null,
responses: {
204: null,
500: ErrorSchema,
},
},

updateRepository: {
method: 'PUT',
path: `/:repositoryId`,
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/schemas/repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const RepoSchema = z.object({
.or(z.literal(''))
.optional(),
isPrivate: z.boolean(),
isAutoSynced: z.boolean(),
isInfra: z.boolean(),
externalUserName: z.string()
.optional(),
Expand Down
3 changes: 3 additions & 0 deletions packages/shared/src/utils/schemas.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ describe('schemas utils', () => {
externalRepoUrl: 'https://github.com/LAB-MI/candilibV2.git',
externalToken: 'eddddsqsq-_',
isPrivate: true,
isAutoSynced: false,
isInfra: false,
externalUserName: 'clai+re-nlet_',
}
Expand Down Expand Up @@ -162,6 +163,7 @@ describe('schemas utils', () => {
externalUserName: 'clairenlet',
externalToken: 'myToken',
isPrivate: true,
isAutoSynced: true,
isInfra: false,
}

Expand Down Expand Up @@ -242,6 +244,7 @@ describe('schemas utils', () => {
internalRepoName: '-candilib',
externalRepoUrl: 'https://github.com/LAB-MI/candilibV2.git',
isPrivate: false,
isAutoSynced: false,
isInfra: false,
}

Expand Down