refactor(packagist): Use single cache namespace (#31053)

renovatebot · Aug 27, 2024 · c7026f6 · c7026f6
1 parent 6899eb0
commit c7026f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/modules/datasource/packagist/index.ts b/lib/modules/datasource/packagist/index.ts
@@ -86,9 +86,9 @@ export class PackagistDatasource extends Datasource {
   }
 
   @cache({
-    namespace: `datasource-${PackagistDatasource.id}-public-files`,
+    namespace: `datasource-${PackagistDatasource.id}`,
     key: (regUrl: string, regFile: RegistryFile) =>
-      PackagistDatasource.getPackagistFileUrl(regUrl, regFile),
+      `getPackagistFile:${PackagistDatasource.getPackagistFileUrl(regUrl, regFile)}`,
     cacheable: (regUrl: string) =>
       !PackagistDatasource.isPrivatePackage(regUrl),
     ttlMinutes: 1440,
@@ -125,9 +125,9 @@ export class PackagistDatasource extends Datasource {
   }
 
   @cache({
-    namespace: `datasource-${PackagistDatasource.id}-org`,
+    namespace: `datasource-${PackagistDatasource.id}`,
     key: (registryUrl: string, metadataUrl: string, packageName: string) =>
-      `${registryUrl}:${metadataUrl}:${packageName}`,
+      `packagistV2Lookup:${registryUrl}:${metadataUrl}:${packageName}`,
     ttlMinutes: 10,
   })
   async packagistV2Lookup(

diff --git a/lib/util/cache/package/types.ts b/lib/util/cache/package/types.ts
@@ -83,8 +83,6 @@ export type PackageCacheNamespace =
   | 'datasource-npm:data'
   | 'datasource-nuget-v3'
   | 'datasource-orb'
-  | 'datasource-packagist-org'
-  | 'datasource-packagist-public-files'
   | 'datasource-packagist'
   | 'datasource-pod'
   | 'datasource-python-version'