Commit 19a94ca5 authored by Martin Lowe's avatar Martin Lowe 🇨🇦
Browse files

Fix changed gitlab field names

parent 1cf0b812
......@@ -32,8 +32,8 @@ export interface WorkingGroup {
}
export interface GitlabRepoSettings {
project_namespace: string;
ignored_namespaces: string[];
project_group: string;
ignored_sub_groups: string[];
}
export interface EclipseProject {
......
......@@ -167,7 +167,7 @@ export class GitlabSyncRunner {
}
// fetch group namespace indicated by the project and ensure format
const actualNamespace = project.gitlab.project_namespace;
const actualNamespace = project.gitlab.project_group;
const [projectNamespace, projectNamespaceTLP] = [
`${this.config.rootGroup}/${project.short_project_id}`,
`${this.config.rootGroup}/${project.top_level_project}/${project.short_project_id}`,
......@@ -265,7 +265,7 @@ export class GitlabSyncRunner {
for (const pidx in projects) {
// check if any of the matched projects marks this as an external/skipped namespace
const project = this.eclipseProjectCache[projects[pidx]];
if (project.gitlab.ignored_namespaces.some(v => v.localeCompare(self.full_path, undefined, { sensitivity: 'base' }) === 0)) {
if (project.gitlab.ignored_sub_groups.some(v => v.localeCompare(self.full_path, undefined, { sensitivity: 'base' }) === 0)) {
this.logger.info(`Group '${self.full_path}' was marked as an external/protected namespace by project '${project.project_id}'`);
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment