refactor!: use packageName and not depName for datasource lookups

docs/usage/configuration-options.md

@@ -525,6 +525,19 @@ If you need to _override_ constraints that Renovate detects from the repository,
 !!! note
     Make sure not to mix this up with the term `compatibility`, which Renovate uses in the context of version releases, e.g. if a Docker image is `node:12.16.0-alpine` then the `-alpine` suffix represents `compatibility`.
 
+## constraintsFiltering
+
+This option controls whether Renovate filters new releases based on configured or detected `constraints`.
+Renovate supports two options:
+
+- `none`: No release filtering (all releases allowed)
+- `strict`: If the release's constraints match the package file constraints, then it's included
+
+We are working on adding more advanced filtering options.
+
+Note: There must be a `constraints` object in your Renovate config for this to work.
+This feature is limited to `pypi` datasource only.
+
 ## defaultRegistryUrls
 
 Override a datasource's default registries with this config option.
@@ -1761,7 +1774,7 @@ This field also supports Regular Expressions if they begin and end with `/`. e.g
 {
   "packageRules": [
     {
-      "matchBaseBranches": ["/^release\\/.*/"],
+      "matchBaseBranches": ["/^release/.*/"],
       "excludePackagePatterns": ["^eslint"],
       "enabled": false
     }
@@ -2732,7 +2745,7 @@ regex definition:
     {
       "fileMatch": ["values.yaml$"],
       "matchStrings": [
-        "image:\\s+(?<depName>my\\.old\\.registry\\/aRepository\\/andImage):(?<currentValue>[^\\s]+)"
+        "image:\\s+(?<depName>my\\.old\\.registry/aRepository/andImage):(?<currentValue>[^\\s]+)"
       ],
       "depNameTemplate": "my.new.registry/aRepository/andImage",
       "autoReplaceStringTemplate": "image: {{{depName}}}:{{{newValue}}}",

docs/usage/self-hosted-configuration.md

@@ -302,9 +302,9 @@ You can skip the host part, and use just the datasource and credentials.
 
 Adds a custom prefix to the default Renovate sidecar Docker containers name and label.
 
-For example, if you set `dockerChildPrefix=myprefix_` then the final container created from the `renovate/node` is:
+For example, if you set `dockerChildPrefix=myprefix_` then the final container created from the `containerbase/sidecar` is:
 
-- called `myprefix_node` instead of `renovate_node`
+- called `myprefix_sidecar` instead of `renovate_sidecar`
 - labeled `myprefix_child` instead of `renovate_child`
 
 <!-- prettier-ignore -->
@@ -313,19 +313,19 @@ For example, if you set `dockerChildPrefix=myprefix_` then the final container c
 
 ## dockerImagePrefix
 
-By default Renovate pulls the sidecar Docker containers from `docker.io/renovate`.
+By default Renovate pulls the sidecar Docker containers from `docker.io/containerbase`.
 You can use the `dockerImagePrefix` option to override this default.
 
-Say you want to pull your images from `ghcr.io/renovatebot`.
+Say you want to pull your images from `ghcr.io/containerbase` to bypass Docker Hub limits.
 You would put this in your configuration file:
 
 ```json
 {
-  "dockerImagePrefix": "ghcr.io/renovatebot"
+  "dockerImagePrefix": "ghcr.io/containerbase"
 }
 ```
 
-If you pulled a new `node` image, the final image would be `ghcr.io/renovatebot/node` instead of `docker.io/renovate/node`.
+Now when Renovate pulls a new `sidecar` image, the final image is `ghcr.io/containerbase/sidecar` instead of `docker.io/containerbase/sidecar`.
 
 ## dockerUser
 

lib/config/options/index.ts

@@ -217,6 +217,14 @@ const options: RenovateOptions[] = [
     cli: false,
     env: false,
   },
+  {
+    name: 'constraintsFiltering',
+    description: 'Perform release filtering based on language constraints.',
+    type: 'string',
+    allowedValues: ['none', 'strict'],
+    cli: false,
+    default: 'none',
+  },
   {
     name: 'repositoryCache',
     description:
@@ -340,7 +348,7 @@ const options: RenovateOptions[] = [
     description:
       'Change this value to override the default Renovate Docker sidecar image name prefix.',
     type: 'string',
-    default: 'docker.io/renovate',
+    default: 'docker.io/containerbase',
     globalOnly: true,
   },
   {
@@ -953,7 +961,7 @@ const options: RenovateOptions[] = [
   {
     name: 'matchBaseBranches',
     description:
-      'List of strings containing exact matches (e.g. `["main"]`) and/or regex expressions (e.g. `["/^release\\/.*/"]`). Valid only within a `packageRules` object.',
+      'List of strings containing exact matches (e.g. `["main"]`) and/or regex expressions (e.g. `["/^release/.*/"]`). Valid only within a `packageRules` object.',
     type: 'array',
     subType: 'string',
     allowString: true,
@@ -1334,7 +1342,7 @@ const options: RenovateOptions[] = [
     name: 'rangeStrategy',
     description: 'Determines how to modify or update existing ranges.',
     type: 'string',
-    default: 'replace',
+    default: 'auto',
     allowedValues: [
       'auto',
       'pin',
@@ -1571,16 +1579,16 @@ const options: RenovateOptions[] = [
   {
     name: 'prHourlyLimit',
     description:
-      'Rate limit PRs to maximum x created per hour. 0 (default) means no limit.',
+      'Rate limit PRs to maximum x created per hour. 0 means no limit.',
     type: 'integer',
-    default: 0, // no limit
+    default: 2,
   },
   {
     name: 'prConcurrentLimit',
     description:
-      'Limit to a maximum of x concurrent branches/PRs. 0 (default) means no limit.',
+      'Limit to a maximum of x concurrent branches/PRs. 0 means no limit.',
     type: 'integer',
-    default: 0, // no limit
+    default: 10,
   },
   {
     name: 'branchConcurrentLimit',
@@ -2240,9 +2248,8 @@ const options: RenovateOptions[] = [
       'Maximum duration in minutes to keep datasource cache entries.',
     type: 'integer',
     stage: 'repository',
-    default: 0,
+    default: 24 * 60,
     globalOnly: true,
-    experimental: true,
   },
   {
     name: 'prBodyDefinitions',

lib/config/presets/common.ts

@@ -1,5 +1,6 @@
 export const removedPresets: Record<string, string | null> = {
-  ':autodetectPinVersions': ':autodetectRangeStrategy',
+  ':autodetectPinVersions': null,
+  ':autodetectRangeStrategy': null,
   ':automergeBranchMergeCommit': ':automergeBranch',
   ':automergeBranchPush': ':automergeBranch',
   ':base': 'config:base',

lib/config/presets/index.spec.ts

@@ -839,9 +839,6 @@ describe('config/presets/index', () => {
           ':dependencyDashboard',
           ':semanticPrefixFixDepsChoreOthers',
           ':ignoreModulesAndTests',
-          ':autodetectRangeStrategy',
-          ':prHourlyLimit2',
-          ':prConcurrentLimit10',
           'group:monorepos',
           'group:recommended',
           'workarounds:all',

lib/config/presets/internal/config.ts

@@ -9,9 +9,6 @@ export const presets: Record<string, Preset> = {
       ':dependencyDashboard',
       ':semanticPrefixFixDepsChoreOthers',
       ':ignoreModulesAndTests',
-      ':autodetectRangeStrategy',
-      ':prHourlyLimit2',
-      ':prConcurrentLimit10',
       'group:monorepos',
       'group:recommended',
       'workarounds:all',

lib/config/presets/internal/default.ts

@@ -10,10 +10,6 @@ export const presets: Record<string, Preset> = {
     assignees: ['{{arg0}}'],
     description: 'Assign PRs to `{{arg0}}`.',
   },
-  autodetectRangeStrategy: {
-    description: 'Automatically detect the best rangeStrategy to use.',
-    rangeStrategy: 'auto',
-  },
   automergeAll: {
     automerge: true,
     description:

lib/config/presets/internal/group.ts

@@ -314,7 +314,7 @@ const staticGroups = {
       {
         groupName: 'PHPStan packages',
         matchDatasources: ['packagist'],
-        matchPackagePatterns: ['^phpstan\\/phpstan$', '\\/phpstan-'],
+        matchPackagePatterns: ['^phpstan/phpstan$', '/phpstan-'],
       },
     ],
   },

lib/config/presets/internal/monorepo.ts

@@ -270,7 +270,7 @@ const patternGroups = {
   clarity: ['^@cds/', '^@clr/'],
   embroider: '^@embroider/',
   fullcalendar: '^@fullcalendar/',
-  spfx: ['^@microsoft\\/sp-', '^@microsoft\\/eslint-.+-spfx$'],
+  spfx: ['^@microsoft/sp-', '^@microsoft/eslint-.+-spfx$'],
   spock: '^org\\.spockframework:spock-',
   'syncfusion-dotnet': '^Syncfusion\\.',
   wordpress: '^@wordpress/',

lib/config/types.ts

@@ -188,6 +188,7 @@ export interface RegExManager extends RegexManagerTemplates {
 }
 
 export type UseBaseBranchConfigType = 'merge' | 'none';
+export type ConstraintsFilter = 'strict' | 'none';
 
 // TODO: Proper typings
 export interface RenovateConfig
@@ -251,6 +252,8 @@ export interface RenovateConfig
 
   constraints?: Record<string, string>;
   skipInstalls?: boolean;
+
+  constraintsFiltering?: ConstraintsFilter;
 }
 
 export interface AllConfig

lib/modules/datasource/artifactory/index.spec.ts

@@ -12,7 +12,7 @@ const testRegistryUrl = 'https://jfrog.company.com/artifactory';
 const testLookupName = 'project';
 const testConfig = {
   registryUrls: [testRegistryUrl],
-  depName: testLookupName,
+  packageName: testLookupName,
 };
 const fixtureReleasesAsFolders = Fixtures.get('releases-as-folders.html');
 const fixtureReleasesAsFiles = Fixtures.get('releases-as-files.html');
@@ -70,7 +70,6 @@ describe('modules/datasource/artifactory/index', () => {
         .reply(200, '<html>\n<h1>Header</h1>\n<a>1.3.0</a>\n<hmtl/>');
       const res = await getPkgReleases({
         registryUrls: [testRegistryUrl, secondRegistryUrl],
-        depName: testLookupName,
         datasource,
         packageName: testLookupName,
       });
@@ -81,7 +80,6 @@ describe('modules/datasource/artifactory/index', () => {
     it('returns null without registryUrl + warning', async () => {
       const res = await getPkgReleases({
         datasource,
-        depName: testLookupName,
         packageName: testLookupName,
       });
       expect(logger.warn).toHaveBeenCalledTimes(1);

lib/modules/datasource/artifactory/readme.md

@@ -2,6 +2,6 @@ Artifactory is the recommended registry for Conan packages.
 
 This datasource returns releases from given custom `registryUrl`(s).
 
-The target URL is composed by the `registryUrl` and the `packageName`, which defaults to `depName` when `packageName` is not defined.
+The target URL is composed by the `registryUrl` and the `packageName`.
 
 The release timestamp is taken from the date in the directory listing, and is assumed to be in UTC time.

lib/modules/datasource/aws-machine-image/index.spec.ts

@@ -276,7 +276,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mockEmpty);
       const res = await getDigest({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["without newValue, without returned images to be null"]}]',
       });
       expect(res).toBeNull();
@@ -286,7 +286,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mock1Image);
       const res = await getDigest({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["without newValue, with one matching image to return that image"]}]',
       });
       expect(res).toStrictEqual(image3.Name);
@@ -296,7 +296,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mock3Images);
       const res = await getDigest({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["without newValue, with 3 matching image to return the newest image"]}]',
       });
       expect(res).toStrictEqual(image3.Name);
@@ -307,7 +307,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       const res = await getDigest(
         {
           datasource,
-          depName:
+          packageName:
             '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with matching newValue, with 3 matching image to return the matching image"]}]',
         },
         image1.ImageId
@@ -320,7 +320,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       const res = await getDigest(
         {
           datasource,
-          depName:
+          packageName:
             '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with not matching newValue, with 3 matching images to return the matching image"]}]',
         },
         'will never match'
@@ -334,7 +334,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mockEmpty);
       const res = await getPkgReleases({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["without returned images to be null"]}]',
       });
       expect(res).toBeNull();
@@ -344,7 +344,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mock1Image);
       const res = await getPkgReleases({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with one matching image to return that image"]}]',
       });
       expect(res).toStrictEqual({
@@ -363,7 +363,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand({ Images: [image2] });
       const res = await getPkgReleases({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with one deprecated matching image to return that image"]}]',
       });
       expect(res).toStrictEqual({
@@ -382,7 +382,7 @@ describe('modules/datasource/aws-machine-image/index', () => {
       mockDescribeImagesCommand(mock3Images);
       const res = await getPkgReleases({
         datasource,
-        depName:
+        packageName:
           '[{"Name":"owner-id","Values":["602401143452"]},{"Name":"name","Values":["with 3 matching image to return the newest image"]}]',
       });
       expect(res).toStrictEqual({

lib/modules/datasource/aws-rds/index.spec.ts

@@ -105,7 +105,7 @@ describe('modules/datasource/aws-rds/index', () => {
       });
       const res = await getPkgReleases({
         datasource: AwsRdsDataSource.id,
-        depName: '[{"Name":"engine","Values":["mysql"]}]',
+        packageName: '[{"Name":"engine","Values":["mysql"]}]',
       });
       expect(res).toBeNull();
     });
@@ -117,7 +117,7 @@ describe('modules/datasource/aws-rds/index', () => {
       });
       const res = await getPkgReleases({
         datasource: AwsRdsDataSource.id,
-        depName: '[{"Name":"engine","Values":["mysql"]}]',
+        packageName: '[{"Name":"engine","Values":["mysql"]}]',
       });
       expect(res).toStrictEqual({
         releases: [
@@ -136,7 +136,7 @@ describe('modules/datasource/aws-rds/index', () => {
       });
       const res = await getPkgReleases({
         datasource: AwsRdsDataSource.id,
-        depName: '[{"Name":"engine","Values":["mysql"]}]',
+        packageName: '[{"Name":"engine","Values":["mysql"]}]',
       });
       expect(res).toStrictEqual({
         releases: [

lib/modules/datasource/azure-pipelines-tasks/index.spec.ts

@@ -6,7 +6,7 @@ describe('modules/datasource/azure-pipelines-tasks/index', () => {
     expect(
       await getPkgReleases({
         datasource: AzurePipelinesTasksDatasource.id,
-        depName: 'unknown',
+        packageName: 'unknown',
       })
     ).toBeNull();
   });
@@ -15,7 +15,7 @@ describe('modules/datasource/azure-pipelines-tasks/index', () => {
     expect(
       await getPkgReleases({
         datasource: AzurePipelinesTasksDatasource.id,
-        depName: 'AutomatedAnalysis',
+        packageName: 'AutomatedAnalysis',
       })
     ).toEqual({ releases: [{ version: '0.171.0' }, { version: '0.198.0' }] });
   });
@@ -24,7 +24,7 @@ describe('modules/datasource/azure-pipelines-tasks/index', () => {
     expect(
       await getPkgReleases({
         datasource: AzurePipelinesTasksDatasource.id,
-        depName: 'AutomatedAnalysis-Marketplace',
+        packageName: 'AutomatedAnalysis-Marketplace',
       })
     ).toEqual({ releases: [{ version: '0.171.0' }, { version: '0.198.0' }] });
   });
@@ -33,7 +33,7 @@ describe('modules/datasource/azure-pipelines-tasks/index', () => {
     expect(
       await getPkgReleases({
         datasource: AzurePipelinesTasksDatasource.id,
-        depName: 'automatedanalysis',
+        packageName: 'automatedanalysis',
       })
     ).toEqual({ releases: [{ version: '0.171.0' }, { version: '0.198.0' }] });
   });