Merge samples for Flex and Std

appengine/analytics/README.md

@@ -3,9 +3,9 @@
 This sample application shows how to integrate your Node.js application with
 Google Analytics on Google App Engine.
 
-App Engine Node.js Standard Environment users: See tutorial [Integrating with Google Analytics][std-tutorial] for more information on running and deploying this app.
+[App Engine Standard][appengine-std] users: See tutorial [Integrating with Google Analytics][std-tutorial] for more information on running and deploying this app.
 
-App Engine Node.js Flexible Environment users: See tutorial [Integrating with Google Analytics][flex-tutorial] for more information on running and deploying this app.
+[App Engine Flexible][appengine-flex] users: See tutorial [Integrating with Google Analytics][flex-tutorial] for more information on running and deploying this app.
 
 * [Setup](#setup)
 * [Running locally](#running-locally)
@@ -42,11 +42,15 @@ or with `yarn`:
 
 ## Deploying to App Engine Standard Environment
 
-    gcloud app deploy app.standard.yaml
+```
+gcloud app deploy app.standard.yaml
+```
 
 ## Deploying to App Engine Flexible Environment
 
-	gcloud app deploy app.flexible.yaml
+```
+gcloud app deploy app.flexible.yaml
+```
 
 
 ## Running the tests

appengine/building-an-app/build/README.md

@@ -26,7 +26,7 @@ Before you can run or deploy the sample, you need to do the following:
 
 ## Deploying to App Engine
 
-    npm run deploy
+    gcloud app deploy
 
 ## Running the tests
 

appengine/building-an-app/build/package.json

@@ -5,6 +5,8 @@
   "private": true,
   "main": "server.js",
   "scripts": {
+    "start": "node server.js",
+    "deploy": "gcloud app deploy",
     "lint": "samples lint",
     "pretest": "npm run lint",
     "test": "ava --verbose test/*.test.js"

appengine/building-an-app/update/README.md

@@ -26,7 +26,7 @@ Before you can run or deploy the sample, you need to do the following:
 
 ## Deploying to App Engine
 
-    npm run deploy
+    gcloud app deploy
 
 ## Running the tests
 

appengine/building-an-app/update/package.json

@@ -5,6 +5,8 @@
   "private": true,
   "main": "server.js",
   "scripts": {
+    "start": "node server.js",
+    "deploy": "gcloud app deploy",
     "lint": "samples lint",
     "pretest": "npm run lint",
     "test": "ava --verbose test/*.test.js"

appengine/building-an-app/update/test/server.test.js

@@ -40,7 +40,7 @@ test.cb.serial(`should display form`, (t) => {
     .get(`/submit`)
     .expect(200)
     .expect((response) => {
-      t.regex(response.text, /textarea name="message" placeholder="Message"/);
+      t.true(response.text.includes('textarea name="message" placeholder="Message"'));
     })
     .end(t.end);
 });

appengine/cloudsql/README.md

@@ -3,11 +3,13 @@
 This sample application shows how to use [Google Cloud SQL[[sql] for [MySQL][mysql]
 on Google App Engine.
 
-App Engine Standard users: See tutorial [Using Cloud SQL for MySQL (App Engine Standard Environment)][std-tutorial] for more information on running and deploying this app.
+[App Engine Standard][appengine-std] users: See tutorial [Using Cloud SQL for MySQL (App Engine Standard Environment)][std-tutorial] for more information on running and deploying this app.
 
-App Engine Flexible users: See tutorial [Using Cloud SQL for MySQL (App Engine Flexible Environment)][flex-tutorial] for more information on running and deploying this app.
+[App Engine Flexible][appengine-flex] users: See tutorial [Using Cloud SQL for MySQL (App Engine Flexible Environment)][flex-tutorial] for more information on running and deploying this app.
 
 [sql]: https://cloud.google.com/sql/
 [mysql]: https://www.mysql.com/downloads/
+[appengine-flex]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[appengine-std]: https://cloud.google.com/appengine/docs/standard/nodejs
 [flex-tutorial]: https://cloud.google.com/appengine/docs/flexible/nodejs/using-cloud-sql
 [std-tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/using-cloud-sql

appengine/cloudsql/app.flexible.yaml

@@ -16,6 +16,8 @@ runtime: nodejs
 env: flex
 
 # [START env]
+# The following env variables may contain sensitive information that grants
+# anyone access to your database. Do not add this file to your source control.
 env_variables:
   SQL_USER: YOUR_SQL_USER
   SQL_PASSWORD: YOUR_SQL_PASSWORD

appengine/cloudsql/app.standard.yaml

@@ -15,6 +15,8 @@
 runtime: nodejs8
 
 # [START env]
+# The following env variables may contain sensitive information that grants
+# anyone access to your database. Do not add this file to your source control.
 env_variables:
   SQL_USER: YOUR_SQL_USER
   SQL_PASSWORD: YOUR_SQL_PASSWORD

appengine/cloudsql_postgresql/README.md

@@ -1,15 +1,17 @@
-# Cloud SQL for MySQL Node.js sample on App Engine flexible environment
+# Cloud SQL for PostgresSQL Node.js sample on App Engine flexible environment
 
 This sample application shows how to use [Google Cloud SQL[[sql] for [PostgreSQL][postgres]
 on Google App Engine.
 
-App Engine Standard users: See tutorial [
+[App Engine Standard][appengine-std] users: See tutorial [
 Using Cloud SQL for PostgreSQL (App Engine Standard Environment)][std-tutorial] for more information on running and deploying this app.
 
-App Engine Flexible users: See tutorial [
+[App Engine Flexible][appengine-flex] users: See tutorial [
 Using Cloud SQL for PostgreSQL (App Engine Flexible Environment)][flex-tutorial] for more information on running and deploying this app.
 
 [sql]: https://cloud.google.com/sql/
 [postgres]: https://www.postgresql.org/download/
+[appengine-flex]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[appengine-std]: https://cloud.google.com/appengine/docs/standard/nodejs
 [flex-tutorial]: https://cloud.google.com/appengine/docs/flexible/nodejs/using-cloud-sql-postgres
 [std-tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/using-cloud-sql-postgres

appengine/cloudsql_postgresql/app.flexible.yaml

@@ -16,6 +16,8 @@ runtime: nodejs
 env: flex
 
 # [START env]
+# The following env variables may contain sensitive information that grants
+# anyone access to your database. Do not add this file to your source control.
 env_variables:
   SQL_USER: YOUR_SQL_USER
   SQL_PASSWORD: YOUR_SQL_PASSWORD

appengine/cloudsql_postgresql/app.standard.yaml

@@ -15,6 +15,8 @@
 runtime: nodejs8
 
 # [START env]
+# The following env variables may contain sensitive information that grants
+# anyone access to your database. Do not add this file to your source control.
 env_variables:
   SQL_USER: YOUR_SQL_USER
   SQL_PASSWORD: YOUR_SQL_PASSWORD

appengine/cloudtasks/README.md

@@ -1,7 +1,7 @@
 # Node.js Google Cloud Tasks sample for Google App Engine
 
 This sample application shows how to use [Google Cloud Tasks](https://cloud.google.com/cloud-tasks/)
-on Google App Engine Node.js Standard Environment and Flexible Environment.
+on Google App Engine Node.js [Standard Environment][appengine-std] and [Flexible Environment][appengine-flex].
 
 App Engine queues push tasks to an App Engine HTTP target. This directory
 contains both the App Engine app to deploy, as well as the snippets to run
@@ -105,3 +105,6 @@ Examples:
 
 For more information, see https://cloud.google.com/cloud-tasks
 ```
+
+[appengine-flex]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[appengine-std]: https://cloud.google.com/appengine/docs/standard/nodejs

appengine/datastore/README.md

@@ -3,9 +3,9 @@
 This sample application shows how to use Google Cloud Datastore on Google App
 Engine.
 
-App Engine Node.js Standard Environment users: See tutorial [Using Cloud Datastore][tutorial-std] for more information on running and deploying this app.
+[App Engine Standard][appengine-std] users: See tutorial [Using Cloud Datastore][tutorial-std] for more information on running and deploying this app.
 
-App Engine Node.js Flexible Environment users: See tutorial [Using Cloud Datastore][tutorial-flex] for more information on running and deploying this app.
+[App Engine Flexible][appengine-flex] users: See tutorial [Using Cloud Datastore][tutorial-flex] for more information on running and deploying this app.
 
 * [Setup](#setup)
 * [Running locally](#running-locally)
@@ -50,6 +50,8 @@ or with `yarn`:
 
 See [Contributing][contributing].
 
+[appengine-flex]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[appengine-std]: https://cloud.google.com/appengine/docs/standard/nodejs
 [tutorial-std]: https://cloud.google.com/appengine/docs/standard/nodejs/using-cloud-datastore
 [tutorial-flex]: https://cloud.google.com/appengine/docs/flexible/nodejs/using-cloud-datastore
 [readme]: ../README.md

appengine/errorreporting/README.md

@@ -1,9 +1,12 @@
 # Node.js error reporting sample for Google App Engine
 
 This sample shows how to use Stackdriver Error Reporting on Google App Engine
-Node.js Standard Environment and Flexible Environment.
+Node.js [Standard Environment][appengine-std] and [Flexible Environment][appengine-flex].
 
 ## Running locally
 
 Refer to the [appengine/README.md](../README.md) file for instructions on
 running and deploying.
+
+[appengine-flex]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[appengine-std]: https://cloud.google.com/appengine/docs/standard/nodejs

appengine/loopback/README.md

@@ -5,7 +5,7 @@
 Refer to the [appengine/README.md](../README.md) file for more instructions on
 running and deploying this app.
 
-App Engine Node.js Flexible Environment users may also read the community
+[App Engine Flexible][5] users may also read the community
 tutorial [Loopback.js on App Engine Tutorial][2] for how to run and deploy this
 sample app.
 
@@ -15,3 +15,4 @@ Additionally, view the [live demo][3] and read the [Loopback.js documentation][4
 [2]: https://cloud.google.com/nodejs/resources/frameworks/loopback
 [3]: http://loopback-dot-nodejs-docs-samples.appspot.com
 [4]: http://loopback.io/getting-started/
+[5]: https://cloud.google.com/appengine/docs/flexible/nodejs

appengine/mailjet/README.md

@@ -6,12 +6,14 @@
 
 This sample application demonstrates how to use [Express.js][2] and
 [node-mailjet][3] to send transactional email on [Google App Engine][4] Node.js
-Standard Environment and Flexible Environment.
+[Standard Environment][5] and [Flexible Environment][6].
 
-You can also read the [Mailjet documentation][5].
+You can also read the [Mailjet documentation][7].
 
 [1]: https://www.mailjet.com/
 [2]: http://expressjs.com
 [3]: https://github.com/mailjet/mailjet-apiv3-nodejs
 [4]: https://cloud.google.com/appengine
-[5]: https://dev.mailjet.com/
+[5]: https://cloud.google.com/appengine/docs/standard/nodejs
+[6]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[7]: https://dev.mailjet.com/

appengine/mailjet/app.flexible.yaml

@@ -14,6 +14,10 @@
 # [START app_yaml]
 runtime: nodejs
 env: flex
+
+# The following env variables may contain sensitive information that grants
+# anyone access to your Mailjet account. Do not add this file to your source
+# control.
 env_variables:
   MJ_APIKEY_PUBLIC: <your-mj-apikey-public>
   MJ_APIKEY_PRIVATE: <your-mj-apikey-private>

appengine/mailjet/app.standard.yaml

@@ -14,6 +14,9 @@
 # [START app_yaml]
 runtime: nodejs8
 
+# The following env variables may contain sensitive information that grants
+# anyone access to your Mailjet account. Do not add this file to your source
+# control.
 env_variables:
   MJ_APIKEY_PUBLIC: <your-mj-apikey-public>
   MJ_APIKEY_PRIVATE: <your-mj-apikey-private>

appengine/memcached/README.md

@@ -1,10 +1,13 @@
 # Memcached sample for Google App Engine
 
 This sample demonstrates accessing Memcached from Node.js on
-[Google App Engine](https://cloud.google.com/appengine) Node.js Standard
-Environment and Flexible Environment.
+[Google App Engine](https://cloud.google.com/appengine) Node.js [Standard
+Environment][appengine-std] and [Flexible Environment][appengine-flex].
 
 ## Running locally
 
 Refer to the [appengine/README.md](../README.md) file for instructions on
 running and deploying.
+
+[appengine-flex]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[appengine-std]: https://cloud.google.com/appengine/docs/standard/nodejs

appengine/memcached/app.flexible.yaml

@@ -16,6 +16,9 @@ runtime: nodejs
 env: flex
 
 # [START env_variables]
+# The following env variables may contain sensitive information that grants
+# anyone access to your memcached service. Do not add this file to your source
+# control.
 env_variables:
   # If you are using the App Engine Memcache service (currently in alpha),
   # uncomment this section and comment out the other Memcache variables.

appengine/memcached/app.standard.yaml

@@ -15,6 +15,9 @@
 runtime: nodejs8
 
 # [START env_variables]
+# The following env variables may contain sensitive information that grants
+# anyone access to your memcached service. Do not add this file to your source
+# control.
 env_variables:
   # If you are using the App Engine Memcache service,
   # uncomment this section and comment out the other Memcache variables.

appengine/metadata/standard/server.js

@@ -22,8 +22,7 @@ const request = require('got');
 const app = express();
 app.enable('trust proxy');
 
-const METADATA_NETWORK_INTERFACE_URL = 'http://metadata/computeMetadata/v1/' +
-'/instance/network-interfaces/0/access-configs/0/external-ip';
+const METADATA_NETWORK_INTERFACE_URL = 'http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip';
 
 function getExternalIp () {
   const options = {
@@ -36,7 +35,7 @@ function getExternalIp () {
   return request(METADATA_NETWORK_INTERFACE_URL, options)
     .then((response) => response.body)
     .catch((err) => {
-      if (err || err.statusCode !== 200) {
+      if (err && err.statusCode !== 200) {
         console.log('Error while talking to metadata server, assuming localhost');
         return 'localhost';
       }

appengine/mongodb/README.md

@@ -5,12 +5,13 @@
 Refer to the [appengine/README.md](../README.md) file for more instructions on
 running and deploying this app.
 
-App Engine Node.js Flexible Environment users may also read the community
-tutorial [MongoDB on App Engine Tutorial][2] for how to run and deploy this
+[App Engine Node.js Flexible Environment][2] users may also read the community
+tutorial [MongoDB on App Engine Tutorial][3] for how to run and deploy this
 sample app.
 
-For more information about MongoDB Node.js Driver, read the [node_mongodb documentation][3].
+For more information about MongoDB Node.js Driver, read the [node_mongodb documentation][4].
 
 [1]: http://mongodb.org/
-[2]: https://cloud.google.com/nodejs/resources/databases/mongodb
-[3]: http://mongodb.github.io/node-mongodb-native/
+[2]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[3]: https://cloud.google.com/nodejs/resources/databases/mongodb
+[4]: http://mongodb.github.io/node-mongodb-native/

appengine/parse-server/README.md

@@ -1,8 +1,9 @@
 # Parse-server sample for Google App Engine
 
 This sample shows how to deploy a [Parse-server](https://github.com/ParsePlatform/parse-server)
-app to [Google App Engine](https://cloud.google.com/appengine) Node.js Standard
-Environment and Flexible Environment.
+app to [Google App Engine](https://cloud.google.com/appengine) Node.js [Standard
+Environment](https://cloud.google.com/appengine/docs/standard/nodejs)
+and [Flexible Environment](https://cloud.google.com/appengine/docs/flexible/nodejs).
 
 ## Setup
 

appengine/pubsub/README.md

@@ -1,7 +1,8 @@
 # Node.js Cloud Pub/Sub sample for Google App Engine
 
 This sample shows how to send and receive messages using [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) on [Google App Engine](https://cloud.google.com/appengine)
-Standard Environment and Flexible Environment using Node.js.
+[Standard Environment](https://cloud.google.com/appengine/docs/standard/nodejs)
+and [Flexible Environment](https://cloud.google.com/appengine/docs/flexible/nodejs).
 
 ## Setup
 

appengine/redis/README.md

@@ -6,12 +6,13 @@ used as database, cache and message broker.
 Refer to the [appengine/README.md](../README.md) file for more instructions on
 running and deploying this app.
 
-App Engine Node.js Flexible Environment users may also read the community
-tutorial [Redis on App Engine Tutorial][2] for how to run and deploy this sample
+[App Engine Node.js Flexible Environment][2] users may also read the community
+tutorial [Redis on App Engine Tutorial][3] for how to run and deploy this sample
 app.
 
-Additonally, read the [node_redis documentation][3].
+Additionally, you can also read the [node_redis documentation][4].
 
 [1]: http://redis.io/
-[2]: https://cloud.google.com/nodejs/resources/databases/redis
-[3]: https://github.com/NodeRedis/node_redis
+[2]: https://cloud.google.com/appengine/docs/flexible/nodejs
+[3]: https://cloud.google.com/nodejs/resources/databases/redis
+[4]: https://github.com/NodeRedis/node_redis

appengine/sendgrid/README.md

@@ -1,8 +1,8 @@
 # Node.js SendGrid email sample for Google App Engine
 
 This sample application shows how to use [SendGrid](https://www.sendgrid.com) on
-[Google App Engine](https://cloud.google.com/appengine) Node.js Standard
-Environment and Flexible Environment.
+[Google App Engine](https://cloud.google.com/appengine) Node.js [Standard Environment](https://cloud.google.com/appengine/docs/standard/nodejs)
+and [Flexible Environment](https://cloud.google.com/appengine/docs/flexible/nodejs).
 
 For more information about SendGrid, see their
 [documentation](https://sendgrid.com/docs/User_Guide/index.html).

appengine/sendgrid/app.flexible.yaml

@@ -16,6 +16,9 @@ runtime: nodejs
 env: flex
 
 # [START env_variables]
+# The following env variables may contain sensitive information that grants
+# anyone access to your Sendgrid account. Do not add this file to your source
+# control.
 env_variables:
   SENDGRID_API_KEY: <your-sendgrid-api-key>
   SENDGRID_SENDER: <your-sendgrid-sender>

appengine/sendgrid/app.standard.yaml

@@ -15,6 +15,9 @@
 runtime: nodejs8
 
 # [START env_variables]
+# The following env variables may contain sensitive information that grants
+# anyone access to your Sendgrid account. Do not add this file to your source
+# control.
 env_variables:
   SENDGRID_API_KEY: <your-sendgrid-api-key>
   SENDGRID_SENDER: <your-sendgrid-sender>