From ddcef9cfdfa52650b476721b5f62881bfb97ad9c Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Tue, 27 Aug 2024 00:32:15 -0300
Subject: [PATCH] refactor(github): Use single cache namespace for release
attachments (#31037)
---
lib/modules/datasource/github-release-attachments/index.ts | 6 +++---
lib/util/cache/package/key.spec.ts | 4 ++--
lib/util/cache/package/types.ts | 1 -
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/modules/datasource/github-release-attachments/index.ts b/lib/modules/datasource/github-release-attachments/index.ts
index 7baec70eea..14caabb969 100644
--- 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
index 9925dd56ef..72f7359bd7 100644
--- 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
index faff79c6e6..b7580902f6 100644
--- 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'
--
GitLab