diff --git a/appengine/analytics/app.js b/appengine/analytics/app.js index 62f3a78479..8c4a83e7eb 100644 --- a/appengine/analytics/app.js +++ b/appengine/analytics/app.js @@ -24,7 +24,7 @@ app.enable('trust proxy'); // The following environment variable is set by app.yaml when running on App // Engine, but will need to be set manually when running locally. See README.md. -const GA_TRACKING_ID = process.env.GA_TRACKING_ID; +const {GA_TRACKING_ID} = process.env; function trackEvent(category, action, label, value) { const data = { diff --git a/appengine/endpoints/app.js b/appengine/endpoints/app.js index e4c1e2d129..d066d453b1 100644 --- a/appengine/endpoints/app.js +++ b/appengine/endpoints/app.js @@ -17,7 +17,7 @@ const express = require('express'); const bodyParser = require('body-parser'); -const Buffer = require('safe-buffer').Buffer; +const {Buffer} = require('safe-buffer'); const app = express(); app.use(bodyParser.json()); diff --git a/appengine/endpoints/test/app.test.js b/appengine/endpoints/test/app.test.js index 84fb0c9569..eb2baad290 100644 --- a/appengine/endpoints/test/app.test.js +++ b/appengine/endpoints/test/app.test.js @@ -15,7 +15,7 @@ 'use strict'; -const Buffer = require('safe-buffer').Buffer; +const {Buffer} = require('safe-buffer'); const express = require('express'); const path = require('path'); const proxyquire = require('proxyquire').noCallThru(); diff --git a/appengine/headless-chrome/app.js b/appengine/headless-chrome/app.js index a876fc09a6..ebfc430ead 100644 --- a/appengine/headless-chrome/app.js +++ b/appengine/headless-chrome/app.js @@ -23,7 +23,7 @@ const app = express(); let browser; app.use(async (req, res) => { - const url = req.query.url; + const {url} = req.query; if (!url) { return res.send( @@ -51,7 +51,7 @@ const server = app.listen(process.env.PORT || 8080, err => { if (err) { return console.error(err); } - const port = server.address().port; + const {port} = server.address(); console.info(`App listening on port ${port}`); }); // [END full_sample] diff --git a/appengine/memcached/app.js b/appengine/memcached/app.js index 127b8f9fae..eb224154ed 100644 --- a/appengine/memcached/app.js +++ b/appengine/memcached/app.js @@ -22,7 +22,7 @@ const app = express(); // [START gae_flex_redislabs_memcache] // Environment variables are defined in app.yaml. -const MEMCACHE_URL = process.env.MEMCACHE_URL; +const {MEMCACHE_URL} = process.env; const mc = memjs.Client.create(MEMCACHE_URL); // [END gae_flex_redislabs_memcache] diff --git a/appengine/pubsub/app.js b/appengine/pubsub/app.js index d747c57f9b..100c4d0717 100644 --- a/appengine/pubsub/app.js +++ b/appengine/pubsub/app.js @@ -19,7 +19,7 @@ const express = require('express'); const bodyParser = require('body-parser'); const {OAuth2Client} = require('google-auth-library'); const path = require('path'); -const Buffer = require('safe-buffer').Buffer; +const {Buffer} = require('safe-buffer'); const process = require('process'); // Required for mocking environment variables // By default, the client will authenticate using the service account file @@ -47,7 +47,7 @@ const tokens = []; // The following environment variables are set by app.yaml when running on GAE, // but will need to be manually set when running locally. -const PUBSUB_VERIFICATION_TOKEN = process.env.PUBSUB_VERIFICATION_TOKEN; +const {PUBSUB_VERIFICATION_TOKEN} = process.env; const TOPIC = process.env.PUBSUB_TOPIC; const topic = pubsub.topic(TOPIC); diff --git a/appengine/sendgrid/app.js b/appengine/sendgrid/app.js index 65a8145cbd..8773e61f12 100644 --- a/appengine/sendgrid/app.js +++ b/appengine/sendgrid/app.js @@ -23,8 +23,8 @@ const bodyParser = require('body-parser'); // The following environment variables are set by app.yaml (app.flexible.yaml or // app.standard.yaml) when running on Google App Engine, // but will need to be manually set when running locally. -const SENDGRID_API_KEY = process.env.SENDGRID_API_KEY; -const SENDGRID_SENDER = process.env.SENDGRID_SENDER; +const {SENDGRID_API_KEY} = process.env; +const {SENDGRID_SENDER} = process.env; const Sendgrid = require('@sendgrid/client'); Sendgrid.setApiKey(SENDGRID_API_KEY); diff --git a/appengine/storage/flexible/app.js b/appengine/storage/flexible/app.js index 33256cbe25..859c9d8df0 100644 --- a/appengine/storage/flexible/app.js +++ b/appengine/storage/flexible/app.js @@ -18,7 +18,7 @@ const process = require('process'); // Required to mock environment variables // [START gae_flex_storage_app] -const format = require('util').format; +const {format} = require('util'); const express = require('express'); const Multer = require('multer'); const bodyParser = require('body-parser'); diff --git a/appengine/storage/standard/app.js b/appengine/storage/standard/app.js index 66bee97869..fafb25dbd0 100644 --- a/appengine/storage/standard/app.js +++ b/appengine/storage/standard/app.js @@ -18,7 +18,7 @@ const process = require('process'); // Required to mock environment variables // [START gae_storage_app] -const format = require('util').format; +const {format} = require('util'); const express = require('express'); const Multer = require('multer'); const bodyParser = require('body-parser'); diff --git a/appengine/twilio/app.js b/appengine/twilio/app.js index c38852ba5a..87c3ed4499 100644 --- a/appengine/twilio/app.js +++ b/appengine/twilio/app.js @@ -22,7 +22,7 @@ const bodyParser = require('body-parser').urlencoded({ const app = express(); -const TWILIO_NUMBER = process.env.TWILIO_NUMBER; +const {TWILIO_NUMBER} = process.env; if (!TWILIO_NUMBER) { console.log( 'Please configure environment variables as described in README.md' @@ -39,7 +39,7 @@ const twilioClient = Twilio( process.env.TWILIO_AUTH_TOKEN ); -const TwimlResponse = Twilio.TwimlResponse; +const {TwimlResponse} = Twilio; // [START gae_flex_twilio_receive_call] app.post('/call/receive', (req, res) => { @@ -55,7 +55,7 @@ app.post('/call/receive', (req, res) => { // [START gae_flex_twilio_send_sms] app.get('/sms/send', async (req, res, next) => { - const to = req.query.to; + const {to} = req.query; if (!to) { res .status(400)