refactor(terraform-provider): Use single cache namespace (#31054)

renovatebot · Aug 28, 2024 · bedddd1 · bedddd1
1 parent 523d80e
commit bedddd1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/lib/modules/datasource/terraform-provider/index.ts b/lib/modules/datasource/terraform-provider/index.ts
@@ -51,10 +51,11 @@ export class TerraformProviderDatasource extends TerraformDatasource {
 
   @cache({
     namespace: `datasource-${TerraformProviderDatasource.id}`,
-    key: (getReleasesConfig: GetReleasesConfig) =>
-      `${
-        getReleasesConfig.registryUrl
-      }/${TerraformProviderDatasource.getRepository(getReleasesConfig)}`,
+    key: (getReleasesConfig: GetReleasesConfig) => {
+      const url = getReleasesConfig.registryUrl;
+      const repo = TerraformProviderDatasource.getRepository(getReleasesConfig);
+      return `getReleases:${url}/${repo}`;
+    },
   })
   async getReleases({
     packageName,
@@ -186,9 +187,9 @@ export class TerraformProviderDatasource extends TerraformDatasource {
   }
 
   @cache({
-    namespace: `datasource-${TerraformProviderDatasource.id}-builds`,
+    namespace: `datasource-${TerraformProviderDatasource.id}`,
     key: (registryURL: string, repository: string, version: string) =>
-      `${registryURL}/${repository}/${version}`,
+      `getBuilds:${registryURL}/${repository}/${version}`,
   })
   async getBuilds(
     registryURL: string,
@@ -288,8 +289,8 @@ export class TerraformProviderDatasource extends TerraformDatasource {
   }
 
   @cache({
-    namespace: `datasource-${TerraformProviderDatasource.id}-zip-hashes`,
-    key: (zipHashUrl: string) => zipHashUrl,
+    namespace: `datasource-${TerraformProviderDatasource.id}`,
+    key: (zipHashUrl: string) => `getZipHashes:${zipHashUrl}`,
   })
   async getZipHashes(zipHashUrl: string): Promise<string[] | undefined> {
     // The hashes are formatted as the result of sha256sum in plain text, each line: <hash>\t<filename>
@@ -315,9 +316,9 @@ export class TerraformProviderDatasource extends TerraformDatasource {
   }
 
   @cache({
-    namespace: `datasource-${TerraformProviderDatasource.id}-releaseBackendIndex`,
+    namespace: `datasource-${TerraformProviderDatasource.id}`,
     key: (backendLookUpName: string, version: string) =>
-      `${backendLookUpName}/${version}`,
+      `getReleaseBackendIndex:${backendLookUpName}/${version}`,
   })
   async getReleaseBackendIndex(
     backendLookUpName: string,

diff --git a/lib/modules/manager/terraform/lockfile/hash.ts b/lib/modules/manager/terraform/lockfile/hash.ts
@@ -107,8 +107,8 @@ export class TerraformProviderHash {
   }
 
   @cache({
-    namespace: `datasource-terraform-provider-hash`,
-    key: (build: TerraformBuild) => build.url,
+    namespace: `terraform-provider-hash`,
+    key: (build: TerraformBuild) => `calculateSingleHash:${build.url}`,
     ttlMinutes: TerraformProviderHash.hashCacheTTL,
   })
   static async calculateSingleHash(

diff --git a/lib/util/cache/package/types.ts b/lib/util/cache/package/types.ts
@@ -90,17 +90,14 @@ export type PackageCacheNamespace =
   | 'datasource-ruby-version'
   | 'datasource-rubygems'
   | 'datasource-terraform-module'
-  | 'datasource-terraform-provider-hash'
-  | 'datasource-terraform-provider-builds'
-  | 'datasource-terraform-provider-releaseBackendIndex'
-  | 'datasource-terraform-provider-zip-hashes'
   | 'datasource-terraform-provider'
   | 'datasource-terraform'
   | 'datasource-unity3d'
   | 'github-releases-datasource-v2'
   | 'github-tags-datasource-v2'
   | 'merge-confidence'
   | 'preset'
+  | 'terraform-provider-hash'
   | 'url-sha256';
 
 export type CombinedKey = `global%%${PackageCacheNamespace}%%${string}`;