Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä 2020-05-14 09:45:28 +03:00
commit 62052edbc9
No known key found for this signature in database
GPG Key ID: 5CE746D557ACC499
2 changed files with 23 additions and 16 deletions

View File

@ -12,27 +12,27 @@
*/
require('./common.js')()
// Converts an array of key=value pairs into an object
// Converts a key=value string into an object
function to_obj(obj, value) {
var kv = value.split('=')
obj[kv[0]] = kv[1]
return obj
var pos = value.indexOf("=");
obj[value.slice(0, pos)] = value.slice(pos + 1);
return obj;
}
function validateParams(argv, params) {
var rval = null;
params.forEach((value) => {
try {
var kv = value.split('=')
if (!kv || kv.length != 2) {
rval = 'Not a key-value parameter: ' + value
}
} catch (err) {
rval = 'Not a key-value parameter: ' + value
}
})
var rval = null;
params.forEach((value) => {
try {
var pos = value.indexOf("=");
if (pos == -1) {
rval = "Not a key-value parameter: " + value;
}
} catch (err) {
rval = "Not a key-value parameter: " + value;
}
});
return rval
return rval;
}
exports.command = 'create <command>'

View File

@ -278,5 +278,12 @@ describe("Create/Destroy Commands", function() {
.should.be.rejected
})
it('create filter with equals sign in parameters', function() {
return verifyCommand('create filter test-filter regexfilter match=/this=is=a=test/ replace=test-passed',
'filters/test-filter')
.then(() => doCommand('destroy filter test-filter'))
.should.be.fulfilled
})
after(stopMaxScale)
});