From f201d50a3326994bf2f00d2cf856007ee5d734e5 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Wed, 9 May 2018 17:46:20 -0700 Subject: [PATCH 01/11] Update server.js `/computeMetadata/v1/instance/network-interfaces` is not support in standard. --- appengine/metadata/standard/server.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/appengine/metadata/standard/server.js b/appengine/metadata/standard/server.js index 7ea0a849e0..27e5aae3b1 100644 --- a/appengine/metadata/standard/server.js +++ b/appengine/metadata/standard/server.js @@ -22,31 +22,32 @@ 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_PROJECT_ID_URL = 'http://metadata.google.internal/computeMetadata/' + + 'v1/project/project-id'; -function getExternalIp () { +function getProjectId () { const options = { headers: { 'Metadata-Flavor': 'Google' }, - json: true + json: false }; - return request(METADATA_NETWORK_INTERFACE_URL, options) + return request(METADATA_PROJECT_ID_URL, options) .then((response) => response.body) .catch((err) => { if (err && err.statusCode !== 200) { - console.log('Error while talking to metadata server, assuming localhost'); - return 'localhost'; + console.log('Error while talking to metadata server, assuming UnknownProjectID'); + return 'UnknownProjectID'; } return Promise.reject(err); }); } app.get('/', (req, res, next) => { - getExternalIp() - .then((externalIp) => { - res.status(200).send(`External IP: ${externalIp}`).end(); + getProjectId() + .then((projectId) => { + res.status(200).send(`Project ID: ${projectId}`).end(); }) .catch(next); }); From c43ea2702ede1de726f60e9fb98b5db3eaf2e848 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Thu, 17 May 2018 15:38:58 -0700 Subject: [PATCH 02/11] Update server.js --- appengine/metadata/standard/server.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/appengine/metadata/standard/server.js b/appengine/metadata/standard/server.js index 27e5aae3b1..1b59423295 100644 --- a/appengine/metadata/standard/server.js +++ b/appengine/metadata/standard/server.js @@ -22,23 +22,20 @@ const request = require('got'); const app = express(); app.enable('trust proxy'); -const METADATA_PROJECT_ID_URL = 'http://metadata.google.internal/computeMetadata/' + - 'v1/project/project-id'; +const METADATA_PROJECT_ID_URL = 'http://metadata.google.internal/computeMetadata/v1/project/project-id'; function getProjectId () { const options = { headers: { 'Metadata-Flavor': 'Google' - }, - json: false + } }; return request(METADATA_PROJECT_ID_URL, options) .then((response) => response.body) .catch((err) => { if (err && err.statusCode !== 200) { - console.log('Error while talking to metadata server, assuming UnknownProjectID'); - return 'UnknownProjectID'; + console.log('Error while talking to metadata server.'); } return Promise.reject(err); }); From 2c72a06ba769a000c7ef9f042a83228e2ff50268 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 15:20:38 -0700 Subject: [PATCH 03/11] Update server.js --- appengine/metadata/standard/server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/appengine/metadata/standard/server.js b/appengine/metadata/standard/server.js index 1b59423295..e25243dcdc 100644 --- a/appengine/metadata/standard/server.js +++ b/appengine/metadata/standard/server.js @@ -36,6 +36,7 @@ function getProjectId () { .catch((err) => { if (err && err.statusCode !== 200) { console.log('Error while talking to metadata server.'); + return "Unknown_Project_ID"; } return Promise.reject(err); }); From 262c6c412ee2cf5a24a05dcbe1a2d43cf3a60d50 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 15:21:36 -0700 Subject: [PATCH 04/11] Update package.json --- appengine/metadata/standard/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/metadata/standard/package.json b/appengine/metadata/standard/package.json index 79e55be338..3608fbbb70 100644 --- a/appengine/metadata/standard/package.json +++ b/appengine/metadata/standard/package.json @@ -28,7 +28,7 @@ "cloud-repo-tools": { "test": { "app": { - "msg": "External IP:", + "msg": "Project ID:", "args": [ "server.js" ] From c11778e40d1d7c16dfe8d766d917d720e44e2922 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 15:22:08 -0700 Subject: [PATCH 05/11] Update circle.yml --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 455873585e..3e5d0b82a1 100644 --- a/circle.yml +++ b/circle.yml @@ -101,7 +101,8 @@ deployment: - node scripts/build "appengine/errorreporting" - node scripts/build "appengine/hello-world" - node scripts/build "appengine/mailjet" - - node scripts/build "appengine/metadata" + - node scripts/build "appengine/metadata/flexible" + - node scripts/build "appengine/metadata/standard" - node scripts/build "appengine/static-files" - GCLOUD_STORAGE_BUCKET=docs-samples-gae-test-$(uuid); node scripts/build "appengine/storage" - node scripts/build "auth" From 1a009c2dbfbf5edf7ce3e660bad317cd719802e6 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 15:51:42 -0700 Subject: [PATCH 06/11] Lint --- appengine/metadata/standard/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/metadata/standard/server.js b/appengine/metadata/standard/server.js index e25243dcdc..98e1a99e96 100644 --- a/appengine/metadata/standard/server.js +++ b/appengine/metadata/standard/server.js @@ -36,7 +36,7 @@ function getProjectId () { .catch((err) => { if (err && err.statusCode !== 200) { console.log('Error while talking to metadata server.'); - return "Unknown_Project_ID"; + return 'Unknown_Project_ID'; } return Promise.reject(err); }); From 2c947cb8bd98180eb57bdf23b773cab2d977ade8 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 16:33:56 -0700 Subject: [PATCH 07/11] Update package.json --- appengine/metadata/standard/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/appengine/metadata/standard/package.json b/appengine/metadata/standard/package.json index 3608fbbb70..6f42825c97 100644 --- a/appengine/metadata/standard/package.json +++ b/appengine/metadata/standard/package.json @@ -13,6 +13,7 @@ "node": "8.x.x" }, "scripts": { + "start": "node app.js", "lint": "samples lint", "pretest": "npm run lint", "system-test": "samples test app", From ffbc2c7e2f123e6d6764c924bbdd64f8114e94ec Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 16:34:13 -0700 Subject: [PATCH 08/11] Rename server.js to app.js --- appengine/metadata/standard/{server.js => app.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename appengine/metadata/standard/{server.js => app.js} (100%) diff --git a/appengine/metadata/standard/server.js b/appengine/metadata/standard/app.js similarity index 100% rename from appengine/metadata/standard/server.js rename to appengine/metadata/standard/app.js From 2fda19efc285af48068eb4c3851256e982722bf8 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 16:36:32 -0700 Subject: [PATCH 09/11] Update package.json --- appengine/metadata/standard/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/appengine/metadata/standard/package.json b/appengine/metadata/standard/package.json index 6f42825c97..a5edc5eec0 100644 --- a/appengine/metadata/standard/package.json +++ b/appengine/metadata/standard/package.json @@ -29,10 +29,7 @@ "cloud-repo-tools": { "test": { "app": { - "msg": "Project ID:", - "args": [ - "server.js" - ] + "msg": "Project ID:" } }, "requiresKeyFile": false, From f28c0f91312836b43f0e658dc8906169c2a00249 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 17:20:19 -0700 Subject: [PATCH 10/11] Update package.json --- appengine/metadata/standard/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/metadata/standard/package.json b/appengine/metadata/standard/package.json index a5edc5eec0..2be13d092f 100644 --- a/appengine/metadata/standard/package.json +++ b/appengine/metadata/standard/package.json @@ -1,5 +1,5 @@ { - "name": "appengine-metadata", + "name": "appengine-std-metadata", "description": "Sample for accessing the Compute metadata server on GAE Standard Environment.", "version": "0.0.1", "private": true, From 46b16b6e611143e21d4691cbbb8a2dc1c7f67c82 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Tue, 22 May 2018 17:54:41 -0700 Subject: [PATCH 11/11] Update package.json --- appengine/metadata/standard/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/metadata/standard/package.json b/appengine/metadata/standard/package.json index 2be13d092f..639500fd21 100644 --- a/appengine/metadata/standard/package.json +++ b/appengine/metadata/standard/package.json @@ -14,9 +14,9 @@ }, "scripts": { "start": "node app.js", - "lint": "samples lint", + "lint": "repo-tools lint", "pretest": "npm run lint", - "system-test": "samples test app", + "system-test": "repo-tools test app", "test": "npm run system-test" }, "dependencies": {