From 30359ac0c3d22e54626ca4d6a48ded3772a2d317 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 28 Aug 2023 17:42:45 +0200
Subject: [PATCH] fix: Revert "feat: implement `custom.<customMgrName>` syntax
for `matchManagers` (#24112) (#24125)
---
.../custom/match-managers-migration.spec.ts | 26 -------------------
.../custom/match-managers-migration.ts | 18 -------------
.../validation-helpers/managers.spec.ts | 2 +-
lib/config/validation-helpers/managers.ts | 3 +--
lib/util/package-rules/managers.spec.ts | 12 ---------
lib/util/package-rules/managers.ts | 4 ---
6 files changed, 2 insertions(+), 63 deletions(-)
delete mode 100644 lib/config/migrations/custom/match-managers-migration.spec.ts
delete mode 100644 lib/config/migrations/custom/match-managers-migration.ts
diff --git a/lib/config/migrations/custom/match-managers-migration.spec.ts b/lib/config/migrations/custom/match-managers-migration.spec.ts
deleted file mode 100644
index 8c7d519520..0000000000
--- a/lib/config/migrations/custom/match-managers-migration.spec.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { MatchManagersMigration } from './match-managers-migration';
-
-describe('config/migrations/custom/match-managers-migration', () => {
- it('migrates old custom manager syntax to new one', () => {
- expect(MatchManagersMigration).toMigrate(
- {
- matchManagers: ['npm', 'regex', 'custom.someMgr'],
- },
- {
- matchManagers: ['npm', 'custom.regex', 'custom.someMgr'],
- }
- );
- });
-
- // coverage
- it('only migrates when necessary', () => {
- expect(MatchManagersMigration).not.toMigrate(
- {
- matchManagers: undefined,
- },
- {
- matchManagers: undefined,
- }
- );
- });
-});
diff --git a/lib/config/migrations/custom/match-managers-migration.ts b/lib/config/migrations/custom/match-managers-migration.ts
deleted file mode 100644
index 81457fca2b..0000000000
--- a/lib/config/migrations/custom/match-managers-migration.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import is from '@sindresorhus/is';
-import { isCustomManager } from '../../../modules/manager/custom';
-import { AbstractMigration } from '../base/abstract-migration';
-
-export class MatchManagersMigration extends AbstractMigration {
- override readonly propertyName = 'matchManagers';
-
- override run(value: unknown): void {
- if (!is.array<string>(value, is.string)) {
- return;
- }
-
- const newValue = value.map((manager) =>
- isCustomManager(manager) ? `custom.${manager}` : manager
- );
- this.rewrite(newValue);
- }
-}
diff --git a/lib/config/validation-helpers/managers.spec.ts b/lib/config/validation-helpers/managers.spec.ts
index 943d1e57f0..653f65bf2b 100644
--- a/lib/config/validation-helpers/managers.spec.ts
+++ b/lib/config/validation-helpers/managers.spec.ts
@@ -3,7 +3,7 @@ import { check } from './managers';
describe('config/validation-helpers/managers', () => {
it('should have no errors', () => {
const res = check({
- resolvedRule: { matchManagers: ['npm', 'regex', 'custom.regex'] },
+ resolvedRule: { matchManagers: ['npm', 'regex'] },
currentPath: '',
});
expect(res).toEqual([]);
diff --git a/lib/config/validation-helpers/managers.ts b/lib/config/validation-helpers/managers.ts
index bf930ef2c8..aecad19df3 100644
--- a/lib/config/validation-helpers/managers.ts
+++ b/lib/config/validation-helpers/managers.ts
@@ -13,8 +13,7 @@ export function check({
if (Array.isArray(resolvedRule.matchManagers)) {
if (
resolvedRule.matchManagers.find(
- (confManager) =>
- !allManagersList.includes(confManager.replace('custom.', ''))
+ (confManager) => !allManagersList.includes(confManager)
)
) {
managersErrMessage = `${currentPath}:
diff --git a/lib/util/package-rules/managers.spec.ts b/lib/util/package-rules/managers.spec.ts
index c5a00ab509..c8e855c87e 100644
--- a/lib/util/package-rules/managers.spec.ts
+++ b/lib/util/package-rules/managers.spec.ts
@@ -47,17 +47,5 @@ describe('util/package-rules/managers', () => {
);
expect(result).toBeFalse();
});
-
- it('should match custom managers', () => {
- const result = managersMatcher.matches(
- {
- manager: 'regex',
- },
- {
- matchManagers: ['custom.regex'],
- }
- );
- expect(result).toBeTrue();
- });
});
});
diff --git a/lib/util/package-rules/managers.ts b/lib/util/package-rules/managers.ts
index 6ceffdb905..cd5de99a2a 100644
--- a/lib/util/package-rules/managers.ts
+++ b/lib/util/package-rules/managers.ts
@@ -1,6 +1,5 @@
import is from '@sindresorhus/is';
import type { PackageRule, PackageRuleInputConfig } from '../../config/types';
-import { isCustomManager } from '../../modules/manager/custom';
import { Matcher } from './base';
export class ManagersMatcher extends Matcher {
@@ -14,9 +13,6 @@ export class ManagersMatcher extends Matcher {
if (is.undefined(manager) || !manager) {
return false;
}
- if (isCustomManager(manager)) {
- return matchManagers.includes(`custom.${manager}`);
- }
return matchManagers.includes(manager);
}
}
--
GitLab