Skip to content

Commit

Permalink
done
Browse files Browse the repository at this point in the history
  • Loading branch information
pjmattingly committed Jul 22, 2022
1 parent 69a2af4 commit c799df6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/plugins/aws/package/lib/merge-iam-templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = {
newLogGroup[logGroupLogicalId].Properties.RetentionInDays = logRetentionInDays;
}

_.merge(
Object.assign(
this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
newLogGroup
);
Expand Down Expand Up @@ -94,7 +94,7 @@ module.exports = {
iamRoleLambdaExecutionTemplate.Properties.Policies[0].PolicyName =
this.provider.naming.getPolicyName();

_.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
Object.assign(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
[this.provider.naming.getRoleLogicalId()]: iamRoleLambdaExecutionTemplate,
});

Expand Down
3 changes: 1 addition & 2 deletions lib/utils/fs/parse.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const jc = require('json-cycle');
const yaml = require('js-yaml');
const _ = require('lodash');
const cloudformationSchema = require('@serverless/utils/cloudformation-schema');

const loadYaml = (contents, options) => {
Expand All @@ -26,7 +25,7 @@ function parse(filePath, contents) {
};
let result = loadYaml(contents.toString(), options);
if (result.error && result.error.name === 'YAMLException') {
_.merge(options, { schema: cloudformationSchema });
Object.assign(options, { schema: cloudformationSchema });
result = loadYaml(contents.toString(), options);
}
if (result.error) {
Expand Down

0 comments on commit c799df6

Please sign in to comment.