From 5279a33e3ff48bfab810aa6a1234bdf6232d1ac9 Mon Sep 17 00:00:00 2001 From: John Watson Date: Fri, 9 Jun 2023 11:51:16 +0100 Subject: [PATCH 1/4] Fix stream --- package.json | 2 +- .../narrow/app/storage/get-container.test.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 1d69819..9458e7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ffc-pay-file-receiver", - "version": "1.0.6", + "version": "1.0.7", "description": "Transfer files from DAX", "homepage": "https://github.com/DEFRA/ffc-pay-file-receiver", "main": "app/index.js", diff --git a/test/integration/narrow/app/storage/get-container.test.js b/test/integration/narrow/app/storage/get-container.test.js index 1349ea6..864c8d4 100755 --- a/test/integration/narrow/app/storage/get-container.test.js +++ b/test/integration/narrow/app/storage/get-container.test.js @@ -14,12 +14,12 @@ jest.mock('../../../../../app/config/get-storage-config') const getStorageConfig = require('../../../../../app/config/get-storage-config') const { getContainer } = require('../../../../../app/storage/get-container') -let retreivedGetStorageConfig +let retrievedGetStorageConfig describe('get container object', () => { beforeEach(() => { - retreivedGetStorageConfig = JSON.parse(JSON.stringify(require('../../../../mocks/storage-config'))) - getStorageConfig.mockResolvedValue(retreivedGetStorageConfig) + retrievedGetStorageConfig = JSON.parse(JSON.stringify(require('../../../../mocks/storage-config'))) + getStorageConfig.mockResolvedValue(retrievedGetStorageConfig) }) afterEach(() => { @@ -27,8 +27,8 @@ describe('get container object', () => { }) test('should call getStorageConfig', async () => { - retreivedGetStorageConfig.useBlobConnectionStr = true - getStorageConfig.mockResolvedValue(retreivedGetStorageConfig) + retrievedGetStorageConfig.useBlobConnectionStr = true + getStorageConfig.mockResolvedValue(retrievedGetStorageConfig) await getContainer() expect(getStorageConfig).toHaveBeenCalled() }) From 7a7e3db102409ab419a4f93f9e3b79298af39e4b Mon Sep 17 00:00:00 2001 From: John Watson Date: Fri, 9 Jun 2023 12:12:25 +0100 Subject: [PATCH 2/4] FIx --- app/processing/get-file.js | 4 ++-- app/processing/transfer-file.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/processing/get-file.js b/app/processing/get-file.js index dccff83..cf61d19 100755 --- a/app/processing/get-file.js +++ b/app/processing/get-file.js @@ -10,9 +10,9 @@ const download = async (fileName, directoryName, shareName) => { const share = shareServiceClient.getShareClient(shareName) const directory = share.getDirectoryClient(directoryName) const file = directory.getFileClient(fileName) - const downloaded = await file.download() + const downloaded = await file.downloadToBuffer() console.log(`Found ${fileName}`) - return downloaded.readableStreamBody + return downloaded.toString() } module.exports = getFile diff --git a/app/processing/transfer-file.js b/app/processing/transfer-file.js index 36b294e..9ccba55 100644 --- a/app/processing/transfer-file.js +++ b/app/processing/transfer-file.js @@ -3,8 +3,8 @@ const getFile = require('./get-file') const writeFile = require('./write-file') const transferFile = async (fileName, directoryName, shareName) => { - const file = await getFile(fileName, directoryName, shareName) - await writeFile(fileName, file) + const fileContent = await getFile(fileName, directoryName, shareName) + await writeFile(fileName, fileContent) await deleteFile(fileName, directoryName, shareName) console.log(`Successfully transferred ${fileName}`) } From 62d6ca96597bdf51967ad98ced8c18df55deb620 Mon Sep 17 00:00:00 2001 From: John Watson Date: Fri, 9 Jun 2023 12:18:10 +0100 Subject: [PATCH 3/4] Audit fix --- package-lock.json | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9808db0..988d5f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ffc-pay-file-receiver", - "version": "1.0.4", + "version": "1.0.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ffc-pay-file-receiver", - "version": "1.0.4", + "version": "1.0.7", "license": "OGL-UK-3.0", "dependencies": { "@azure/identity": "2.0.5", @@ -3793,18 +3793,24 @@ "dev": true }, "node_modules/fast-xml-parser": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.1.2.tgz", - "integrity": "sha512-CDYeykkle1LiA/uqQyNwYpFbyF6Axec6YapmpUP+/RHWIoR1zKjocdvNaTsxCxZzQ6v9MLXaSYm9Qq0thv0DHg==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.4.tgz", + "integrity": "sha512-fbfMDvgBNIdDJLdLOwacjFAPYt67tr31H9ZhWSm45CDAxvd0I6WTlSOUo7K2P/K5sA5JgMKG64PI3DMcaFdWpQ==", + "funding": [ + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + }, + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], "dependencies": { "strnum": "^1.0.5" }, "bin": { "fxparser": "src/cli/cli.js" - }, - "funding": { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" } }, "node_modules/fastq": { From 6746b673a1747af175521bf0f399c97d816ff894 Mon Sep 17 00:00:00 2001 From: John Watson Date: Fri, 9 Jun 2023 12:36:20 +0100 Subject: [PATCH 4/4] Audit fix --- test/unit/processing/get-file.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/processing/get-file.test.js b/test/unit/processing/get-file.test.js index e89086c..9c2997f 100644 --- a/test/unit/processing/get-file.test.js +++ b/test/unit/processing/get-file.test.js @@ -5,7 +5,7 @@ const mockStorageConfig = require('../../mocks/storage-config') const mockDelete = jest.fn() const mockGetFileClient = { - download: jest.fn().mockResolvedValue({ readableStreamBody: mockFileContent }), + downloadToBuffer: jest.fn().mockResolvedValue(mockFileContent), delete: mockDelete } const mockGetDirectoryClient = {