From 0027d274739c7e5500f6dbae66ccc0f93bae345f Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Tue, 9 Jun 2020 10:01:20 +0100 Subject: [PATCH 1/3] Use latest version of gcs server for tests --- services/filestore/test/acceptance/deps/Dockerfile.fake-gcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/filestore/test/acceptance/deps/Dockerfile.fake-gcs b/services/filestore/test/acceptance/deps/Dockerfile.fake-gcs index 4bbd1153ad..0e6de7e735 100644 --- a/services/filestore/test/acceptance/deps/Dockerfile.fake-gcs +++ b/services/filestore/test/acceptance/deps/Dockerfile.fake-gcs @@ -1,4 +1,4 @@ -FROM fsouza/fake-gcs-server:1.18.4 +FROM fsouza/fake-gcs-server:latest RUN apk add --update --no-cache curl COPY healthcheck.sh /healthcheck.sh HEALTHCHECK --interval=1s --timeout=1s --retries=30 CMD /healthcheck.sh http://localhost:9090 From 5d9f78322d2fc827be5ce1b4a46f2cffa16cba00 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Tue, 9 Jun 2020 10:01:47 +0100 Subject: [PATCH 2/3] Don't increment range end when passing to GCS backend --- services/filestore/app/js/GcsPersistor.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/filestore/app/js/GcsPersistor.js b/services/filestore/app/js/GcsPersistor.js index c3bf81f45d..05425abee5 100644 --- a/services/filestore/app/js/GcsPersistor.js +++ b/services/filestore/app/js/GcsPersistor.js @@ -115,10 +115,6 @@ async function sendStream(bucketName, key, readStream, sourceMd5) { async function getFileStream(bucketName, key, _opts = {}) { const opts = Object.assign({}, _opts) - if (opts.end) { - // S3 (and http range headers) treat 'end' as inclusive, so increase this by 1 - opts.end++ - } const stream = storage .bucket(bucketName) .file(key) From 7b6299e05a60365a24727e0bc37098118babb153 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Tue, 9 Jun 2020 13:55:03 +0100 Subject: [PATCH 3/3] Update GcsPersistor range unit test --- services/filestore/test/unit/js/GcsPersistorTests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/filestore/test/unit/js/GcsPersistorTests.js b/services/filestore/test/unit/js/GcsPersistorTests.js index 07d132fcde..68db78d8a8 100644 --- a/services/filestore/test/unit/js/GcsPersistorTests.js +++ b/services/filestore/test/unit/js/GcsPersistorTests.js @@ -196,7 +196,7 @@ describe('GcsPersistorTests', function() { it('passes the byte range on to GCS', function() { expect(GcsFile.createReadStream).to.have.been.calledWith({ start: 5, - end: 11 // we increment the end because Google's 'end' is exclusive + end: 10 }) }) })