Skip to content

Commit a1321f4

Browse files
author
Kerkesni
committed
fixup! support crr location in the locationConstaint config list
1 parent ce5ff7e commit a1321f4

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

lib/Config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,6 @@ function locationConstraintAssert(locationConstraints) {
385385
assert(locationConstraints[l].isCold === true);
386386
}
387387

388-
if (locationConstraints[l].type === 'crr') {
389-
assert(locationConstraints[l].isCrr === true);
390-
}
391-
392388
if (process.env.CI_CEPH === 'true') {
393389
// eslint-disable-next-line no-param-reassign
394390
locationConstraints[l].details.https = false;

locationConfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"type": "crr",
114114
"objectId": "location-crr-v1",
115115
"legacyAwsBehavior": false,
116-
"isCrr": true,
116+
"isCRR": true,
117117
"details": {}
118118
}
119119
}

tests/locationConfig/locationConfigCeph.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
"type": "crr",
269269
"objectId": "location-crr-v1",
270270
"legacyAwsBehavior": false,
271-
"isCrr": true,
271+
"isCRR": true,
272272
"details": {}
273273
}
274274
}

tests/locationConfig/locationConfigLegacy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
"type": "crr",
191191
"objectId": "location-crr-v1",
192192
"legacyAwsBehavior": false,
193-
"isCrr": true,
193+
"isCRR": true,
194194
"details": {}
195195
}
196196
}

tests/locationConfig/locationConfigTests.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
"type": "crr",
280280
"objectId": "location-crr-v1",
281281
"legacyAwsBehavior": false,
282-
"isCrr": true,
282+
"isCRR": true,
283283
"details": {}
284284
}
285285
}

tests/multipleBackend/backendHealthcheckResponse.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ describe('Healthcheck response', () => {
2222
clientCheck(true, log, (err, results) => {
2323
const resultKeys = Object.keys(results);
2424
locConstraints.forEach(constraint => {
25-
if (constraint === 'location-dmf-v1' || constraint === 'location-crr-v1') {
26-
// FIXME: location-dmf-v1 and location-crr-v1 are not in results, see CLDSRV-440
25+
if (constraint === 'location-dmf-v1') {
26+
// FIXME: location-dmf-v1 not in results, see CLDSRV-440
2727
return;
2828
}
2929
assert(resultKeys.includes(constraint), `constraint: ${constraint} not in results: ${resultKeys}`);
@@ -45,8 +45,8 @@ describe('Healthcheck response', () => {
4545
clientCheck(false, log, (err, results) => {
4646
assert.notStrictEqual(results.length, locConstraints.length);
4747
locConstraints.forEach(constraint => {
48-
if (constraint === 'location-dmf-v1' || constraint === 'location-crr-v1') {
49-
// FIXME: location-dmf-v1 and location-crr-v1 are not in results, see CLDSRV-440
48+
if (constraint === 'location-dmf-v1') {
49+
// FIXME: location-dmf-v1 not in results, see CLDSRV-440
5050
return;
5151
}
5252
if (Object.keys(results).indexOf(constraint) === -1) {

0 commit comments

Comments
 (0)