Merge pull request #558 from kuhiga/joi-upgrade

chore: upgrade @hapi/joi to joi

Author: horike37

lib/deploy/stepFunctions/compileAlarms.js

@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const BbPromise = require('bluebird');
-const Joi = require('@hapi/joi');
 const schema = require('./compileAlarms.schema');
 const logger = require('../../utils/logger');
 
@@ -142,7 +141,7 @@ function validateConfig(serverless, stateMachineName, alarmsObj) {
     return false;
   }
 
-  const { error } = Joi.validate(alarmsObj, schema, { allowUnknown: false });
+  const { error } = schema.validate(alarmsObj, { allowUnknown: false });
 
   if (error) {
     logger.log(

lib/deploy/stepFunctions/compileAlarms.schema.js

@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const arn = Joi.alternatives().try(
   Joi.string(),
@@ -15,15 +15,15 @@ const arn = Joi.alternatives().try(
     ),
   }),
   Joi.object().keys({
-    'Fn::Join': Joi.array().items([
+    'Fn::Join': Joi.array().items(
       Joi.string(),
-      Joi.array().items([
+      Joi.array().items(
         Joi.string(),
         Joi.object().keys({
           Ref: Joi.string(),
         }),
-      ]),
-    ]),
+      ),
+    ),
   }),
 );
 

lib/deploy/stepFunctions/compileNotifications.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const _ = require('lodash');
-const Joi = require('@hapi/joi');
 const crypto = require('crypto');
 const BbPromise = require('bluebird');
 const schema = require('./compileNotifications.schema');
@@ -326,8 +325,8 @@ function validateConfig(serverless, stateMachineName, stateMachineObj, notificat
     return false;
   }
 
-  const { error } = Joi.validate(
-    notificationsObj, schema, { allowUnknown: false },
+  const { error } = schema.validate(
+    notificationsObj, { allowUnknown: false },
   );
 
   if (error) {

lib/deploy/stepFunctions/compileNotifications.schema.js

@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const arn = Joi.alternatives().try(
   Joi.string(),
@@ -9,15 +9,15 @@ const arn = Joi.alternatives().try(
     'Fn::GetAtt': Joi.array().items(Joi.string()),
   }),
   Joi.object().keys({
-    'Fn::Join': Joi.array().items([
+    'Fn::Join': Joi.array().items(
       Joi.string(),
-      Joi.array().items([
+      Joi.array().items(
         Joi.string(),
         Joi.object().keys({
           Ref: Joi.string(),
         }),
-      ]),
-    ]),
+      ),
+    ),
   }),
 );
 

lib/deploy/stepFunctions/compileStateMachines.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const _ = require('lodash');
-const Joi = require('@hapi/joi');
 const aslValidator = require('asl-validator');
 const BbPromise = require('bluebird');
 const crypto = require('crypto');
@@ -107,8 +106,7 @@ module.exports = {
         } else {
           Tags = toTags(this.serverless.service.provider.tags);
         }
-
-        const { error, value } = Joi.validate(stateMachineObj, schema, { allowUnknown: false });
+        const { error, value } = schema.validate(stateMachineObj, { allowUnknown: false });
         if (error) {
           const errorMessage = `State machine [${stateMachineName}] is malformed. `
             + 'Please check the README for more info. '

lib/deploy/stepFunctions/compileStateMachines.schema.js

@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const arn = Joi.alternatives().try(
   Joi.string().regex(/^arn:aws/, 'ARN'),
@@ -15,15 +15,15 @@ const arn = Joi.alternatives().try(
     ),
   }),
   Joi.object().keys({
-    'Fn::Join': Joi.array().items([
+    'Fn::Join': Joi.array().items(
       Joi.string(),
-      Joi.array().items([
+      Joi.array().items(
         Joi.string(),
         Joi.object().keys({
           Ref: Joi.string(),
         }),
-      ]),
-    ]),
+      ),
+    ),
   }),
 );