diff --git a/src/backuptask.js b/src/backuptask.js index eb3c4a021..e7667fb1f 100644 --- a/src/backuptask.js +++ b/src/backuptask.js @@ -79,7 +79,7 @@ async function uploadBackupInfo(backupSite, remotePath, integrityMap) { const integrityDataStream = Readable.from(integrityDataJsonString); // unencrypted for easy verification without having to decrypt anything const integrityUploader = await backupSites.storageApi(backupSite).upload(backupSite.config, backupSite.limits, `${remotePath}.backupinfo`); - await stream.pipeline(integrityDataStream, integrityUploader.stream); + await stream.pipeline(integrityDataStream, integrityUploader.createStream()); await integrityUploader.finish(); const signatureBuffer = await crypto.sign(null /* algorithm */, integrityDataJsonString, backupSite.integrityKeyPair.privateKey); diff --git a/src/test/storage-provider-test.js b/src/test/storage-provider-test.js index 92f306c16..2dadcf610 100644 --- a/src/test/storage-provider-test.js +++ b/src/test/storage-provider-test.js @@ -66,7 +66,7 @@ describe('Storage', function () { const sourceStream = fs.createReadStream(sourceFile); const destFile = path.join(gBackupConfig.backupDir, gBackupConfig.prefix, '/uploadtest/test.txt'); const uploader = await filesystem.upload(gBackupConfig, {}, 'uploadtest/test.txt'); - await stream.pipeline(sourceStream, uploader.stream); + await stream.pipeline(sourceStream, uploader.createStream()); await uploader.finish(); expect(fs.existsSync(destFile)); expect(fs.statSync(sourceFile).size).to.be(fs.statSync(destFile).size); @@ -77,7 +77,7 @@ describe('Storage', function () { const sourceStream = fs.createReadStream(sourceFile); const destFile = path.join(gBackupConfig.backupDir, gBackupConfig.prefix, '/uploadtest/empty'); const uploader = await filesystem.upload(gBackupConfig, {}, destFile); - await stream.pipeline(sourceStream, uploader.stream); + await stream.pipeline(sourceStream, uploader.createStream()); await uploader.finish(); expect(fs.existsSync(destFile)); expect(fs.statSync(sourceFile).size).to.be(fs.statSync(destFile).size); @@ -89,7 +89,7 @@ describe('Storage', function () { const destFile = path.join(gBackupConfig.backupDir, gBackupConfig.prefix, '/uploadtest/test.txt'); const oldStat = fs.statSync(destFile); const uploader = await filesystem.upload(gBackupConfig, {}, 'uploadtest/test.txt'); - await stream.pipeline(sourceStream, uploader.stream); + await stream.pipeline(sourceStream, uploader.createStream()); await uploader.finish(); expect(fs.existsSync(destFile)).to.be(true); expect(fs.statSync(sourceFile).size).to.be(fs.statSync(destFile).size); @@ -246,7 +246,7 @@ describe('Storage', function () { const sourceStream = fs.createReadStream(sourceFile); const destKey = 'uploadtest/test.txt'; const uploader = await s3.upload(backupConfig, {}, destKey); - await stream.pipeline(sourceStream, uploader.stream); + await stream.pipeline(sourceStream, uploader.createStream()); await uploader.finish(); expect(fs.existsSync(path.join(bucketPath, destKey))).to.be(true); expect(fs.statSync(path.join(bucketPath, destKey)).size).to.be(fs.statSync(sourceFile).size); @@ -383,7 +383,7 @@ describe('Storage', function () { const sourceStream = fs.createReadStream(sourceFile); const destKey = 'uploadtest/test.txt'; const uploader = await gcs.upload(backupConfig, {}, destKey); - await stream.pipeline(sourceStream, uploader.stream); + await stream.pipeline(sourceStream, uploader.createStream()); await uploader.finish(); expect(fs.existsSync(path.join(bucketPath, destKey))).to.be(true); expect(fs.statSync(path.join(bucketPath, destKey)).size).to.be(fs.statSync(sourceFile).size);