Merge samples for Flex and Std (#590)

* Merge samples for Flex and Std

* Solve conflicts

* MInor Fixes

* More minor fixes

* Lint

* Applied requested changes

appengine/README.md

@@ -1,7 +1,7 @@
 # Google App Engine Node.js Samples
 
 These are samples for using [Node.js][nodejs] on
-[Google App Engine Flexible Environment][appengine]. Many of these samples
+[Google App Engine][appengine]. Many of these samples
 are referenced from the documentation on [cloud.google.com][appengine].
 
 There are also samples [submitted by the community][community_samples].
@@ -57,17 +57,42 @@ The App Engine Node.js samples typically that you do the following:
 
 ## Deploying
 
-Some samples in this repositories may have special deployment instructions.
+Some samples may have special deployment instructions.
 Refer to the `README.md` file in the sample folder.
 
+Many samples in this folder can be deployed to both App Engine Node.js standard
+environment and flexible environment. Those samples come with two different
+App Engine configuration files: `app.flexible.yaml` for flexible environment,
+and `app.standard.yaml` for standard environment.
+
+Samples with one single configuration file, `app.yaml`, can only be deployed
+to one of the two environments. See the `README.md` files for these samples
+for more information.
+
+Generally speaking, to deploy a sample application:
+
 1.  Use the [Google Cloud Console][console] to create a Google Cloud Platform
     project.
 1.  [Enable billing][billing] for your project.
 
 1.  Use the Cloud SDK to deploy your app.
 
+    For samples with two configuration files (`app.flexible.yaml` and
+    `app.standard.yaml`), if you plan to use App Engine Node.js Standard
+    Environment, run
+
+        gcloud app deploy app.standard.yaml
+
+    To deploy to App Engine Node.js Flexible Environment, run
+
+        gcloud app deploy app.flexible.yaml
+
+    For samples with one configuration file (`app.yaml`), run
+
         gcloud app deploy
 
+    to deploy the app to its compatible environment.
+
     Note: If there is a `yarn.lock` file then `yarn install` will be used during
     deployment. Delete the `yarn.lock` file to fall back to `npm install`.
 
@@ -82,7 +107,7 @@ View the [Official App Engine Node.js samples][official_samples].
 View the [Community-contributed App Engine Node.js samples][community_samples].
 
 [nodejs]: https://nodejs.org/
-[appengine]: https://cloud.google.com/appengine/docs/flexible/nodejs/
+[appengine]: https://cloud.google.com/appengine/
 [nodejs_dev]: https://cloud.google.com/community/tutorials/how-to-prepare-a-nodejs-dev-environment
 [sdk]: https://cloud.google.com/sdk/
 [console]: https://console.cloud.google.com

appengine/analytics/README.md

@@ -1,8 +1,11 @@
 # Integrating with Google Analytics
 
-This is the sample application for the
-[Integrating with Google Analytics tutorial][tutorial] tutorial found in the
-[Google App Engine Node.js Flexible Environment][appengine] documentation.
+This sample application shows how to integrate your Node.js application with
+Google Analytics on Google App Engine.
+
+[App Engine standard environment][appengine-std] users: See tutorial [Integrating with Google Analytics][std-tutorial] for more information on running and deploying this app.
+
+[App Engine flexible environment][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)
@@ -37,22 +40,27 @@ or with `yarn`:
 
     GA_TRACKING_ID=YOUR_TRACKING_ID yarn start
 
-## Deploying to App Engine
+## Deploying to App Engine standard Environment
 
-With `npm`:
+```
+gcloud app deploy app.standard.yaml
+```
 
-    npm run deploy
+## Deploying to App Engine flexible Environment
 
-or with `yarn`:
+```
+gcloud app deploy app.flexible.yaml
+```
 
-    yarn run deploy
 
 ## Running the tests
 
 See [Contributing][contributing].
 
-[appengine]: https://cloud.google.com/appengine/docs/flexible/nodejs
-[tutorial]: https://cloud.google.com/appengine/docs/flexible/nodejs/integrating-with-analytics
+[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/integrating-with-analytics
+[std-tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/integrating-with-analytics
 [readme]: ../README.md
 [tracking]: https://support.google.com/analytics/answer/1042508
 [contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md

appengine/analytics/app.standard.yaml

@@ -0,0 +1,21 @@
+# Copyright 2017, Google, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# [START app_yaml]
+runtime: nodejs8
+
+# [START env]
+env_variables:
+  GA_TRACKING_ID: YOUR_TRACKING_ID
+# [END env]
+# [END app_yaml]

appengine/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appengine-analytics",
-  "description": "Sample for Google Analytics Measurement Protocol on Google App Engine Flexible Environment.",
+  "description": "Sample for Google Analytics Measurement Protocol on Google App Engine.",
   "version": "0.0.1",
   "private": true,
   "license": "Apache-2.0",
@@ -10,16 +10,14 @@
     "url": "https://github.com/GoogleCloudPlatform/nodejs-docs-samples.git"
   },
   "engines": {
-    "node": ">=4"
+    "node": "8.x.x"
   },
   "scripts": {
-    "deploy": "gcloud app deploy",
     "start": "node app.js",
     "lint": "repo-tools lint",
     "pretest": "npm run lint",
     "system-test": "repo-tools test app",
-    "test": "npm run system-test",
-    "e2e-test": "repo-tools test deploy"
+    "test": "npm run system-test"
   },
   "dependencies": {
     "express": "4.16.2",

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

@@ -0,0 +1,38 @@
+# Writing Your Web Service Sample for Node.js in the App Engine Standard Environment
+
+This is the sample application for the
+[Writing Your Web Service with Node.js][tutorial]
+tutorial found in the [Google App Engine Node.js standard environment][appengine]
+documentation.
+
+* [Setup](#setup)
+* [Running locally](#running-locally)
+* [Deploying to App Engine](#deploying-to-app-engine)
+* [Running the tests](#running-the-tests)
+
+## Setup
+
+Before you can run or deploy the sample, you need to do the following:
+
+1.  Refer to the [appengine/README.md][readme] file for instructions on
+    running and deploying.
+1.  Install dependencies:
+
+        npm install
+
+## Running locally
+
+    npm start
+
+## Deploying to App Engine
+
+    gcloud app deploy
+
+## Running the tests
+
+See [Contributing][contributing].
+
+[appengine]: https://cloud.google.com/appengine/docs/standard/nodejs
+[tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/building-app/writing-web-service
+[readme]: ../../README.md
+[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md

appengine/building-an-app/build/app.yaml

@@ -0,0 +1,16 @@
+# Copyright 2018, Google, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# [START app_yaml]
+runtime: nodejs8
+# [END app_yaml]

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

@@ -0,0 +1,43 @@
+{
+  "name": "appengine-standard-getting-started-build-apps",
+  "version": "0.0.1",
+  "description": "Node.js getting started sample for building an app on App Engine standard environment.",
+  "private": true,
+  "main": "server.js",
+  "scripts": {
+    "start": "node server.js",
+    "deploy": "gcloud app deploy",
+    "lint": "samples lint",
+    "pretest": "npm run lint",
+    "test": "samples test app"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/GoogleCloudPlatform/nodejs-docs-samples.git"
+  },
+  "engines": {
+    "node": "8.x.x"
+  },
+  "author": "Google Inc.",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "express": "^4.16.3"
+  },
+  "devDependencies": {
+    "@google-cloud/nodejs-repo-tools": "1.4.17",
+    "ava": "0.22.0",
+    "semistandard": "^12.0.1"
+  },
+  "cloud-repo-tools": {
+    "requiresKeyFile": false,
+    "requiresProjectId": false,
+    "test": {
+      "app": {
+        "args": [
+          "server.js"
+        ],
+        "msg": "Hello from App Engine!"
+      }
+    }
+  }
+}

appengine/building-an-app/build/server.js

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018, Google, Inc.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+// [START app]
+const express = require('express');
+const app = express();
+
+app.get('/', (req, res) => {
+  res.send('Hello from App Engine!');
+});
+
+// Listen to the App Engine-specified port, or 8080 otherwise
+const PORT = process.env.PORT || 8080;
+app.listen(PORT, () => {
+  console.log(`Server listening on port ${PORT}...`);
+});
+// [END app]
+
+module.exports = app;

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

@@ -0,0 +1,38 @@
+# Updating Your Web Service Sample for Node.js in the App Engine Standard Environment
+
+This is the sample application for the
+[Updating Your Web Service][tutorial]
+tutorial found in the [Google App Engine Node.js standard environment][appengine]
+documentation.
+
+* [Setup](#setup)
+* [Running locally](#running-locally)
+* [Deploying to App Engine](#deploying-to-app-engine)
+* [Running the tests](#running-the-tests)
+
+## Setup
+
+Before you can run or deploy the sample, you need to do the following:
+
+1.  Refer to the [appengine/README.md][readme] file for instructions on
+    running and deploying.
+1.  Install dependencies:
+
+        npm install
+
+## Running locally
+
+    npm start
+
+## Deploying to App Engine
+
+    gcloud app deploy
+
+## Running the tests
+
+See [Contributing][contributing].
+
+[appengine]: https://cloud.google.com/appengine/docs/standard/nodejs
+[tutorial]: https://cloud.google.com/appengine/docs/standard/nodejs/building-app/updating-web-service
+[readme]: ../../README.md
+[contributing]: https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/master/CONTRIBUTING.md

appengine/building-an-app/update/app.yaml

@@ -0,0 +1,16 @@
+# Copyright 2018, Google, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# [START app_yaml]
+runtime: nodejs8
+# [END app_yaml]

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

@@ -0,0 +1,33 @@
+{
+  "name": "appengine-standard-getting-started-update-apps",
+  "version": "0.0.1",
+  "description": "Node.js getting started sample for updating an app on App Engine standard environment.",
+  "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"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/GoogleCloudPlatform/nodejs-docs-samples.git"
+  },
+  "engines": {
+    "node": "8.x.x"
+  },
+  "author": "Google Inc.",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "body-parser": "^1.18.2",
+    "express": "^4.16.3",
+    "semistandard": "^12.0.1"
+  },
+  "devDependencies": {
+    "@google-cloud/nodejs-repo-tools": "1.4.17",
+    "ava": "0.22.0",
+    "semistandard": "^12.0.1"
+  }
+}