Skip to content

Commit bce81f4

Browse files
author
chenyumic
authored
Update appengine/metadata/standard sample (#624)
* Update appengine/metadata/standard sample * Fix the test
1 parent 5091a97 commit bce81f4

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

appengine/metadata/standard/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"scripts": {
1616
"lint": "samples lint",
1717
"pretest": "npm run lint",
18-
"system-test": "samples test app",
18+
"system-test": "samples test app -- ./server.js",
1919
"test": "npm run system-test"
2020
},
2121
"dependencies": {
@@ -28,7 +28,7 @@
2828
"cloud-repo-tools": {
2929
"test": {
3030
"app": {
31-
"msg": "External IP:",
31+
"msg": "Project ID:",
3232
"args": [
3333
"server.js"
3434
]

appengine/metadata/standard/server.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,30 @@ const request = require('got');
2222
const app = express();
2323
app.enable('trust proxy');
2424

25-
const METADATA_NETWORK_INTERFACE_URL = 'http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip';
25+
const METADATA_PROJECT_ID_URL = 'http://metadata.google.internal/computeMetadata/v1/project/project-id';
2626

27-
function getExternalIp () {
27+
function getProjectId () {
2828
const options = {
2929
headers: {
3030
'Metadata-Flavor': 'Google'
31-
},
32-
json: true
31+
}
3332
};
3433

35-
return request(METADATA_NETWORK_INTERFACE_URL, options)
34+
return request(METADATA_PROJECT_ID_URL, options)
3635
.then((response) => response.body)
3736
.catch((err) => {
3837
if (err && err.statusCode !== 200) {
39-
console.log('Error while talking to metadata server, assuming localhost');
40-
return 'localhost';
38+
console.log('Error while talking to metadata server.');
39+
return 'Unknown_Project_ID';
4140
}
4241
return Promise.reject(err);
4342
});
4443
}
4544

4645
app.get('/', (req, res, next) => {
47-
getExternalIp()
48-
.then((externalIp) => {
49-
res.status(200).send(`External IP: ${externalIp}`).end();
46+
getProjectId()
47+
.then((projectId) => {
48+
res.status(200).send(`Project ID: ${projectId}`).end();
5049
})
5150
.catch(next);
5251
});

circle.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ deployment:
101101
- node scripts/build "appengine/errorreporting"
102102
- node scripts/build "appengine/hello-world"
103103
- node scripts/build "appengine/mailjet"
104-
- node scripts/build "appengine/metadata"
104+
- node scripts/build "appengine/metadata/flexible"
105+
- node scripts/build "appengine/metadata/standard"
105106
- node scripts/build "appengine/static-files"
106107
- GCLOUD_STORAGE_BUCKET=docs-samples-gae-test-$(uuid); node scripts/build "appengine/storage"
107108
- node scripts/build "auth"

0 commit comments

Comments
 (0)