firebase-tools 10.1.2 → 10.1.3

package/lib/gcp/runtimeconfig.js

@@ -1,30 +1,25 @@
 "use strict";
-var api = require("../api");
-var utils = require("../utils");
+const { runtimeconfigOrigin } = require("../api");
+const { Client } = require("../apiv2");
 const { logger } = require("../logger");
 var _ = require("lodash");
-var API_VERSION = "v1beta1";
+const API_VERSION = "v1beta1";
+const apiClient = new Client({ urlPrefix: runtimeconfigOrigin, apiVersion: API_VERSION });
 function _listConfigs(projectId) {
-    return api
-        .request("GET", utils.endpoint([API_VERSION, "projects", projectId, "configs"]), {
-        auth: true,
-        origin: api.runtimeconfigOrigin,
+    return apiClient
+        .get(`/projects/${projectId}/configs`, {
         retryCodes: [500, 503],
     })
         .then(function (resp) {
-        return Promise.resolve(resp.body.configs);
+        return resp.body.configs;
     });
 }
 function _createConfig(projectId, configId) {
     var path = _.join(["projects", projectId, "configs"], "/");
-    var endpoint = utils.endpoint([API_VERSION, path]);
-    return api
-        .request("POST", endpoint, {
-        auth: true,
-        origin: api.runtimeconfigOrigin,
-        data: {
-            name: path + "/" + configId,
-        },
+    return apiClient
+        .post(`/projects/${projectId}/configs`, {
+        name: path + "/" + configId,
+    }, {
         retryCodes: [500, 503],
     })
         .catch(function (err) {
@@ -35,10 +30,8 @@ function _createConfig(projectId, configId) {
     });
 }
 function _deleteConfig(projectId, configId) {
-    return api
-        .request("DELETE", utils.endpoint([API_VERSION, "projects", projectId, "configs", configId]), {
-        auth: true,
-        origin: api.runtimeconfigOrigin,
+    return apiClient
+        .delete(`/projects/${projectId}/configs/${configId}`, {
         retryCodes: [500, 503],
     })
         .catch(function (err) {
@@ -50,10 +43,8 @@ function _deleteConfig(projectId, configId) {
     });
 }
 function _listVariables(configPath) {
-    return api
-        .request("GET", utils.endpoint([API_VERSION, configPath, "variables"]), {
-        auth: true,
-        origin: api.runtimeconfigOrigin,
+    return apiClient
+        .get(`${configPath}/variables`, {
         retryCodes: [500, 503],
     })
         .then(function (resp) {
@@ -61,10 +52,8 @@ function _listVariables(configPath) {
     });
 }
 function _getVariable(varPath) {
-    return api
-        .request("GET", utils.endpoint([API_VERSION, varPath]), {
-        auth: true,
-        origin: api.runtimeconfigOrigin,
+    return apiClient
+        .get(varPath, {
         retryCodes: [500, 503],
     })
         .then(function (resp) {
@@ -72,16 +61,12 @@ function _getVariable(varPath) {
     });
 }
 function _createVariable(projectId, configId, varId, value) {
-    var path = _.join(["projects", projectId, "configs", configId, "variables"], "/");
-    var endpoint = utils.endpoint([API_VERSION, path]);
-    return api
-        .request("POST", endpoint, {
-        auth: true,
-        origin: api.runtimeconfigOrigin,
-        data: {
-            name: path + "/" + varId,
-            text: value,
-        },
+    const path = `/projects/${projectId}/configs/${configId}/variables`;
+    return apiClient
+        .post(path, {
+        name: `${path}/${varId}`,
+        text: value,
+    }, {
         retryCodes: [500, 503],
     })
         .catch(function (err) {
@@ -94,15 +79,11 @@ function _createVariable(projectId, configId, varId, value) {
     });
 }
 function _updateVariable(projectId, configId, varId, value) {
-    var path = _.join(["projects", projectId, "configs", configId, "variables", varId], "/");
-    var endpoint = utils.endpoint([API_VERSION, path]);
-    return api.request("PUT", endpoint, {
-        auth: true,
-        origin: api.runtimeconfigOrigin,
-        data: {
-            name: path,
-            text: value,
-        },
+    const path = `/projects/${projectId}/configs/${configId}/variables/${varId}`;
+    return apiClient.put(path, {
+        name: path,
+        text: value,
+    }, {
         retryCodes: [500, 503],
     });
 }
@@ -120,13 +101,10 @@ function _setVariable(projectId, configId, varId, value) {
     });
 }
 function _deleteVariable(projectId, configId, varId) {
-    var endpoint = utils.endpoint([API_VERSION, "projects", projectId, "configs", configId, "variables", varId]) +
-        "?recursive=true";
-    return api
-        .request("DELETE", endpoint, {
-        auth: true,
-        origin: api.runtimeconfigOrigin,
+    return apiClient
+        .delete(`/projects/${projectId}/configs/${configId}/variables/${varId}`, {
         retryCodes: [500, 503],
+        queryParams: { recursive: "true" },
     })
         .catch(function (err) {
         if (_.get(err, "context.response.statusCode") === 404) {

package/lib/gcp/secretManager.js

@@ -2,33 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grantServiceAgentRole = exports.addVersion = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.getSecretVersion = exports.getSecret = exports.listSecrets = exports.secretManagerConsoleUri = void 0;
 const utils_1 = require("../utils");
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const secretManagerConsoleUri = (projectId) => `https://console.cloud.google.com/security/secret-manager?project=${projectId}`;
 exports.secretManagerConsoleUri = secretManagerConsoleUri;
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.secretManagerOrigin, apiVersion: "v1beta1" });
 async function listSecrets(projectId) {
-    const listRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-    });
+    const listRes = await apiClient.get(`/projects/${projectId}/secrets`);
     return listRes.body.secrets.map((s) => parseSecretResourceName(s.name));
 }
 exports.listSecrets = listSecrets;
 async function getSecret(projectId, name) {
     var _a;
-    const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-    });
+    const getRes = await apiClient.get(`/projects/${projectId}/secrets/${name}`);
     const secret = parseSecretResourceName(getRes.body.name);
     secret.labels = (_a = getRes.body.labels) !== null && _a !== void 0 ? _a : {};
     return secret;
 }
 exports.getSecret = getSecret;
 async function getSecretVersion(projectId, name, version) {
-    const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}/versions/${version}`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-    });
+    const getRes = await apiClient.get(`/projects/${projectId}/secrets/${name}/versions/${version}`);
     return parseSecretVersionResourceName(getRes.body.name);
 }
 exports.getSecretVersion = getSecretVersion;
@@ -69,27 +62,19 @@ function toSecretVersionResourceName(secretVersion) {
 }
 exports.toSecretVersionResourceName = toSecretVersionResourceName;
 async function createSecret(projectId, name, labels) {
-    const createRes = await api.request("POST", `/v1beta1/projects/${projectId}/secrets?secretId=${name}`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-        data: {
-            replication: {
-                automatic: {},
-            },
-            labels,
+    const createRes = await apiClient.post(`/projects/${projectId}/secrets`, {
+        replication: {
+            automatic: {},
         },
-    });
+        labels,
+    }, { queryParams: { secretId: name } });
     return parseSecretResourceName(createRes.body.name);
 }
 exports.createSecret = createSecret;
 async function addVersion(secret, payloadData) {
-    const res = await api.request("POST", `/v1beta1/projects/${secret.projectId}/secrets/${secret.name}:addVersion`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-        data: {
-            payload: {
-                data: Buffer.from(payloadData).toString("base64"),
-            },
+    const res = await apiClient.post(`/projects/${secret.projectId}/secrets/${secret.name}:addVersion`, {
+        payload: {
+            data: Buffer.from(payloadData).toString("base64"),
         },
     });
     const nameTokens = res.body.name.split("/");
@@ -103,10 +88,7 @@ async function addVersion(secret, payloadData) {
 }
 exports.addVersion = addVersion;
 async function grantServiceAgentRole(secret, serviceAccountEmail, role) {
-    const getPolicyRes = await api.request("GET", `/v1beta1/projects/${secret.projectId}/secrets/${secret.name}:getIamPolicy`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-    });
+    const getPolicyRes = await apiClient.get(`/projects/${secret.projectId}/secrets/${secret.name}:getIamPolicy`);
     const bindings = getPolicyRes.body.bindings || [];
     if (bindings.find((b) => b.role == role &&
         b.members.find((m) => m == `serviceAccount:${serviceAccountEmail}`))) {
@@ -116,16 +98,12 @@ async function grantServiceAgentRole(secret, serviceAccountEmail, role) {
         role: role,
         members: [`serviceAccount:${serviceAccountEmail}`],
     });
-    await api.request("POST", `/v1beta1/projects/${secret.projectId}/secrets/${secret.name}:setIamPolicy`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-        data: {
-            policy: {
-                bindings,
-            },
-            updateMask: {
-                paths: "bindings",
-            },
+    await apiClient.post(`/projects/${secret.projectId}/secrets/${secret.name}:setIamPolicy`, {
+        policy: {
+            bindings,
+        },
+        updateMask: {
+            paths: "bindings",
         },
     });
     (0, utils_1.logLabeledSuccess)("SecretManager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmail}`);

package/lib/gcp/storage.js

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceAccount = exports.getBucket = exports.deleteObject = exports.uploadObject = exports.upload = exports.getDefaultBucket = void 0;
 const path = require("path");
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
+const storageAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin, apiVersion: "v1" });
 async function getDefaultBucket(projectId) {
     try {
-        const resp = await api.request("GET", "/v1/apps/" + projectId, {
-            auth: true,
-            origin: api.appengineOrigin,
-        });
+        const resp = await storageAPIClient.get(`/apps/${projectId}`);
         if (resp.body.defaultBucket === "undefined") {
             logger_1.logger.debug("Default storage bucket is undefined.");
             throw new error_1.FirebaseError("Your project is being set up. Please wait a minute before deploying again.");
@@ -25,15 +24,17 @@ async function getDefaultBucket(projectId) {
 exports.getDefaultBucket = getDefaultBucket;
 async function upload(source, uploadUrl, extraHeaders) {
     const url = new URL(uploadUrl);
-    const result = await api.request("PUT", url.pathname + url.search, {
-        data: source.stream,
-        headers: Object.assign({ "Content-Type": "application/zip" }, extraHeaders),
-        json: false,
-        origin: url.origin,
-        logOptions: { skipRequestBody: true },
+    const localAPIClient = new apiv2_1.Client({ urlPrefix: url.origin, auth: false });
+    const res = await localAPIClient.request({
+        method: "PUT",
+        path: url.pathname,
+        queryParams: url.searchParams,
+        headers: Object.assign({ "content-type": "application/zip" }, extraHeaders),
+        body: source.stream,
+        skipLog: { resBody: true },
     });
     return {
-        generation: result.response.headers["x-goog-generation"],
+        generation: res.response.headers.get("x-goog-generation"),
     };
 }
 exports.upload = upload;
@@ -42,37 +43,33 @@ async function uploadObject(source, bucketName) {
         throw new error_1.FirebaseError(`Expected a file name ending in .zip, got ${source.file}`);
     }
     const location = `/${bucketName}/${path.basename(source.file)}`;
-    const result = await api.request("PUT", location, {
-        auth: true,
-        data: source.stream,
+    const res = await storageAPIClient.request({
+        method: "PUT",
+        path: location,
         headers: {
             "Content-Type": "application/zip",
             "x-goog-content-length-range": "0,123289600",
         },
-        json: false,
-        origin: api.storageOrigin,
-        logOptions: { skipRequestBody: true },
+        body: source.stream,
     });
     return {
         bucket: bucketName,
         object: path.basename(source.file),
-        generation: result.response.headers["x-goog-generation"],
+        generation: res.response.headers.get("x-goog-generation"),
     };
 }
 exports.uploadObject = uploadObject;
 function deleteObject(location) {
-    return api.request("DELETE", location, {
+    return api_1.default.request("DELETE", location, {
         auth: true,
-        origin: api.storageOrigin,
+        origin: api_1.default.storageOrigin,
     });
 }
 exports.deleteObject = deleteObject;
 async function getBucket(bucketName) {
     try {
-        const result = await api.request("GET", `/storage/v1/b/${bucketName}`, {
-            auth: true,
-            origin: api.storageOrigin,
-        });
+        const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
+        const result = await localAPIClient.get(`/storage/v1/b/${bucketName}`);
         return result.body;
     }
     catch (err) {
@@ -85,10 +82,8 @@ async function getBucket(bucketName) {
 exports.getBucket = getBucket;
 async function getServiceAccount(projectId) {
     try {
-        const response = await api.request("GET", `/storage/v1/projects/${projectId}/serviceAccount`, {
-            auth: true,
-            origin: api.storageOrigin,
-        });
+        const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
+        const response = await localAPIClient.get(`/storage/v1/projects/${projectId}/serviceAccount`);
         return response.body;
     }
     catch (err) {