firebase-tools 10.1.2 → 10.2.0

package/lib/gcp/iam.js

@@ -1,72 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRole = exports.deleteServiceAccount = exports.createServiceAccountKey = exports.getServiceAccount = exports.createServiceAccount = void 0;
-const api = require("../api");
-const utils_1 = require("../utils");
+const api_1 = require("../api");
 const lodash_1 = require("lodash");
 const logger_1 = require("../logger");
+const apiv2_1 = require("../apiv2");
 const API_VERSION = "v1";
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.iamOrigin, apiVersion: API_VERSION });
 async function createServiceAccount(projectId, accountId, description, displayName) {
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}/serviceAccounts`, {
-        auth: true,
-        origin: api.iamOrigin,
-        data: {
-            accountId,
-            serviceAccount: {
-                displayName,
-                description,
-            },
+    const response = await apiClient.post(`/projects/${projectId}/serviceAccounts`, {
+        accountId,
+        serviceAccount: {
+            displayName,
+            description,
         },
     });
     return response.body;
 }
 exports.createServiceAccount = createServiceAccount;
 async function getServiceAccount(projectId, serviceAccountName) {
-    const response = await api.request("GET", `/${API_VERSION}/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com`, {
-        auth: true,
-        origin: api.iamOrigin,
-    });
+    const response = await apiClient.get(`/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com`);
     return response.body;
 }
 exports.getServiceAccount = getServiceAccount;
 async function createServiceAccountKey(projectId, serviceAccountName) {
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com/keys`, {
-        auth: true,
-        origin: api.iamOrigin,
-        data: {
-            keyAlgorithm: "KEY_ALG_UNSPECIFIED",
-            privateKeyType: "TYPE_GOOGLE_CREDENTIALS_FILE",
-        },
+    const response = await apiClient.post(`/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com/keys`, {
+        keyAlgorithm: "KEY_ALG_UNSPECIFIED",
+        privateKeyType: "TYPE_GOOGLE_CREDENTIALS_FILE",
     });
     return response.body;
 }
 exports.createServiceAccountKey = createServiceAccountKey;
 function deleteServiceAccount(projectId, accountEmail) {
-    return api.request("DELETE", `/${API_VERSION}/projects/${projectId}/serviceAccounts/${accountEmail}`, {
-        auth: true,
-        origin: api.iamOrigin,
+    return apiClient.delete(`/projects/${projectId}/serviceAccounts/${accountEmail}`, {
         resolveOnHTTPError: true,
     });
 }
 exports.deleteServiceAccount = deleteServiceAccount;
 async function getRole(role) {
-    const response = await api.request("GET", (0, utils_1.endpoint)([API_VERSION, "roles", role]), {
-        auth: true,
-        origin: api.iamOrigin,
+    const response = await apiClient.get(`/roles/${role}`, {
         retryCodes: [500, 503],
     });
     return response.body;
 }
 exports.getRole = getRole;
 async function testResourceIamPermissions(origin, apiVersion, resourceName, permissions) {
+    const localClient = new apiv2_1.Client({ urlPrefix: origin, apiVersion });
     if (process.env.FIREBASE_SKIP_INFORMATIONAL_IAM) {
         logger_1.logger.debug("[iam] skipping informational check of permissions", JSON.stringify(permissions), "on resource", resourceName);
         return { allowed: permissions, missing: [], passed: true };
     }
-    const response = await api.request("POST", `/${apiVersion}/${resourceName}:testIamPermissions`, {
-        auth: true,
-        data: { permissions },
-        origin,
+    const response = await localClient.post(`/${resourceName}:testIamPermissions`, {
+        permissions,
     });
     const allowed = (response.body.permissions || []).sort();
     const missing = (0, lodash_1.difference)(permissions, allowed);
@@ -78,6 +63,6 @@ async function testResourceIamPermissions(origin, apiVersion, resourceName, perm
 }
 exports.testResourceIamPermissions = testResourceIamPermissions;
 async function testIamPermissions(projectId, permissions) {
-    return testResourceIamPermissions(api.resourceManagerOrigin, "v1", `projects/${projectId}`, permissions);
+    return testResourceIamPermissions(api_1.resourceManagerOrigin, "v1", `projects/${projectId}`, permissions);
 }
 exports.testIamPermissions = testIamPermissions;

package/lib/gcp/resourceManager.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServiceAccountToRoles = exports.setIamPolicy = exports.getIamPolicy = exports.firebaseRoles = void 0;
 const lodash_1 = require("lodash");
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const iam_1 = require("./iam");
 const API_VERSION = "v1";
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.resourceManagerOrigin, apiVersion: API_VERSION });
 exports.firebaseRoles = {
     apiKeysViewer: "roles/serviceusage.apiKeysViewer",
     authAdmin: "roles/firebaseauth.admin",
@@ -12,21 +14,14 @@ exports.firebaseRoles = {
     runViewer: "roles/run.viewer",
 };
 async function getIamPolicy(projectId) {
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}:getIamPolicy`, {
-        auth: true,
-        origin: api.resourceManagerOrigin,
-    });
+    const response = await apiClient.post(`/projects/${projectId}:getIamPolicy`);
     return response.body;
 }
 exports.getIamPolicy = getIamPolicy;
-async function setIamPolicy(projectId, newPolicy, updateMask) {
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}:setIamPolicy`, {
-        auth: true,
-        origin: api.resourceManagerOrigin,
-        data: {
-            policy: newPolicy,
-            updateMask: updateMask,
-        },
+async function setIamPolicy(projectId, newPolicy, updateMask = "") {
+    const response = await apiClient.post(`/projects/${projectId}:setIamPolicy`, {
+        policy: newPolicy,
+        updateMask: updateMask,
     });
     return response.body;
 }

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

@@ -1,37 +1,88 @@
 "use strict";
 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;
+exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
 const utils_1 = require("../utils");
-const api = require("../api");
+const error_1 = require("../error");
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
+const SECRET_NAME_REGEX = new RegExp("projects\\/" +
+    "(?<project>(?:\\d+)|(?:[A-Za-z]+[A-Za-z\\d-]*[A-Za-z\\d]?))\\/" +
+    "secrets\\/" +
+    "(?<secret>[A-Za-z\\d\\-_]+)");
+const SECRET_VERSION_NAME_REGEX = new RegExp(SECRET_NAME_REGEX.source + "\\/versions\\/" + "(?<version>latest|[0-9]+)");
 const secretManagerConsoleUri = (projectId) => `https://console.cloud.google.com/security/secret-manager?project=${projectId}`;
 exports.secretManagerConsoleUri = secretManagerConsoleUri;
-async function listSecrets(projectId) {
-    const listRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-    });
-    return listRes.body.secrets.map((s) => parseSecretResourceName(s.name));
-}
-exports.listSecrets = listSecrets;
+const API_VERSION = "v1";
+const client = new apiv2_1.Client({ urlPrefix: api_1.secretManagerOrigin, apiVersion: API_VERSION });
 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 client.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 listSecrets(projectId, filter) {
+    var _a;
+    const secrets = [];
+    const path = `projects/${projectId}/secrets`;
+    const baseOpts = filter ? { queryParams: { filter } } : {};
+    let pageToken = "";
+    while (true) {
+        const opts = pageToken === ""
+            ? baseOpts
+            : Object.assign(Object.assign({}, baseOpts), { queryParams: Object.assign(Object.assign({}, baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.queryParams), { pageToken }) });
+        const res = await client.get(path, opts);
+        for (const s of res.body.secrets) {
+            secrets.push(Object.assign(Object.assign({}, parseSecretResourceName(s.name)), { labels: (_a = s.labels) !== null && _a !== void 0 ? _a : {} }));
+        }
+        if (!res.body.nextPageToken) {
+            break;
+        }
+        pageToken = res.body.nextPageToken;
+    }
+    return secrets;
+}
+exports.listSecrets = listSecrets;
+async function listSecretVersions(projectId, name, filter) {
+    const secrets = [];
+    const path = `projects/${projectId}/secrets/${name}/versions`;
+    const baseOpts = filter ? { queryParams: { filter } } : {};
+    let pageToken = "";
+    while (true) {
+        const opts = pageToken === ""
+            ? baseOpts
+            : Object.assign(Object.assign({}, baseOpts), { queryParams: Object.assign(Object.assign({}, baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.queryParams), { pageToken }) });
+        const res = await client.get(path, opts);
+        for (const s of res.body.versions || []) {
+            secrets.push(Object.assign(Object.assign({}, parseSecretVersionResourceName(s.name)), { state: s.state }));
+        }
+        if (!res.body.nextPageToken) {
+            break;
+        }
+        pageToken = res.body.nextPageToken;
+    }
+    return secrets;
+}
+exports.listSecretVersions = listSecretVersions;
 async function getSecretVersion(projectId, name, version) {
-    const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}/versions/${version}`, {
-        auth: true,
-        origin: api.secretManagerOrigin,
-    });
-    return parseSecretVersionResourceName(getRes.body.name);
+    const getRes = await client.get(`projects/${projectId}/secrets/${name}/versions/${version}`);
+    return Object.assign(Object.assign({}, parseSecretVersionResourceName(getRes.body.name)), { state: getRes.body.state });
 }
 exports.getSecretVersion = getSecretVersion;
+async function accessSecretVersion(projectId, name, version) {
+    const res = await client.get(`projects/${projectId}/secrets/${name}/versions/${version}:access`);
+    return Buffer.from(res.body.payload.data, "base64").toString();
+}
+exports.accessSecretVersion = accessSecretVersion;
+async function destroySecretVersion(projectId, name, version) {
+    if (version === "latest") {
+        const sv = await getSecretVersion(projectId, name, "latest");
+        version = sv.versionId;
+    }
+    await client.post(`projects/${projectId}/secrets/${name}/versions/${version}:destroy`);
+}
+exports.destroySecretVersion = destroySecretVersion;
 async function secretExists(projectId, name) {
     try {
         await getSecret(projectId, name);
@@ -46,21 +97,27 @@ async function secretExists(projectId, name) {
 }
 exports.secretExists = secretExists;
 function parseSecretResourceName(resourceName) {
-    const nameTokens = resourceName.split("/");
+    const match = SECRET_NAME_REGEX.exec(resourceName);
+    if (!(match === null || match === void 0 ? void 0 : match.groups)) {
+        throw new error_1.FirebaseError(`Invalid secret resource name [${resourceName}].`);
+    }
     return {
-        projectId: nameTokens[1],
-        name: nameTokens[3],
+        projectId: match.groups.project,
+        name: match.groups.secret,
     };
 }
 exports.parseSecretResourceName = parseSecretResourceName;
 function parseSecretVersionResourceName(resourceName) {
-    const nameTokens = resourceName.split("/");
+    const match = resourceName.match(SECRET_VERSION_NAME_REGEX);
+    if (!(match === null || match === void 0 ? void 0 : match.groups)) {
+        throw new error_1.FirebaseError(`Invalid secret version resource name [${resourceName}].`);
+    }
     return {
         secret: {
-            projectId: nameTokens[1],
-            name: nameTokens[3],
+            projectId: match.groups.project,
+            name: match.groups.secret,
         },
-        versionId: nameTokens[5],
+        versionId: match.groups.version,
     };
 }
 exports.parseSecretVersionResourceName = parseSecretVersionResourceName;
@@ -69,65 +126,68 @@ 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 client.post(`projects/${projectId}/secrets`, {
+        name,
+        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"),
-            },
+async function patchSecret(projectId, name, labels) {
+    const fullName = `projects/${projectId}/secrets/${name}`;
+    const res = await client.patch(fullName, { name: fullName, labels }, { queryParams: { updateMask: "labels" } });
+    return parseSecretResourceName(res.body.name);
+}
+exports.patchSecret = patchSecret;
+async function deleteSecret(projectId, name) {
+    const path = `projects/${projectId}/secrets/${name}`;
+    await client.delete(path);
+}
+exports.deleteSecret = deleteSecret;
+async function addVersion(projectId, name, payloadData) {
+    const res = await client.post(`projects/${projectId}/secrets/${name}:addVersion`, {
+        payload: {
+            data: Buffer.from(payloadData).toString("base64"),
         },
     });
-    const nameTokens = res.body.name.split("/");
-    return {
-        secret: {
-            projectId: nameTokens[1],
-            name: nameTokens[3],
-        },
-        versionId: nameTokens[5],
-    };
+    return Object.assign(Object.assign({}, parseSecretVersionResourceName(res.body.name)), { state: res.body.state });
 }
 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 bindings = getPolicyRes.body.bindings || [];
-    if (bindings.find((b) => b.role == role &&
-        b.members.find((m) => m == `serviceAccount:${serviceAccountEmail}`))) {
-        return;
-    }
-    bindings.push({
-        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",
-            },
+async function getIamPolicy(secret) {
+    const res = await client.get(`projects/${secret.projectId}/secrets/${secret.name}:getIamPolicy`);
+    return res.body;
+}
+exports.getIamPolicy = getIamPolicy;
+async function setIamPolicy(secret, bindings) {
+    await client.post(`projects/${secret.projectId}/secrets/${secret.name}:setIamPolicy`, {
+        policy: {
+            bindings,
         },
+        updateMask: "bindings",
     });
-    (0, utils_1.logLabeledSuccess)("SecretManager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmail}`);
 }
-exports.grantServiceAgentRole = grantServiceAgentRole;
+exports.setIamPolicy = setIamPolicy;
+async function ensureServiceAgentRole(secret, serviceAccountEmails, role) {
+    const policy = await module.exports.getIamPolicy(secret);
+    const bindings = policy.bindings || [];
+    let binding = bindings.find((b) => b.role === role);
+    if (!binding) {
+        binding = { role, members: [] };
+        bindings.push(binding);
+    }
+    let shouldShortCircuit = true;
+    for (const serviceAccount of serviceAccountEmails) {
+        if (!binding.members.find((m) => m === `serviceAccount:${serviceAccount}`)) {
+            binding.members.push(`serviceAccount:${serviceAccount}`);
+            shouldShortCircuit = false;
+        }
+    }
+    if (shouldShortCircuit)
+        return;
+    await module.exports.setIamPolicy(secret, bindings);
+    (0, utils_1.logLabeledSuccess)("secretmanager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmails.join(", ")}`);
+}
+exports.ensureServiceAgentRole = ensureServiceAgentRole;

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");
 async function getDefaultBucket(projectId) {
     try {
-        const resp = await api.request("GET", "/v1/apps/" + projectId, {
-            auth: true,
-            origin: api.appengineOrigin,
-        });
+        const appengineClient = new apiv2_1.Client({ urlPrefix: api_1.appengineOrigin, apiVersion: "v1" });
+        const resp = await appengineClient.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;
@@ -41,38 +42,35 @@ async function uploadObject(source, bucketName) {
     if (path.extname(source.file) !== ".zip") {
         throw new error_1.FirebaseError(`Expected a file name ending in .zip, got ${source.file}`);
     }
+    const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
     const location = `/${bucketName}/${path.basename(source.file)}`;
-    const result = await api.request("PUT", location, {
-        auth: true,
-        data: source.stream,
+    const res = await localAPIClient.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 +83,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) {

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, dotenv: false, artifactregistry: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {