refactor(gitlab-tags): Use single cache namespace (#31038)

renovatebot · Aug 27, 2024 · 308ccdc · 308ccdc
1 parent c89e14c
commit 308ccdc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/modules/datasource/gitlab-tags/index.ts b/lib/modules/datasource/gitlab-tags/index.ts
@@ -29,7 +29,7 @@ export class GitlabTagsDatasource extends Datasource {
   @cache({
     namespace: `datasource-${GitlabTagsDatasource.id}`,
     key: ({ registryUrl, packageName }: GetReleasesConfig) =>
-      `${getDepHost(registryUrl)}:${packageName}`,
+      `getReleases:${getDepHost(registryUrl)}:${packageName}`,
   })
   async getReleases({
     registryUrl,
@@ -72,17 +72,17 @@ export class GitlabTagsDatasource extends Datasource {
    * Returs the latest commit hash of the repository.
    */
   @cache({
-    namespace: `datasource-${GitlabTagsDatasource.id}-commit`,
-    key: ({ registryUrl, packageName }: GetReleasesConfig) =>
-      `${getDepHost(registryUrl)}:${packageName}`,
+    namespace: `datasource-${GitlabTagsDatasource.id}`,
+    key: ({ registryUrl, packageName }: DigestConfig) =>
+      `getDigest:${getDepHost(registryUrl)}:${packageName}`,
   })
   override async getDigest(
-    { packageName: repo, registryUrl }: Partial<DigestConfig>,
+    { packageName: repo, registryUrl }: DigestConfig,
     newValue?: string,
   ): Promise<string | null> {
     const depHost = getDepHost(registryUrl);
 
-    const urlEncodedRepo = encodeURIComponent(repo!);
+    const urlEncodedRepo = encodeURIComponent(repo);
     let digest: string | null = null;
 
     try {

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