cleanup after rebase

Signed-off-by: Andreas Berger <andreas@berger-ecommerce.com>

plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts

@@ -61,10 +61,7 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
       throw new Error('Either schedule or scheduler must be provided.');
     }
 
-    const providerConfigs = readGitlabConfigs(
-      config,
-      options.logger.child({ target: 'GitlabDiscoveryEntityProvider' }),
-    );
+    const providerConfigs = readGitlabConfigs(config);
     const integrations = ScmIntegrations.fromConfig(config).gitlab;
     const providers: GitlabDiscoveryEntityProvider[] = [];
 

plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts

@@ -72,10 +72,7 @@ export class GitlabOrgDiscoveryEntityProvider implements EntityProvider {
       throw new Error('Either schedule or scheduler must be provided.');
     }
 
-    const providerConfigs = readGitlabConfigs(
-      config,
-      options.logger.child({ target: 'GitlabOrgDiscoveryEntityProvider' }),
-    );
+    const providerConfigs = readGitlabConfigs(config);
     const integrations = ScmIntegrations.fromConfig(config).gitlab;
     const providers: GitlabOrgDiscoveryEntityProvider[] = [];
 

plugins/catalog-backend-module-gitlab/src/providers/config.test.ts

@@ -17,9 +17,6 @@
 import { ConfigReader } from '@backstage/config';
 import { Duration } from 'luxon';
 import { readGitlabConfigs } from './config';
-import { getVoidLogger } from '@backstage/backend-common';
-
-const logger = getVoidLogger();
 
 describe('config', () => {
   it('empty gitlab config', () => {
@@ -29,7 +26,7 @@ describe('config', () => {
       },
     });
 
-    const result = readGitlabConfigs(config, logger);
+    const result = readGitlabConfigs(config);
     expect(result).toHaveLength(0);
   });
 
@@ -47,13 +44,13 @@ describe('config', () => {
       },
     });
 
-    const result = readGitlabConfigs(config, logger);
+    const result = readGitlabConfigs(config);
     expect(result).toHaveLength(1);
     result.forEach(r =>
       expect(r).toStrictEqual({
         id: 'test',
         group: 'group',
-        fallbackBranch: undefined,
+        branch: undefined,
         fallbackBranch: 'master',
         host: 'host',
         catalogFile: 'catalog-info.yaml',
@@ -83,13 +80,13 @@ describe('config', () => {
       },
     });
 
-    const result = readGitlabConfigs(config, logger);
+    const result = readGitlabConfigs(config);
     expect(result).toHaveLength(1);
     result.forEach(r =>
       expect(r).toStrictEqual({
         id: 'test',
         group: 'group',
-        fallbackBranch: 'not-master',
+        branch: 'not-master',
         fallbackBranch: 'main',
         host: 'host',
         catalogFile: 'custom-file.yaml',
@@ -122,13 +119,13 @@ describe('config', () => {
       },
     });
 
-    const result = readGitlabConfigs(config, logger);
+    const result = readGitlabConfigs(config);
     expect(result).toHaveLength(1);
     result.forEach(r =>
       expect(r).toStrictEqual({
         id: 'test',
         group: 'group',
-        fallbackBranch: undefined,
+        branch: undefined,
         fallbackBranch: 'master',
         host: 'host',
         catalogFile: 'catalog-info.yaml',
@@ -162,7 +159,7 @@ describe('config', () => {
       },
     });
 
-    expect(() => readGitlabConfigs(config, logger)).toThrow(
+    expect(() => readGitlabConfigs(config)).toThrow(
       "Missing required config value at 'catalog.providers.gitlab.test.host'",
     );
   });
@@ -181,7 +178,7 @@ describe('config', () => {
       },
     });
 
-    const result = readGitlabConfigs(config, logger);
+    const result = readGitlabConfigs(config);
     expect(result).toHaveLength(1);
     expect(result[0].group).toEqual('');
   });

plugins/catalog-backend-module-gitlab/src/providers/config.ts

@@ -17,7 +17,6 @@
 import { readTaskScheduleDefinitionFromConfig } from '@backstage/backend-tasks';
 import { Config } from '@backstage/config';
 import { GitlabProviderConfig } from '../lib';
-import { Logger } from 'winston';
 
 /**
  * Extracts the gitlab config from a config object
@@ -26,13 +25,8 @@ import { Logger } from 'winston';
  *
  * @param id - The provider key
  * @param config - The config object to extract from
- * @param logger - The logger
  */
-function readGitlabConfig(
-  id: string,
-  config: Config,
-  logger: Logger,
-): GitlabProviderConfig {
+function readGitlabConfig(id: string, config: Config): GitlabProviderConfig {
   const group = config.getOptionalString('group') ?? '';
   const host = config.getString('host');
   const branch = config.getOptionalString('branch');
@@ -75,12 +69,8 @@ function readGitlabConfig(
  * @public
  *
  * @param config - The config object to extract from
- * @param logger - The logger
  */
-export function readGitlabConfigs(
-  config: Config,
-  logger: Logger,
-): GitlabProviderConfig[] {
+export function readGitlabConfigs(config: Config): GitlabProviderConfig[] {
   const configs: GitlabProviderConfig[] = [];
 
   const providerConfigs = config.getOptionalConfig('catalog.providers.gitlab');
@@ -90,13 +80,7 @@ export function readGitlabConfigs(
   }
 
   for (const id of providerConfigs.keys()) {
-    configs.push(
-      readGitlabConfig(
-        id,
-        providerConfigs.getConfig(id),
-        logger.child({ target: id }),
-      ),
-    );
+    configs.push(readGitlabConfig(id, providerConfigs.getConfig(id)));
   }
 
   return configs;