Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Foxx complaining about valid manifest.json $schema value (#7303) 

* Fix manifest $schema schema

* Remove unused argument

* Add to CHANGELOG
This commit is contained in:
Alan Plum 2018-11-20 14:21:40 +01:00 committed by Michael Hackstein
parent c36c8c48ee
commit 787ed85e6a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
devel devel
----- -----
* fixed Foxx complaining about valid `$schema` value in manifest.json
* Foxx `req.makeAbsolute` now will return meaningful values when ArangoDB is using * Foxx `req.makeAbsolute` now will return meaningful values when ArangoDB is using
a unix socket endpoint. URLs generated when using a unix socket follow the format a unix socket endpoint. URLs generated when using a unix socket follow the format
http://unix:<socket-path>:<url-path> used by other JS tooling. http://unix:<socket-path>:<url-path> used by other JS tooling.

6
js/server/modules/@arangodb/foxx/manifest.js
View File

@ -40,7 +40,7 @@ configTypes.int = configTypes.integer;
configTypes.bool = configTypes.boolean; configTypes.bool = configTypes.boolean;
const manifestSchema = { const manifestSchema = {
$schema: joi.forbidden().allow(CANONICAL_SCHEMA).default(CANONICAL_SCHEMA), $schema: joi.only(CANONICAL_SCHEMA).default(CANONICAL_SCHEMA),
// FoxxStore metadata // FoxxStore metadata
name: joi.string().regex(/^[-_a-z][-_a-z0-9]*$/i).optional(), name: joi.string().regex(/^[-_a-z][-_a-z0-9]*$/i).optional(),
version: joi.string().optional(), version: joi.string().optional(),
@ -160,7 +160,7 @@ const manifestSchema = {
) )
}; };
function checkManifest (filename, inputManifest, mount, complainAboutVersionMismatches) { function checkManifest (inputManifest, mount, complainAboutVersionMismatches) {
const serverVersion = arangodb.plainServerVersion(); const serverVersion = arangodb.plainServerVersion();
const errors = []; const errors = [];
const manifest = {}; const manifest = {};
@ -380,7 +380,7 @@ function validateManifestFile (filename, mount, complainAboutVersionMismatches)
); );
} }
try { try {
mf = checkManifest(filename, mf, mount, complainAboutVersionMismatches); mf = checkManifest(mf, mount, complainAboutVersionMismatches);
} catch (e) { } catch (e) {
throw Object.assign( throw Object.assign(
new ArangoError({ new ArangoError({