From 323a69cc17ae2c68e3ddf64d41666fb018271bf6 Mon Sep 17 00:00:00 2001 From: Alexander Chan Date: Tue, 8 May 2018 15:27:48 -0700 Subject: [PATCH] ft: ZENKO-319 adds sproxyd location type management --- lib/management/configuration.js | 15 +++++++++++++++ tests/unit/management/configuration.js | 25 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/lib/management/configuration.js b/lib/management/configuration.js index f6b41ed23d..85e0b04b81 100644 --- a/lib/management/configuration.js +++ b/lib/management/configuration.js @@ -159,6 +159,21 @@ function patchConfiguration(newConf, log, cb) { }; } break; + case 'location-scality-sproxyd-v1': + location.type = 'scality'; + if (l.details && l.details.bootstrapList && + l.details.proxyPath) { + location.details = { + connector: { + sproxyd: { + chordCos: l.details.chordCos || null, + bootstrap: l.details.bootstrapList, + path: l.details.proxyPath, + }, + }, + }; + } + break; default: log.info('unknown location type', { locationType: l.locationType }); diff --git a/tests/unit/management/configuration.js b/tests/unit/management/configuration.js index 6a40ed737e..ccba7b88e4 100644 --- a/tests/unit/management/configuration.js +++ b/tests/unit/management/configuration.js @@ -129,6 +129,15 @@ describe('patchConfiguration', () => { bucketName: 'gcpbucketname', }, }, + 'sproxydbackendtest': { + name: 'sproxydbackendtest', + locationType: 'location-scality-sproxyd-v1', + details: { + chordCos: 3, + bootstrapList: ['localhost:8001', 'localhost:8002'], + proxyPath: '/proxy/path', + }, + }, }, browserAccess: { enabled: true, @@ -198,6 +207,22 @@ describe('patchConfiguration', () => { legacyAwsBehavior: false, type: 'gcp', }, + 'sproxydbackendtest': { + details: { + connector: { + sproxyd: { + chordCos: 3, + bootstrap: [ + 'localhost:8001', + 'localhost:8002', + ], + path: '/proxy/path', + }, + }, + }, + legacyAwsBehavior: false, + type: 'scality', + }, }, }; assertConfig(actualConf, expectedConf);