Skip to content

Commit

Permalink
docs: add 'Get Lambda event and context' instructions to UPGRADE.md
Browse files Browse the repository at this point in the history
  • Loading branch information
brett-vendia committed Feb 1, 2021
1 parent c9c623b commit 7323cb0
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 32 deletions.
28 changes: 27 additions & 1 deletion UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## From 3.x to 4.x

### Lambda Handler

```javascript
// 3.x
const awsServerlessExpress = require('aws-serverless-express')
Expand Down Expand Up @@ -32,4 +34,28 @@ serverlessExpress({
contentEncodings: []
}
})
```
```

### Get Lambda event and context

```javascript
// 3.x
const awsServerlessExpressMiddleware = require('aws-serverless-express/middleware')
router.use(awsServerlessExpressMiddleware.eventContext())
router.get('/', (req, res) => {
res.json({
stage: req.apiGateway.event.requestContext.stage
})
})
```

```javascript
// 4.x
const { getCurrentInvoke } = require('@vendia/serverless-express')
router.get('/', (req, res) => {
const currentInvoke = getCurrentInvoke()
res.json({
stage: currentInvoke.event.requestContext.stage
})
})
```
9 changes: 0 additions & 9 deletions examples/alb/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,12 @@ const path = require('path')
const express = require('express')
const bodyParser = require('body-parser')
const cors = require('cors')
// const compression = require('compression')
const { getCurrentInvoke } = require('@vendia/serverless-express')
const app = express()
const router = express.Router()

app.set('view engine', 'pug')

// if (process.env.NODE_ENV === 'test') {
// // NOTE: serverless-express uses this app for its integration tests
// // and only applies compression to the /sam endpoint during testing.
// router.use('/sam', compression())
// } else {
// router.use(compression())
// }

router.use(cors())
router.use(bodyParser.json())
router.use(bodyParser.urlencoded({ extended: true }))
Expand Down
10 changes: 2 additions & 8 deletions examples/basic-starter-api-gateway-v1/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,15 @@ const express = require('express')
const bodyParser = require('body-parser')
const cors = require('cors')
const compression = require('compression')
const { getCurrentInvoke } = require(process.env.NODE_ENV === 'test' ? '../../../src/index' : '@vendia/serverless-express')
const { getCurrentInvoke } = require('@vendia/serverless-express')
const ejs = require('ejs').__express
const app = express()
const router = express.Router()

app.set('view engine', 'ejs')
app.engine('.ejs', ejs)

if (process.env.NODE_ENV === 'test') {
// NOTE: serverless-express uses this app for its integration tests
// and only applies compression to the /sam endpoint during testing.
router.use('/sam', compression())
} else {
router.use(compression())
}
router.use(compression())

router.use(cors())
router.use(bodyParser.json())
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-starter-api-gateway-v1/src/lambda.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require('source-map-support/register')
const serverlessExpress = require(process.env.NODE_ENV === 'test' ? '../../..' : '@vendia/serverless-express')
const serverlessExpress = require('@vendia/serverless-express')
const app = require('./app')

// NOTE: If you get ERR_CONTENT_DECODING_FAILED in your browser, this is likely
Expand Down
11 changes: 2 additions & 9 deletions examples/basic-starter-api-gateway-v2/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,15 @@ const express = require('express')
const bodyParser = require('body-parser')
const cors = require('cors')
const compression = require('compression')
const { getCurrentInvoke } = require(process.env.NODE_ENV === 'test' ? '../../../src/index' : '@vendia/serverless-express')
const { getCurrentInvoke } = require('@vendia/serverless-express')
const ejs = require('ejs').__express
const app = express()
const router = express.Router()

app.set('view engine', 'ejs')
app.engine('.ejs', ejs)

if (process.env.NODE_ENV === 'test') {
// NOTE: serverless-express uses this app for its integration tests
// and only applies compression to the /sam endpoint during testing.
router.use('/sam', compression())
} else {
router.use(compression())
}

router.use(compression())
router.use(cors())
router.use(bodyParser.json())
router.use(bodyParser.urlencoded({ extended: true }))
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"husky": {
"hooks": {
"pre-push": "lint-staged && npm run install-example-dependencies && npm test",
"pre-push": "lint-staged && npm test",
"commit-msg": "commitlint -e $GIT_PARAMS"
}
},
Expand Down Expand Up @@ -98,12 +98,11 @@
"release": "semantic-release",
"release-local": "node -r dotenv/config node_modules/semantic-release/bin/semantic-release --no-ci --dry-run",
"check-dependencies": "npx npm-check --skip-unused --update",
"lint": "eslint src examples",
"install-example-dependencies": "cd examples && npm install --prefix basic-starter-api-gateway-v1 basic-starter-api-gateway-v1 && cd .."
"lint": "eslint src examples"
},
"config": {
"commitizen": {
"path": "cz-conventional-changelog"
}
}
}
}

0 comments on commit 7323cb0

Please sign in to comment.