refactor(github): Use single cache namespace for release attachments (#…

…31037)
renovatebot · Aug 27, 2024 · ddcef9c · ddcef9c
1 parent 51ca695
commit ddcef9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/modules/datasource/github-release-attachments/index.ts b/lib/modules/datasource/github-release-attachments/index.ts
@@ -55,7 +55,7 @@ export class GithubReleaseAttachmentsDatasource extends Datasource {
     ttlMinutes: 1440,
     namespace: `datasource-${GithubReleaseAttachmentsDatasource.id}`,
     key: (release: GithubRestRelease, digest: string) =>
-      `${release.html_url}:${digest}`,
+      `findDigestFile:${release.html_url}:${digest}`,
   })
   async findDigestFile(
     release: GithubRestRelease,
@@ -83,9 +83,9 @@ export class GithubReleaseAttachmentsDatasource extends Datasource {
 
   @cache({
     ttlMinutes: 1440,
-    namespace: 'datasource-github-releases',
+    namespace: `datasource-${GithubReleaseAttachmentsDatasource.id}`,
     key: (asset: GithubRestAsset, algorithm: string) =>
-      `${asset.browser_download_url}:${algorithm}:assetDigest`,
+      `downloadAndDigest:${asset.browser_download_url}:${algorithm}`,
   })
   async downloadAndDigest(
     asset: GithubRestAsset,

diff --git a/lib/util/cache/package/key.spec.ts b/lib/util/cache/package/key.spec.ts
@@ -3,8 +3,8 @@ import { getCombinedKey } from './key';
 describe('util/cache/package/key', () => {
   describe('getCombinedKey', () => {
     it('works', () => {
-      expect(getCombinedKey('datasource-github-releases', 'foo:bar')).toBe(
-        'global%%datasource-github-releases%%foo:bar',
+      expect(getCombinedKey('_test-namespace', 'foo:bar')).toBe(
+        'global%%_test-namespace%%foo:bar',
       );
     });
   });

diff --git a/lib/util/cache/package/types.ts b/lib/util/cache/package/types.ts
@@ -62,7 +62,6 @@ export type PackageCacheNamespace =
   | 'datasource-git'
   | 'datasource-gitea-releases'
   | 'datasource-gitea-tags'
-  | 'datasource-github-releases'
   | 'datasource-github-release-attachments'
   | 'datasource-gitlab-packages'
   | 'datasource-gitlab-releases'