From 21d2aeb72063db8f75eb00b6643c50e8f779e7aa Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Thu, 24 Jun 2021 14:53:45 +0400
Subject: [PATCH] refactor(terraform): Use util function for cache dir creation
(#10588)
---
lib/manager/terraform/lockfile/hash.ts | 5 +++--
lib/manager/terraform/lockfile/util.ts | 12 +-----------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/lib/manager/terraform/lockfile/hash.ts b/lib/manager/terraform/lockfile/hash.ts
index 7bb24a491c..71e4101163 100644
--- a/lib/manager/terraform/lockfile/hash.ts
+++ b/lib/manager/terraform/lockfile/hash.ts
@@ -10,8 +10,9 @@ import type {
import { logger } from '../../../logger';
import * as packageCache from '../../../util/cache/package';
import * as fs from '../../../util/fs';
+import { ensureCacheDir } from '../../../util/fs';
import { Http } from '../../../util/http';
-import { getCacheDir, repositoryRegex } from './util';
+import { repositoryRegex } from './util';
const http = new Http(TerraformProviderDatasource.id);
const hashCacheTTL = 10080; // in seconds == 1 week
@@ -75,7 +76,7 @@ async function getReleaseBackendIndex(
export async function calculateHashes(
builds: TerraformBuild[]
): Promise<string[]> {
- const cacheDir = await getCacheDir();
+ const cacheDir = await ensureCacheDir('./others/terraform');
// for each build download ZIP, extract content and generate hash for all containing files
const hashes = await pMap(
diff --git a/lib/manager/terraform/lockfile/util.ts b/lib/manager/terraform/lockfile/util.ts
index ae2bfcbcbd..4cb5443998 100644
--- a/lib/manager/terraform/lockfile/util.ts
+++ b/lib/manager/terraform/lockfile/util.ts
@@ -1,7 +1,4 @@
-import { join } from 'upath';
-import { getAdminConfig } from '../../../config/admin';
-import { logger } from '../../../logger';
-import { ensureDir, getSiblingFileName, readLocalFile } from '../../../util/fs';
+import { getSiblingFileName, readLocalFile } from '../../../util/fs';
import { get as getVersioning } from '../../../versioning';
import type { UpdateArtifactsResult } from '../../types';
import type {
@@ -210,10 +207,3 @@ export function writeLockUpdates(
},
};
}
-
-export async function getCacheDir(): Promise<string> {
- const cacheDir = join(getAdminConfig().cacheDir, './others/terraform');
- await ensureDir(cacheDir);
- logger.debug(`Using terraform cache: ${cacheDir}`);
- return cacheDir;
-}
--
GitLab