From 0b208f831d6d4714fbadb19ff5e1fb3078cec5e9 Mon Sep 17 00:00:00 2001 From: ElaineDeMattosSilvaB Date: Sat, 6 Apr 2024 08:20:33 +0200 Subject: [PATCH] fix: add allowInherited to readGitlabConfig function Signed-off-by: ElaineDeMattosSilvaB --- .../src/providers/config.test.ts | 4 ++++ plugins/catalog-backend-module-gitlab/src/providers/config.ts | 3 +++ 2 files changed, 7 insertions(+) diff --git a/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts index bac56cc6f3..09b42e6475 100644 --- a/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts +++ b/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts @@ -58,6 +58,7 @@ describe('config', () => { groupPattern: /[\s\S]*/, userPattern: /[\s\S]*/, orgEnabled: false, + allowInherited: false, schedule: undefined, skipForkedRepos: false, }), @@ -95,6 +96,7 @@ describe('config', () => { groupPattern: /[\s\S]*/, userPattern: /[\s\S]*/, orgEnabled: false, + allowInherited: false, schedule: undefined, skipForkedRepos: false, }), @@ -133,6 +135,7 @@ describe('config', () => { groupPattern: /[\s\S]*/, userPattern: /[\s\S]*/, orgEnabled: false, + allowInherited: false, schedule: undefined, skipForkedRepos: true, }), @@ -173,6 +176,7 @@ describe('config', () => { groupPattern: /[\s\S]*/, userPattern: /[\s\S]*/, orgEnabled: false, + allowInherited: false, skipForkedRepos: false, schedule: { frequency: Duration.fromISO('PT30M'), diff --git a/plugins/catalog-backend-module-gitlab/src/providers/config.ts b/plugins/catalog-backend-module-gitlab/src/providers/config.ts index c34cb81808..8606a525bd 100644 --- a/plugins/catalog-backend-module-gitlab/src/providers/config.ts +++ b/plugins/catalog-backend-module-gitlab/src/providers/config.ts @@ -43,6 +43,8 @@ function readGitlabConfig(id: string, config: Config): GitlabProviderConfig { config.getOptionalString('groupPattern') ?? /[\s\S]*/, ); const orgEnabled: boolean = config.getOptionalBoolean('orgEnabled') ?? false; + const allowInherited: boolean = + config.getOptionalBoolean('allowInherited') ?? false; const skipForkedRepos: boolean = config.getOptionalBoolean('skipForkedRepos') ?? false; @@ -62,6 +64,7 @@ function readGitlabConfig(id: string, config: Config): GitlabProviderConfig { groupPattern, schedule, orgEnabled, + allowInherited, skipForkedRepos, }; }