diff --git a/package.json b/package.json index 4bcdee7..7752d0d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "rowy-backend", "description": "cloud run instance for running Rowy's backend functionality", - "version": "1.7.3", + "version": "1.7.4", "private": true, "main": "build/index.js", "scripts": { diff --git a/src/functionBuilder/functions/package.json b/src/functionBuilder/functions/package.json index dc3cb0e..c23c624 100644 --- a/src/functionBuilder/functions/package.json +++ b/src/functionBuilder/functions/package.json @@ -12,7 +12,6 @@ "@google-cloud/logging": "^10.3.1", "@google-cloud/secret-manager": "^4.1.4", "@google-cloud/storage": "6.7.0", - "axios": "^1.2.0", "file-type": "^16.5.3", "firebase-admin": "^11.3.0", "firebase-functions": "^4.1.0", diff --git a/src/functionBuilder/functions/src/logging/index.ts b/src/functionBuilder/functions/src/logging/index.ts index a9fc10c..32feab1 100644 --- a/src/functionBuilder/functions/src/logging/index.ts +++ b/src/functionBuilder/functions/src/logging/index.ts @@ -1,5 +1,4 @@ import { Logging } from "@google-cloud/logging"; -import { getProjectId } from "../utils/metadataService"; type FunctionType = "derivative-function" | "extension" | "defaultValue"; type IExtensionSource = "condition" | "function"; @@ -16,7 +15,7 @@ class LoggingFactory { rowId: string, tablePath: string ) { - const projectId = await getProjectId(); + const projectId = process.env.GCLOUD_PROJECT; return new LoggingDerivative( projectId, fieldName, @@ -32,7 +31,7 @@ class LoggingFactory { extensionName: string, tablePath: string ) { - const projectId = await getProjectId(); + const projectId = process.env.GCLOUD_PROJECT; return new LoggingExtension( projectId, extensionType, @@ -47,7 +46,7 @@ class LoggingFactory { rowId: string, tablePath: string ) { - const projectId = await getProjectId(); + const projectId = process.env.GCLOUD_PROJECT; return new LoggingDefaultValue( projectId, fieldName, diff --git a/src/functionBuilder/functions/src/utils/metadataService.ts b/src/functionBuilder/functions/src/utils/metadataService.ts deleted file mode 100644 index 543755a..0000000 --- a/src/functionBuilder/functions/src/utils/metadataService.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Request, Response } from "express"; -import axios from "axios"; - -const axiosInstance = axios.create({ - baseURL: "http://metadata.google.internal/", - timeout: 1000, - headers: { "Metadata-Flavor": "Google" }, -}); - -export const metadataService = (req: Request, res: Response) => { - let path = - req.query.path || - "computeMetadata/v1/instance/service-accounts/default/scopes"; - axiosInstance.get(path as string).then((response) => { - res.send({ data: response.data }); - }); -}; - -export const getProjectId = async () => - (await axiosInstance.get("computeMetadata/v1/project/project-id")).data; -export const getNumericProjectId = async () => - (await axiosInstance.get("computeMetadata/v1/project/numeric-project-id")) - .data; - -export const getServiceAccountEmail = async () => - ( - await axiosInstance.get("computeMetadata/v1/instance/service-accounts") - ).data.split("\n")[1]; - -export const generateServiceAccessToken = async (audience: string) => - ( - await axiosInstance.get( - `computeMetadata/v1/instance/service-accounts/default/identity?audience=${audience}` - ) - ).data; -//https://www.googleapis.com/oauth2/v1/certs diff --git a/src/functionBuilder/functions/yarn.lock b/src/functionBuilder/functions/yarn.lock index 163da23..2791a7b 100644 --- a/src/functionBuilder/functions/yarn.lock +++ b/src/functionBuilder/functions/yarn.lock @@ -453,20 +453,6 @@ async-retry@^1.3.3: dependencies: retry "0.13.1" -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -axios@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz" - integrity sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw== - dependencies: - follow-redirects "^1.15.0" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" @@ -564,13 +550,6 @@ color-name@~1.1.4: resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - compressible@^2.0.12: version "2.0.18" resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz" @@ -639,11 +618,6 @@ deep-is@~0.1.3: resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" @@ -901,20 +875,6 @@ firebase-functions@^4.1.0: express "^4.17.1" node-fetch "^2.6.7" -follow-redirects@^1.15.0: - version "1.15.2" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - forwarded@~0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz" @@ -1425,11 +1385,6 @@ mime-db@1.44.0: resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz" integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - "mime-db@>= 1.43.0 < 2": version "1.45.0" resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz" @@ -1442,13 +1397,6 @@ mime-types@^2.0.8, mime-types@~2.1.24: dependencies: mime-db "1.44.0" -mime-types@^2.1.12: - version "2.1.35" - resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - mime@1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" @@ -1649,11 +1597,6 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.1" -proxy-from-env@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"