Skip to content

chore: upgrade @hapi/joi to joi #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 17, 2023
Merged

chore: upgrade @hapi/joi to joi #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79326c9
chore: upgrade @hapi/joi to joi
kuhiga Mar 28, 2023
cee570e
chore: update lock file
kuhiga Mar 28, 2023
75de507
fix: change to new joi syntax
kuhiga Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/deploy/stepFunctions/compileAlarms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -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(
Expand Down
10 changes: 5 additions & 5 deletions lib/deploy/stepFunctions/compileAlarms.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Joi = require('@hapi/joi');
const Joi = require('joi');

const arn = Joi.alternatives().try(
Joi.string(),
Expand All @@ -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(),
}),
]),
]),
),
),
}),
);

Expand Down
5 changes: 2 additions & 3 deletions lib/deploy/stepFunctions/compileNotifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions lib/deploy/stepFunctions/compileNotifications.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Joi = require('@hapi/joi');
const Joi = require('joi');

const arn = Joi.alternatives().try(
Joi.string(),
Expand All @@ -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(),
}),
]),
]),
),
),
}),
);

Expand Down
4 changes: 1 addition & 3 deletions lib/deploy/stepFunctions/compileStateMachines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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. '
Expand Down
10 changes: 5 additions & 5 deletions lib/deploy/stepFunctions/compileStateMachines.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Joi = require('@hapi/joi');
const Joi = require('joi');

const arn = Joi.alternatives().try(
Joi.string().regex(/^arn:aws/, 'ARN'),
Expand All @@ -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(),
}),
]),
]),
),
),
}),
);

Expand Down
Loading