Skip to content
This repository was archived by the owner on Oct 25, 2023. It is now read-only.

Commit f8656a1

Browse files
authored
Merge pull request #202 from ACloudGuru/fix/devops/package_updates
Package updates and linting fixes for upcoming release
2 parents fcb0672 + 0a534f6 commit f8656a1

File tree

5 files changed

+2406
-2110
lines changed

5 files changed

+2406
-2110
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"author": "John McKim <john@acloud.guru>",
2020
"license": "MIT",
2121
"dependencies": {
22-
"lodash.merge": "^4.6.2",
23-
"lodash.isstring": "^4.0.1",
2422
"lodash.isobject": "^3.0.2",
23+
"lodash.isstring": "^4.0.1",
24+
"lodash.merge": "^4.6.2",
2525
"lodash.union": "^4.6.0",
2626
"lodash.upperfirst": "^4.3.1"
2727
},
@@ -35,7 +35,7 @@
3535
"eslint-plugin-jest": "^24.1.3",
3636
"eslint-plugin-prettier": "^3.3.1",
3737
"husky": "^5.0.9",
38-
"jest": "^19.0.2",
38+
"jest": "^27.3.1",
3939
"pinst": "^2.1.4",
4040
"prettier": "^2.2.1"
4141
},

src/dashboards/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const widgetFactory = require('./widgets/factory');
22

33
const dashboards = {
4-
default: require('./configs/default'),
5-
vertical: require('./configs/vertical'),
4+
default: require('./configs/default.json'),
5+
vertical: require('./configs/vertical.json'),
66
};
77

88
const createDashboard = (service, stage, region, functions, name) => {

src/external-stack.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,9 @@ class ExternalStack {
104104
const refName = resource[key];
105105
if (!preMergedResources[refName]) {
106106
// It's an unresolved reference. Try to find it in the main stack.
107-
const mainResource = this.serverless.service.provider
108-
.compiledCloudFormationTemplate.Resources[refName];
107+
const mainResource =
108+
this.serverless.service.provider.compiledCloudFormationTemplate
109+
.Resources[refName];
109110
if (
110111
mainResource &&
111112
mainResource.Properties &&
@@ -374,8 +375,8 @@ class ExternalStack {
374375
ContentType: 'application/json',
375376
};
376377

377-
const deploymentBucketObject = this.serverless.service.provider
378-
.deploymentBucketObject;
378+
const deploymentBucketObject =
379+
this.serverless.service.provider.deploymentBucketObject;
379380
if (deploymentBucketObject) {
380381
params = this.setServersideEncryptionOptions(
381382
params,

src/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,8 @@ class AlertsPlugin {
401401
this.serverless.service.getAllFunctions().forEach((functionName) => {
402402
const functionObj = this.serverless.service.getFunction(functionName);
403403

404-
const normalizedFunctionName = this.providerNaming.getLambdaLogicalId(
405-
functionName
406-
);
404+
const normalizedFunctionName =
405+
this.providerNaming.getLambdaLogicalId(functionName);
407406

408407
const functionAlarms = this.getFunctionAlarms(
409408
functionObj,

0 commit comments

Comments
 (0)