switch to @nitra/gcp-metadata

nitra · Apr 22, 2023 · f8deaba · f8deaba
1 parent e41b17f
commit f8deaba
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nitra/bunyan",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "cloud run logger",
   "type": "module",
   "licenses": [
@@ -16,6 +16,7 @@
   "keywords": [
     "bunyan",
     "cloud run",
+    "cloud run job",
     "nitra"
   ],
   "scripts": {
@@ -49,8 +50,8 @@
   ],
   "dependencies": {
     "@google-cloud/logging-bunyan": "^4.2.2",
+    "@nitra/gcp-metadata": "^1.0.1",
     "bunyan": "^1.8.15",
-    "bunyan-debug-stream": "^3.0.2",
-    "gcp-metadata": "^5.0.0"
+    "bunyan-debug-stream": "^3.0.2"
   }
 }
diff --git a/src/job.js b/src/job.js
@@ -1,12 +1,12 @@
 import bunyan from 'bunyan'
 import { loggerOption, traceKey } from './options.js'
-import gcpMetadata from 'gcp-metadata'
+import { getProjectId } from '@nitra/gcp-metadata'
 
 const log = bunyan.createLogger(loggerOption)
 
 let logE
 if (traceKey) {
-  const projectId = await gcpMetadata.project('project-id')
+  const projectId = await getProjectId()
   logE = log.child({ [traceKey]: `projects/${projectId}/traces/${process.env.CLOUD_RUN_EXECUTION}` }, true)
 } else {
   logE = log

diff --git a/src/trace.js b/src/trace.js
@@ -1,10 +1,10 @@
 import { traceKey } from './options.js'
 import log from './index.js'
-import gcpMetadata from 'gcp-metadata'
+import { getProjectId } from '@nitra/gcp-metadata'
 
 let projectId
 if (traceKey) {
-  projectId = await gcpMetadata.project('project-id')
+  projectId = await getProjectId()
 }
 
 export default req => {

diff --git a/yarn.lock b/yarn.lock
@@ -154,6 +154,13 @@
     eslint-plugin-security "^1.4.0"
     eslint-plugin-vue "^8.3.0"
 
+"@nitra/gcp-metadata@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@nitra/gcp-metadata/-/gcp-metadata-1.0.1.tgz#9b02c4d085fdca6df853a072afd58958c004d389"
+  integrity sha512-l6/wJWgBdtmje2vUWTNAocIWTvwiWmTy18+nPF6I4KfVg10Xa1KevO9HQxdjt2PH6VyhpFiWRqUykPCDHdLjCg==
+  dependencies:
+    gcp-metadata "^5.2.0"
+
 "@nitra/prettier-config@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@nitra/prettier-config/-/prettier-config-1.0.0.tgz#f45519d5f85820b2c45981865b13ff4d360e4c0f"
@@ -1142,6 +1149,14 @@ gcp-metadata@^5.0.0:
     gaxios "^5.0.0"
     json-bigint "^1.0.0"
 
+gcp-metadata@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.2.0.tgz#b4772e9c5976241f5d3e69c4f446c906d25506ec"
+  integrity sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw==
+  dependencies:
+    gaxios "^5.0.0"
+    json-bigint "^1.0.0"
+
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"