File tree 3 files changed +13
-13
lines changed
appengine/metadata/standard
3 files changed +13
-13
lines changed Original file line number Diff line number Diff line change 15
15
"scripts" : {
16
16
"lint" : " samples lint" ,
17
17
"pretest" : " npm run lint" ,
18
- "system-test" : " samples test app" ,
18
+ "system-test" : " samples test app -- ./server.js " ,
19
19
"test" : " npm run system-test"
20
20
},
21
21
"dependencies" : {
28
28
"cloud-repo-tools" : {
29
29
"test" : {
30
30
"app" : {
31
- "msg" : " External IP :" ,
31
+ "msg" : " Project ID :" ,
32
32
"args" : [
33
33
" server.js"
34
34
]
Original file line number Diff line number Diff line change @@ -22,31 +22,30 @@ const request = require('got');
22
22
const app = express ( ) ;
23
23
app . enable ( 'trust proxy' ) ;
24
24
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 ' ;
26
26
27
- function getExternalIp ( ) {
27
+ function getProjectId ( ) {
28
28
const options = {
29
29
headers : {
30
30
'Metadata-Flavor' : 'Google'
31
- } ,
32
- json : true
31
+ }
33
32
} ;
34
33
35
- return request ( METADATA_NETWORK_INTERFACE_URL , options )
34
+ return request ( METADATA_PROJECT_ID_URL , options )
36
35
. then ( ( response ) => response . body )
37
36
. catch ( ( err ) => {
38
37
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 ' ;
41
40
}
42
41
return Promise . reject ( err ) ;
43
42
} ) ;
44
43
}
45
44
46
45
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 ( ) ;
50
49
} )
51
50
. catch ( next ) ;
52
51
} ) ;
Original file line number Diff line number Diff line change @@ -101,7 +101,8 @@ deployment:
101
101
- node scripts/build "appengine/errorreporting"
102
102
- node scripts/build "appengine/hello-world"
103
103
- 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"
105
106
- node scripts/build "appengine/static-files"
106
107
- GCLOUD_STORAGE_BUCKET=docs-samples-gae-test-$(uuid); node scripts/build "appengine/storage"
107
108
- node scripts/build "auth"
You can’t perform that action at this time.
0 commit comments