Skip to content
Open
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
2 changes: 1 addition & 1 deletion apps/server-nestjs/src/modules/argocd/argocd.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export class ArgoCDService {
this.logger.log(`ArgoCD sync completed for project ${project.slug}`)
}

@Cron(CronExpression.EVERY_HOUR)
// @Cron(CronExpression.EVERY_HOUR)
@StartActiveSpan()
async handleCron() {
this.logger.log('Starting ArgoCD reconciliation')
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/src/modules/gitlab/gitlab.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class GitlabService {
this.logger.log(`GitLab sync completed for project ${project.slug}`)
}

@Cron(CronExpression.EVERY_HOUR)
// @Cron(CronExpression.EVERY_HOUR)
@StartActiveSpan()
async handleCron() {
const span = trace.getActiveSpan()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class KeycloakService {
this.logger.log(`Keycloak cleanup completed for project ${project.slug}`)
}

@Cron(CronExpression.EVERY_HOUR)
// @Cron(CronExpression.EVERY_HOUR)
@StartActiveSpan()
async handleCron() {
const span = trace.getActiveSpan()
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/src/modules/nexus/nexus.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class NexusService {
await this.ensurePlatformRoles(projects)
}

@Cron(CronExpression.EVERY_HOUR)
// @Cron(CronExpression.EVERY_HOUR)
@StartActiveSpan()
async handleCron() {
const span = trace.getActiveSpan()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ export class RegistryService {
await this.deleteProject(project.slug)
}

@Cron(CronExpression.EVERY_HOUR)
// @Cron(CronExpression.EVERY_HOUR)
@StartActiveSpan()
async handleCron() {
const span = trace.getActiveSpan()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export class SonarqubeService implements OnModuleInit {
this.logger.log(`SonarQube deletion completed for project ${project.slug}`)
}

@Cron(CronExpression.EVERY_HOUR)
// @Cron(CronExpression.EVERY_HOUR)
@StartActiveSpan()
async handleCron() {
const span = trace.getActiveSpan()
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/src/modules/vault/vault.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class VaultService {
this.logger.log(`Vault zone cleanup completed for ${zone.slug}`)
}

@Cron(CronExpression.EVERY_HOUR)
// @Cron(CronExpression.EVERY_HOUR)
@StartActiveSpan()
async handleCron() {
const span = trace.getActiveSpan()
Expand Down
8 changes: 5 additions & 3 deletions plugins/gitlab/src/members.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Config, Project, UserObject } from '@cpn-console/hooks'
import type { Config, Project, Role, UserObject } from '@cpn-console/hooks'
import type { GitlabProjectApi } from './class.js'
import { AccessLevel } from '@gitbeaker/core'
import {
Expand All @@ -14,7 +14,7 @@ export function getGroupAccessLevelFromProjectRole(project: Project, user: UserO
const projectDeveloperGroupPathSuffixes = (config.gitlab?.projectDeveloperGroupPathSuffix ?? DEFAULT_PROJECT_DEVELOPER_GROUP_PATH_SUFFIX).split(',')
const projectMaintainerGroupPathSuffixes = (config.gitlab?.projectMaintainerGroupPathSuffix ?? DEFAULT_PROJECT_MAINTAINER_GROUP_PATH_SUFFIX).split(',')

const getAccessLevel = (role: any): number | null => {
const getAccessLevel = (role: Role): number | null => {
// TODO: update to AccessLevel.GUEST once we migrated pre-fine grained
// projects members to developer access level via database migrations
if (!role.oidcGroup) return AccessLevel.DEVELOPER
Expand All @@ -24,13 +24,15 @@ export function getGroupAccessLevelFromProjectRole(project: Project, user: UserO
return null
}

// TODO: update to AccessLevel.GUEST once we migrated pre-fine grained
// projects members to developer access level via database migrations
return project.roles.reduce<number | null>((highestAccessLevel, role) => {
if (role.users.some(userRole => userRole.id === user.id)) {
const level = getAccessLevel(role)
if (level && level > (highestAccessLevel ?? 0)) return level
}
return highestAccessLevel
}, null)
}, AccessLevel.DEVELOPER)
}

export function getGroupAccessLevel(project: Project, user: UserObject, config: Config): number | null {
Expand Down