Skip to content

Commit

Permalink
fix(manager/custom): Revert "fix(manager/custom): Support range strat…
Browse files Browse the repository at this point in the history
…egy with custom managers" (#34083)
  • Loading branch information
rarkins authored Feb 7, 2025
1 parent 21dd68c commit 335ad54
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 37 deletions.
33 changes: 1 addition & 32 deletions lib/modules/manager/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: [],
Expand All @@ -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: {},
Expand Down
7 changes: 2 additions & 5 deletions lib/modules/manager/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 335ad54

Please sign in to comment.