chore: upgrade @hapi/joi to joi

Author: kuhiga

lib/deploy/stepFunctions/compileAlarms.js

@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const BbPromise = require('bluebird');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const schema = require('./compileAlarms.schema');
 const logger = require('../../utils/logger');
 
@@ -142,17 +142,17 @@ function validateConfig(serverless, stateMachineName, alarmsObj) {
     return false;
   }
 
-  const { error } = Joi.validate(alarmsObj, schema, { allowUnknown: false });
-
-  if (error) {
-    logger.log(
-      `State machine [${stateMachineName}] : alarms config is malformed. `
-      + 'Please see https://github.com/horike37/serverless-step-functions for examples. '
-      + `${error}`,
-    );
-    return false;
-  }
-
+  Joi.validate(alarmsObj, schema, { allowUnknown: false }, (err) => {
+    if (err) {
+      logger.log(
+        `State machine [${stateMachineName}] : alarms config is malformed. `
+        + 'Please see https://github.com/horike37/serverless-step-functions for examples. '
+        + `${err}`,
+      );
+      return false;
+    }
+    return true;
+  });
   return true;
 }
 

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(),

lib/deploy/stepFunctions/compileNotifications.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const crypto = require('crypto');
 const BbPromise = require('bluebird');
 const schema = require('./compileNotifications.schema');
@@ -326,18 +326,18 @@ function validateConfig(serverless, stateMachineName, stateMachineObj, notificat
     return false;
   }
 
-  const { error } = Joi.validate(
-    notificationsObj, schema, { allowUnknown: false },
-  );
+  Joi.validate(notificationsObj, schema, { allowUnknown: false }, (err) => {
+    if (err) {
+      logger.log(
+        `State machine [${stateMachineName}] : notifications config is malformed. `
+        + 'Please see https://github.com/horike37/serverless-step-functions for examples. '
+        + `${err}`,
+      );
+      return false;
+    }
 
-  if (error) {
-    logger.log(
-      `State machine [${stateMachineName}] : notifications config is malformed. `
-      + 'Please see https://github.com/horike37/serverless-step-functions for examples. '
-      + `${error}`,
-    );
-    return false;
-  }
+    return true;
+  });
 
   return true;
 }

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(),

lib/deploy/stepFunctions/compileStateMachines.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const aslValidator = require('asl-validator');
 const BbPromise = require('bluebird');
 const crypto = require('crypto');
@@ -107,14 +107,17 @@ module.exports = {
         } else {
           Tags = toTags(this.serverless.service.provider.tags);
         }
-
-        const { error, value } = Joi.validate(stateMachineObj, schema, { allowUnknown: false });
-        if (error) {
-          const errorMessage = `State machine [${stateMachineName}] is malformed. `
+        let validationValue;
+        Joi.validate(stateMachineObj, schema, { allowUnknown: false }, (err, value) => {
+          if (err) {
+            const errorMessage = `State machine [${stateMachineName}] is malformed. `
             + 'Please check the README for more info. '
-            + `${error}`;
-          throw new this.serverless.classes.Error(errorMessage);
-        }
+            + `${err}`;
+            throw new this.serverless.classes.Error(errorMessage);
+          } else {
+            validationValue = value;
+          }
+        });
 
         if (stateMachineObj.definition) {
           if (this.serverless.service.stepFunctions.validate) {
@@ -201,23 +204,23 @@ module.exports = {
           _.forEach(stateMachineTags, tag => Tags.push(tag));
         }
 
-        if (value.loggingConfig) {
-          const Destinations = (value.loggingConfig.destinations || [])
+        if (validationValue.loggingConfig) {
+          const Destinations = (validationValue.loggingConfig.destinations || [])
             .map(arn => ({
               CloudWatchLogsLogGroup: {
                 LogGroupArn: arn,
               },
             }));
           LoggingConfiguration = {
-            Level: value.loggingConfig.level,
-            IncludeExecutionData: value.loggingConfig.includeExecutionData,
+            Level: validationValue.loggingConfig.level,
+            IncludeExecutionData: validationValue.loggingConfig.includeExecutionData,
             Destinations,
           };
         }
 
-        if (value.tracingConfig) {
+        if (validationValue.tracingConfig) {
           TracingConfiguration = {
-            Enabled: value.tracingConfig.enabled,
+            Enabled: validationValue.tracingConfig.enabled,
           };
         }
 

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'),

package-lock.json

@@ -44,7 +44,7 @@
     "sinon": "^12.0.1"
   },
   "dependencies": {
-    "@hapi/joi": "^15.0.2",
+    "joi": "^17.7.0",
     "@serverless/utils": "^6.7.0",
     "asl-validator": "^3.1.0",
     "bluebird": "^3.4.0",