Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(manager/custom): Support range strategy with custom managers #33800

33 changes: 32 additions & 1 deletion 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', () => {
it('returns null for a unknown manager', () => {
manager.getManagers().set('dummy', {
defaultConfig: {},
supportedDatasources: [],
Expand All @@ -180,6 +180,37 @@ 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: 5 additions & 2 deletions lib/modules/manager/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,13 @@ export function extractPackageFile(

export function getRangeStrategy(config: RangeConfig): RangeStrategy | null {
const { manager, rangeStrategy } = config;
if (!manager || !managers.has(manager)) {
if (!manager) {
return null;
}
const m = managers.get(manager) ?? customManagers.get(manager);
if (!m) {
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