Update usage reference of validator with parser

LiskHQ · Apr 9, 2019 · 261a6ed · 261a6ed
1 parent 3108d9b
commit 261a6ed
Show file tree

Hide file tree

Showing 11 changed files with 298 additions and 338 deletions.
diff --git a/framework/src/components/cache/index.js b/framework/src/components/cache/index.js
@@ -36,7 +36,7 @@ const { config: defaultConfig } = require('./defaults');
 const validator = require('../../controller/helpers/validator');
 
 function createCacheComponent(options, logger) {
-	const optionsWithDefaults = validator.validateWithDefaults(
+	const optionsWithDefaults = validator.parseEnvArgAndValidate(
 		defaultConfig,
 		options
 	);

diff --git a/framework/src/components/logger/index.js b/framework/src/components/logger/index.js
@@ -19,7 +19,7 @@ const { config: defaultConfig } = require('./defaults');
 const validator = require('../../controller/helpers/validator');
 
 function createLoggerComponent(options = {}) {
-	const optionsWithDefaults = validator.validateWithDefaults(
+	const optionsWithDefaults = validator.parseEnvArgAndValidate(
 		defaultConfig,
 		options
 	);

diff --git a/framework/src/components/storage/index.js b/framework/src/components/storage/index.js
@@ -34,7 +34,7 @@ if (process.env.NEW_RELIC_LICENSE_KEY) {
 }
 
 function createStorageComponent(options, logger) {
-	options = validator.validateWithDefaults(defaultConfig, options);
+	options = validator.parseEnvArgAndValidate(defaultConfig, options);
 
 	const storage = new Storage(options, logger);
 

diff --git a/framework/src/controller/application.js b/framework/src/controller/application.js
@@ -122,7 +122,7 @@ class Application {
 		validator.loadSchema(constantsSchema);
 		validator.validate(applicationSchema.appLabel, appLabel);
 		validator.validate(applicationSchema.config, appConfig);
-		constants = validator.validateWithDefaults(
+		constants = validator.parseEnvArgAndValidate(
 			constantsSchema.constants,
 			constants
 		);
@@ -332,7 +332,7 @@ class Application {
 
 		Object.keys(modules).forEach(alias => {
 			this.logger.info(`Validating module options with alias: ${alias}`);
-			this.config.modules[alias] = validator.validateWithDefaults(
+			this.config.modules[alias] = validator.parseEnvArgAndValidate(
 				modules[alias].defaults,
 				this.config.modules[alias]
 			);

diff --git a/framework/src/modules/chain/workers_controller.js b/framework/src/modules/chain/workers_controller.js
@@ -38,7 +38,7 @@ const {
 const validator = require('../../controller/helpers/validator');
 const schema = require('./defaults/config');
 
-const config = validator.validateWithDefaults(schema, {});
+const config = validator.parseEnvArgAndValidate(schema, {});
 
 /**
  * Instantiate the SocketCluster SCWorker instance with custom logic

diff --git a/framework/test/jest/specs/unit/controller/application.spec.js b/framework/test/jest/specs/unit/controller/application.spec.js
@@ -96,7 +96,7 @@ describe('Application', () => {
 				params.label
 			);
 
-			expect(validator.validateWithDefaults).toHaveBeenCalledWith(
+			expect(validator.parseEnvArgAndValidate).toHaveBeenCalledWith(
 				constantsSchema.constants,
 				params.constants
 			);

diff --git a/framework/test/jest/specs/unit/controller/helpers/validator/validator.spec.js b/framework/test/jest/specs/unit/controller/helpers/validator/validator.spec.js
@@ -145,7 +145,9 @@ describe('helpers/validator.js', () => {
 				.mockImplementation(() => false);
 
 			// Act & Assert
-			expect(parseEnvArgAndValidate).toThrow(SchemaValidationError);
+			expect(() => {
+				parseEnvArgAndValidate({});
+			}).toThrow(SchemaValidationError);
 		});
 	});
 });
diff --git a/framework/test/jest/specs/unit/controller/schema/__snapshots__/config.spec.js.snap b/framework/test/jest/specs/unit/controller/schema/__snapshots__/config.spec.js.snap
@@ -27,6 +27,9 @@ Object {
   },
   "config": Object {
     "additionalProperties": false,
+    "default": Object {
+      "ipc": false,
+    },
     "id": "config",
     "properties": Object {
       "components": Object {
@@ -67,7 +70,6 @@ Object {
         "additionalProperties": false,
         "properties": Object {
           "enabled": Object {
-            "default": false,
             "type": "boolean",
           },
         },