From 2e69ca135a9a17db2a6065ffe52032c68d626230 Mon Sep 17 00:00:00 2001 From: Pol Alvarez Date: Tue, 26 Jul 2022 13:39:40 +0200 Subject: [PATCH] removed v1 references --- src/api.v2/helpers/pipeline/gem2s.js | 1 - .../pipelineConstruct/constructors/createNewStep.js | 1 - tests/api.v2/controllers/qcController.test.js | 3 --- .../helpers/pipeline/__snapshots__/gem2s.test.js.snap | 1 - .../pipeline/__snapshots__/pipelineConstruct.test.js.snap | 7 ------- tests/api.v2/middlewares/authMiddlewares.test.js | 6 +++--- tests/api.v2/mocks/data/gem2sUploadToAWSPayload.json | 1 - tests/test-utils/constants.js | 2 -- 8 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/api.v2/helpers/pipeline/gem2s.js b/src/api.v2/helpers/pipeline/gem2s.js index 0a32f0f31..1bb039340 100644 --- a/src/api.v2/helpers/pipeline/gem2s.js +++ b/src/api.v2/helpers/pipeline/gem2s.js @@ -100,7 +100,6 @@ const generateGem2sParams = async (experimentId, authJWT) => { sampleIds: experiment.samplesOrder, sampleNames: _.map(samplesInOrder, 'name'), sampleS3Paths: s3Paths, - apiVersion: 'v2', authJWT, }; diff --git a/src/api.v2/helpers/pipeline/pipelineConstruct/constructors/createNewStep.js b/src/api.v2/helpers/pipeline/pipelineConstruct/constructors/createNewStep.js index 4ed744d4c..6a1185357 100644 --- a/src/api.v2/helpers/pipeline/pipelineConstruct/constructors/createNewStep.js +++ b/src/api.v2/helpers/pipeline/pipelineConstruct/constructors/createNewStep.js @@ -30,7 +30,6 @@ const getQCParams = (task, context, stepArgs) => { ...perSample ? { 'sampleUuid.$': '$.sampleUuid' } : { sampleUuid: '' }, ...uploadCountMatrix ? { uploadCountMatrix: true } : { uploadCountMatrix: false }, authJWT: context.authJWT, - apiVersion: 'v2', }; }; diff --git a/tests/api.v2/controllers/qcController.test.js b/tests/api.v2/controllers/qcController.test.js index 05c0614d7..a7e9663a9 100644 --- a/tests/api.v2/controllers/qcController.test.js +++ b/tests/api.v2/controllers/qcController.test.js @@ -24,7 +24,6 @@ const processingConfigUpdate = [{ 'f87892f0-3403-4ba9-b871-c366e3fa855e': { auto: false, enabled: true, - apiVersion: 'v2', filterSettings: { regressionType: 'linear', regressionTypeSettings: { linear: { 'p.level': 0.00095 }, spline: { 'p.level': 0.001 } } }, defaultFilterSettings: { regressionType: 'linear', regressionTypeSettings: { linear: { 'p.level': 0.001 }, spline: { 'p.level': 0.001 } } }, }, @@ -39,7 +38,6 @@ const qcResponsePayload = { taskName: 'configureEmbedding', processName: 'qc', config: { - apiVersion: 'v2', embeddingSettings: { method: 'umap', @@ -53,7 +51,6 @@ const qcResponsePayload = { sampleUuid: '', uploadCountMatrix: false, authJWT: 'Bearer someLongAndConfusingString', - apiVersion: 'v2', }, output: { bucket: 'worker-results-development', key: 'de2f3434-dc63-4007-907b-28d3e72b140d' }, response: { error: false }, diff --git a/tests/api.v2/helpers/pipeline/__snapshots__/gem2s.test.js.snap b/tests/api.v2/helpers/pipeline/__snapshots__/gem2s.test.js.snap index c16f96f35..66aef09e7 100644 --- a/tests/api.v2/helpers/pipeline/__snapshots__/gem2s.test.js.snap +++ b/tests/api.v2/helpers/pipeline/__snapshots__/gem2s.test.js.snap @@ -18,7 +18,6 @@ exports[`createGem2sPipeline works correctly 2`] = ` Array [ "mockExperimentId", Object { - "apiVersion": "v2", "authJWT": "mockAuthJWT", "experimentName": "asdsadsada", "input": Object { diff --git a/tests/api.v2/helpers/pipeline/__snapshots__/pipelineConstruct.test.js.snap b/tests/api.v2/helpers/pipeline/__snapshots__/pipelineConstruct.test.js.snap index 2bba65669..110e436b2 100644 --- a/tests/api.v2/helpers/pipeline/__snapshots__/pipelineConstruct.test.js.snap +++ b/tests/api.v2/helpers/pipeline/__snapshots__/pipelineConstruct.test.js.snap @@ -233,7 +233,6 @@ Array [ "End": true, "HeartbeatSeconds": 90, "Parameters": Object { - "apiVersion": "v2", "config": Object {}, "experimentId": "testExperimentId", "processName": "qc", @@ -262,7 +261,6 @@ Array [ "End": true, "HeartbeatSeconds": 90, "Parameters": Object { - "apiVersion": "v2", "config": Object {}, "experimentId": "testExperimentId", "processName": "qc", @@ -286,7 +284,6 @@ Array [ "HeartbeatSeconds": 90, "Next": "EndOfPipeline", "Parameters": Object { - "apiVersion": "v2", "config": Object {}, "experimentId": "testExperimentId", "processName": "qc", @@ -304,7 +301,6 @@ Array [ "HeartbeatSeconds": 90, "Next": "ConfigureEmbedding", "Parameters": Object { - "apiVersion": "v2", "config": Object {}, "experimentId": "testExperimentId", "processName": "qc", @@ -327,7 +323,6 @@ Array [ "End": true, "HeartbeatSeconds": 90, "Parameters": Object { - "apiVersion": "v2", "config": Object { "oneSample": Object { "defaultFilterSettings": Object { @@ -376,7 +371,6 @@ Array [ "End": true, "HeartbeatSeconds": 90, "Parameters": Object { - "apiVersion": "v2", "config": Object {}, "experimentId": "testExperimentId", "processName": "qc", @@ -405,7 +399,6 @@ Array [ "End": true, "HeartbeatSeconds": 90, "Parameters": Object { - "apiVersion": "v2", "config": Object {}, "experimentId": "testExperimentId", "processName": "qc", diff --git a/tests/api.v2/middlewares/authMiddlewares.test.js b/tests/api.v2/middlewares/authMiddlewares.test.js index 43fd4e539..e612a71e9 100644 --- a/tests/api.v2/middlewares/authMiddlewares.test.js +++ b/tests/api.v2/middlewares/authMiddlewares.test.js @@ -91,7 +91,7 @@ describe('Tests for authorization/authentication middlewares', () => { const req = { params: { experimentId: fake.EXPERIMENT_ID }, - url: fake.RESOURCE_V1, + url: fake.RESOURCE_V2, method: 'POST', }; const next = jest.fn(); @@ -105,7 +105,7 @@ describe('Tests for authorization/authentication middlewares', () => { const req = { params: { experimentId: fake.EXPERIMENT_ID }, - url: fake.RESOURCE_V1, + url: fake.RESOURCE_V2, user: { sub: 'allowed-user-id', }, @@ -147,7 +147,7 @@ describe('Tests for authorization/authentication middlewares', () => { it('Express middleware can reject unauthenticated requests', async () => { const req = { params: { experimentId: fake.EXPERIMENT_ID }, - url: fake.RESOURCE_V1, + url: fake.RESOURCE_V2, method: 'POST', }; const next = jest.fn(); diff --git a/tests/api.v2/mocks/data/gem2sUploadToAWSPayload.json b/tests/api.v2/mocks/data/gem2sUploadToAWSPayload.json index c31ea26a7..a9b701da9 100644 --- a/tests/api.v2/mocks/data/gem2sUploadToAWSPayload.json +++ b/tests/api.v2/mocks/data/gem2sUploadToAWSPayload.json @@ -222,7 +222,6 @@ "features10x": "2451aae8-2aa2-4611-a280-247c767968f2" } }, - "apiVersion": "v2", "authJWT": "Bearer someHugeHash" } } \ No newline at end of file diff --git a/tests/test-utils/constants.js b/tests/test-utils/constants.js index 0eecd3cd4..2ff2bdb38 100644 --- a/tests/test-utils/constants.js +++ b/tests/test-utils/constants.js @@ -60,9 +60,7 @@ const USER = { // Try to use realistic values but DO NOT USE real ones. module.exports = Object.freeze({ SOCKET_ENDPOINT: 'localhost:5000', - URL_V1: 'localhost:5000/v1/experiments', URL_V2: 'localhost:5000/v2/experiments', - RESOURCE_V1: '/v1/experiments', RESOURCE_V2: '/v2/experiments', EXPERIMENT_ID: 'experimentid11111111111111111111', S3_BUCKET: 'worker-results-test',