From 335ad54d190f86ee2e8b8f290c691fd14e86e6c6 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 7 Feb 2025 07:37:48 +0100
Subject: [PATCH] fix(manager/custom): Revert "fix(manager/custom): Support
range strategy with custom managers" (#34083)
---
lib/modules/manager/index.spec.ts | 33 +------------------------------
lib/modules/manager/index.ts | 7 ++-----
2 files changed, 3 insertions(+), 37 deletions(-)
diff --git a/lib/modules/manager/index.spec.ts b/lib/modules/manager/index.spec.ts
index 96411f363a..1c635b82ff 100644
--- a/lib/modules/manager/index.spec.ts
+++ b/lib/modules/manager/index.spec.ts
@@ -170,7 +170,7 @@ describe('modules/manager/index', () => {
});
describe('getRangeStrategy', () => {
- it('returns null for a unknown manager', () => {
+ it('returns null', () => {
manager.getManagers().set('dummy', {
defaultConfig: {},
supportedDatasources: [],
@@ -180,37 +180,6 @@ describe('modules/manager/index', () => {
).toBeNull();
});
- it('returns null for a undefined manager', () => {
- manager.getManagers().set('dummy', {
- defaultConfig: {},
- supportedDatasources: [],
- });
- expect(manager.getRangeStrategy({ rangeStrategy: 'auto' })).toBeNull();
- });
-
- it('returns non-null for a custom manager', () => {
- customManager.getCustomManagers().set('dummy', {
- defaultConfig: {},
- supportedDatasources: [],
- });
- expect(
- manager.getRangeStrategy({ manager: 'dummy', rangeStrategy: 'auto' }),
- ).not.toBeNull();
- });
-
- it('handles custom managers', () => {
- customManager.getCustomManagers().set('dummy', {
- defaultConfig: {},
- supportedDatasources: [],
- // For completeness. Custom managers are configured in json and can not
- // provide a range strategy (yet) but the interface allows for it.
- getRangeStrategy: () => 'bump',
- });
- expect(
- manager.getRangeStrategy({ manager: 'dummy', rangeStrategy: 'auto' }),
- ).toBe('bump');
- });
-
it('returns non-null', () => {
manager.getManagers().set('dummy', {
defaultConfig: {},
diff --git a/lib/modules/manager/index.ts b/lib/modules/manager/index.ts
index 38a80e5c21..e4f9eace29 100644
--- a/lib/modules/manager/index.ts
+++ b/lib/modules/manager/index.ts
@@ -78,13 +78,10 @@ export function extractPackageFile(
export function getRangeStrategy(config: RangeConfig): RangeStrategy | null {
const { manager, rangeStrategy } = config;
- if (!manager) {
- return null;
- }
- const m = managers.get(manager) ?? customManagers.get(manager);
- if (!m) {
+ if (!manager || !managers.has(manager)) {
return null;
}
+ const m = managers.get(manager)!;
if (m.getRangeStrategy) {
// Use manager's own function if it exists
const managerRangeStrategy = m.getRangeStrategy(config);
--
GitLab