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

Commit 08674d3

Browse files
authoredNov 4, 2021
chore: update serverless versions (#501)
1 parent 2d14723 commit 08674d3

14 files changed

+1920
-2537
lines changed
 

‎.github/workflows/cfn-analysis.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,19 @@ jobs:
2626
node-version: 14
2727
- name: Install npm dependencies
2828
run: yarn install
29-
- name: Install serverless
30-
run: npm install -g serverless
3129
- name: Package main sls into cfn for analysis
3230
run: |
33-
serverless package --stage dev --region us-west-2 --useHapiValidator true --conceal
31+
yarn run serverless-package --stage dev --region us-west-2 --useHapiValidator true --conceal
3432
- name: cfn_nag on main serverless
3533
uses: stelligent/cfn_nag@master
3634
with:
3735
input_path: .serverless/cloudformation-template-update-stack.json
38-
extra_args: -o json
36+
extra_args: -o json
3937
- name: Package auditLogMover sls into cfn for analysis
4038
run: |
4139
cd auditLogMover
4240
yarn install
43-
serverless package --stage dev --region us-west-2 --conceal
41+
yarn run serverless-package --stage dev --region us-west-2 --conceal
4442
- name: cfn_nag on auditLog serverless
4543
uses: stelligent/cfn_nag@master
4644
with:

‎.github/workflows/deploy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Compile IGs
8888
run: yarn run compile-igs
8989
- name: Install serverless
90-
run: npm install -g serverless
90+
run: npm install -g serverless@2.64.1
9191
- name: Deploy Hapi validator
9292
env:
9393
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID}}

‎auditLogMover/package.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"eslint-plugin-import": "^2.24.2",
2121
"eslint-plugin-prettier": "^4.0.0",
2222
"jest": "^26.6.3",
23-
"serverless": "2.29.0",
24-
"serverless-bundle": "4.0.1",
25-
"serverless-step-functions": "^2.27.1",
23+
"serverless": "2.64.1",
24+
"serverless-bundle": "^4.4.0",
25+
"serverless-step-functions": "^3.1.1",
2626
"sinon": "^9.0.2",
2727
"ts-jest": "^26.4.4",
2828
"typescript": "^4.1.3"
@@ -51,7 +51,10 @@
5151
"release": "yarn run build && yarn run lint && yarn run test",
5252
"test": "jest --silent",
5353
"test-coverage": "jest --coverage",
54-
"serverless-deploy": "serverless deploy"
54+
"serverless-deploy": "serverless deploy",
55+
"serverless-package": "serverless package",
56+
"serverless-remove": "serverless remove",
57+
"serverless-info": "serverless info"
5558
},
5659
"jest": {
5760
"moduleFileExtensions": [

‎auditLogMover/serverless.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ custom:
1010
region: ${opt:region, self:provider.region}
1111
bundle:
1212
packager: yarn
13+
linting: false # We use our own linter
1314

1415
provider:
1516
name: aws
@@ -21,8 +22,7 @@ provider:
2122
stackTags:
2223
FHIR_SERVICE: 'fhir-service-${self:custom.region}-${self:custom.stage}'
2324
environment:
24-
CLOUDWATCH_EXECUTION_LOG_GROUP:
25-
Fn::ImportValue: CloudwatchAccessLogGroup-${opt:stage, self:provider.stage}
25+
CLOUDWATCH_EXECUTION_LOG_GROUP: !ImportValue CloudwatchAccessLogGroup-${opt:stage, self:provider.stage}
2626
AUDIT_LOGS_BUCKET: !Ref AuditLogsBucket
2727
STAGE: ${opt:stage, self:provider.stage}
2828
variableSyntax: "\\${((?!AWS)[ ~:a-zA-Z0-9._@'\",\\-\\/\\(\\)]+?)}" # Use this for allowing CloudFormation Pseudo-Parameters in your serverless.yml
@@ -35,8 +35,7 @@ provider:
3535
- 'logs:CreateLogGroup'
3636
- 'logs:PutLogEvents'
3737
Effect: 'Allow'
38-
Resource:
39-
Fn::ImportValue: CloudwatchAccessLogGroup-${opt:stage, self:provider.stage}-Arn
38+
Resource: !ImportValue CloudwatchAccessLogGroup-${opt:stage, self:provider.stage}-Arn
4039
- Action:
4140
- 'cloudwatch:PutMetricData'
4241
Effect: 'Allow'

0 commit comments

Comments
 (0)