From 04fd4de9123d68f3f6d71df0b2a42d334ea832ae Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Tue, 10 Aug 2021 18:48:10 +0200
Subject: [PATCH] test: fix macos terraform tests (#11204)
---
lib/manager/terraform/lockfile/hash.spec.ts | 6 ++----
lib/manager/terraform/lockfile/hash.ts | 9 ++-------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/lib/manager/terraform/lockfile/hash.spec.ts b/lib/manager/terraform/lockfile/hash.spec.ts
index a7ef4e7360..cae12b4be4 100644
--- a/lib/manager/terraform/lockfile/hash.spec.ts
+++ b/lib/manager/terraform/lockfile/hash.spec.ts
@@ -20,14 +20,12 @@ const log = logger.logger as jest.Mocked<Logger>;
describe(getName(), () => {
let cacheDir: DirectoryResult;
- beforeAll(async () => {
+ beforeEach(async () => {
cacheDir = await dir({ unsafeCleanup: true });
setAdminConfig({ cacheDir: cacheDir.path });
});
- beforeEach(() => jest.resetAllMocks());
-
- afterAll(() => cacheDir.cleanup());
+ afterEach(() => cacheDir.cleanup());
it('returns null if getBuilds returns null', async () => {
httpMock
diff --git a/lib/manager/terraform/lockfile/hash.ts b/lib/manager/terraform/lockfile/hash.ts
index fe39aaedaf..4862d444da 100644
--- a/lib/manager/terraform/lockfile/hash.ts
+++ b/lib/manager/terraform/lockfile/hash.ts
@@ -27,9 +27,7 @@ export class TerraformProviderHash {
// a sha256sum displayed as lowercase hex string to root hash
const fileBuffer = await fs.readFile(file);
hash.update(fileBuffer);
- hash.end();
- const data = hash.read();
- rootHash.update(data.toString('hex'));
+ rootHash.update(hash.digest('hex'));
// add double space, the filename and a new line char
rootHash.update(' ');
@@ -38,10 +36,7 @@ export class TerraformProviderHash {
rootHash.update('\n');
}
- rootHash.end();
- const rootData = rootHash.read();
- const result: string = rootData.toString('base64');
- return result;
+ return rootHash.digest('base64');
}
static async hashOfZipContent(
--
GitLab