firebase-tools 10.1.0 → 10.1.4

package/lib/gcp/cloudfunctions.js

@@ -5,12 +5,14 @@ const clc = require("cli-color");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const previews_1 = require("../previews");
-const api = require("../api");
 const backend = require("../deploy/functions/backend");
 const utils = require("../utils");
 const proto = require("./proto");
 const runtimes = require("../deploy/functions/runtimes");
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
 exports.API_VERSION = "v1";
+const client = new apiv2_1.Client({ urlPrefix: api_1.functionsOrigin, apiVersion: exports.API_VERSION });
 function validateFunction(func) {
     proto.assertOneOf("Cloud Function", func, "sourceCode", "sourceArchiveUrl", "sourceRepository", "sourceUploadUrl");
     proto.assertOneOf("Cloud Function", func, "trigger", "httpsTrigger", "eventTrigger");
@@ -30,16 +32,10 @@ function functionsOpLogReject(funcName, type, err) {
 }
 async function generateUploadUrl(projectId, location) {
     const parent = "projects/" + projectId + "/locations/" + location;
-    const endpoint = "/" + exports.API_VERSION + "/" + parent + "/functions:generateUploadUrl";
+    const endpoint = `/${parent}/functions:generateUploadUrl`;
     try {
-        const res = await api.request("POST", endpoint, {
-            auth: true,
-            json: false,
-            origin: api.functionsOrigin,
-            retryCodes: [503],
-        });
-        const responseBody = JSON.parse(res.body);
-        return responseBody.uploadUrl;
+        const res = await client.post(endpoint, {}, { retryCodes: [503] });
+        return res.body.uploadUrl;
     }
     catch (err) {
         logger_1.logger.info("\n\nThere was an issue deploying your functions. Verify that your project has a Google App Engine instance setup at https://console.cloud.google.com/appengine and try again. If this issue persists, please contact support.");
@@ -49,18 +45,13 @@ async function generateUploadUrl(projectId, location) {
 exports.generateUploadUrl = generateUploadUrl;
 async function createFunction(cloudFunction) {
     const apiPath = cloudFunction.name.substring(0, cloudFunction.name.lastIndexOf("/"));
-    const endpoint = `/${exports.API_VERSION}/${apiPath}`;
+    const endpoint = `/${apiPath}`;
     try {
         const headers = {};
         if (previews_1.previews.artifactregistry) {
             headers["X-Firebase-Artifact-Registry"] = "optin";
         }
-        const res = await api.request("POST", endpoint, {
-            headers,
-            auth: true,
-            data: cloudFunction,
-            origin: api.functionsOrigin,
-        });
+        const res = await client.post(endpoint, cloudFunction, { headers });
         return {
             name: res.body.name,
             type: "create",
@@ -73,15 +64,11 @@ async function createFunction(cloudFunction) {
 }
 exports.createFunction = createFunction;
 async function setIamPolicy(options) {
-    const endpoint = `/${exports.API_VERSION}/${options.name}:setIamPolicy`;
+    const endpoint = `/${options.name}:setIamPolicy`;
     try {
-        await api.request("POST", endpoint, {
-            auth: true,
-            data: {
-                policy: options.policy,
-                updateMask: Object.keys(options.policy).join(","),
-            },
-            origin: api.functionsOrigin,
+        await client.post(endpoint, {
+            policy: options.policy,
+            updateMask: Object.keys(options.policy).join(","),
         });
     }
     catch (err) {
@@ -92,12 +79,10 @@ async function setIamPolicy(options) {
 }
 exports.setIamPolicy = setIamPolicy;
 async function getIamPolicy(fnName) {
-    const endpoint = `/${exports.API_VERSION}/${fnName}:getIamPolicy`;
+    const endpoint = `/${fnName}:getIamPolicy`;
     try {
-        return await api.request("GET", endpoint, {
-            auth: true,
-            origin: api.functionsOrigin,
-        });
+        const res = await client.get(endpoint);
+        return res.body;
     }
     catch (err) {
         throw new error_1.FirebaseError(`Failed to get the IAM Policy on the function ${fnName}`, {
@@ -148,21 +133,18 @@ async function setInvokerUpdate(projectId, fnName, invoker) {
 }
 exports.setInvokerUpdate = setInvokerUpdate;
 async function updateFunction(cloudFunction) {
-    const endpoint = `/${exports.API_VERSION}/${cloudFunction.name}`;
+    const endpoint = `/${cloudFunction.name}`;
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "environmentVariables");
     try {
         const headers = {};
         if (previews_1.previews.artifactregistry) {
             headers["X-Firebase-Artifact-Registry"] = "optin";
         }
-        const res = await api.request("PATCH", endpoint, {
+        const res = await client.patch(endpoint, cloudFunction, {
             headers,
-            qs: {
+            queryParams: {
                 updateMask: fieldMasks.join(","),
             },
-            auth: true,
-            data: cloudFunction,
-            origin: api.functionsOrigin,
         });
         return {
             done: false,
@@ -176,12 +158,9 @@ async function updateFunction(cloudFunction) {
 }
 exports.updateFunction = updateFunction;
 async function deleteFunction(name) {
-    const endpoint = `/${exports.API_VERSION}/${name}`;
+    const endpoint = `/${name}`;
     try {
-        const res = await api.request("DELETE", endpoint, {
-            auth: true,
-            origin: api.functionsOrigin,
-        });
+        const res = await client.delete(endpoint);
         return {
             done: false,
             name: res.body.name,
@@ -194,12 +173,9 @@ async function deleteFunction(name) {
 }
 exports.deleteFunction = deleteFunction;
 async function list(projectId, region) {
-    const endpoint = "/" + exports.API_VERSION + "/projects/" + projectId + "/locations/" + region + "/functions";
+    const endpoint = "/projects/" + projectId + "/locations/" + region + "/functions";
     try {
-        const res = await api.request("GET", endpoint, {
-            auth: true,
-            origin: api.functionsOrigin,
-        });
+        const res = await client.get(endpoint);
         if (res.body.unreachable && res.body.unreachable.length > 0) {
             logger_1.logger.debug(`[functions] unable to reach the following regions: ${res.body.unreachable.join(", ")}`);
         }

package/lib/gcp/cloudlogging.js

@@ -1,21 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listEntries = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const API_VERSION = "v2";
 async function listEntries(projectId, filter, pageSize, order) {
-    const endpoint = `/${API_VERSION}/entries:list`;
+    const client = new apiv2_1.Client({ urlPrefix: api_1.cloudloggingOrigin, apiVersion: API_VERSION });
     try {
-        const result = await api.request("POST", endpoint, {
-            auth: true,
-            data: {
-                resourceNames: [`projects/${projectId}`],
-                filter: filter,
-                orderBy: "timestamp " + order,
-                pageSize: pageSize,
-            },
-            origin: api.cloudloggingOrigin,
+        const result = await client.post("/entries:list", {
+            resourceNames: [`projects/${projectId}`],
+            filter: filter,
+            orderBy: `timestamp ${order}`,
+            pageSize: pageSize,
         });
         return result.body.entries;
     }

package/lib/gcp/cloudmonitoring.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryTimeSeries = exports.ValueType = exports.Reducer = exports.MetricKind = exports.Aligner = exports.TimeSeriesView = exports.CLOUD_MONITORING_VERSION = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 exports.CLOUD_MONITORING_VERSION = "v3";
 var TimeSeriesView;
@@ -57,11 +58,13 @@ var ValueType;
     ValueType["STRING"] = "STRING";
 })(ValueType = exports.ValueType || (exports.ValueType = {}));
 async function queryTimeSeries(query, projectNumber) {
+    const client = new apiv2_1.Client({
+        urlPrefix: api_1.cloudMonitoringOrigin,
+        apiVersion: exports.CLOUD_MONITORING_VERSION,
+    });
     try {
-        const res = await api.request("GET", `/${exports.CLOUD_MONITORING_VERSION}/projects/${projectNumber}/timeSeries/`, {
-            auth: true,
-            origin: api.cloudMonitoringOrigin,
-            data: query,
+        const res = await client.get(`/projects/${projectNumber}/timeSeries/`, {
+            queryParams: query,
         });
         return res.body.timeSeries;
     }

package/lib/gcp/cloudscheduler.js

@@ -4,7 +4,8 @@ exports.jobFromEndpoint = exports.createOrReplaceJob = exports.updateJob = expor
 const _ = require("lodash");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const backend = require("../deploy/functions/backend");
 const proto = require("./proto");
 const functional_1 = require("../functional");
@@ -17,36 +18,24 @@ function assertValidJob(job) {
     }
 }
 exports.assertValidJob = assertValidJob;
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.cloudschedulerOrigin, apiVersion: VERSION });
 function createJob(job) {
     const strippedName = job.name.substring(0, job.name.lastIndexOf("/"));
-    return api.request("POST", `/${VERSION}/${strippedName}`, {
-        auth: true,
-        origin: api.cloudschedulerOrigin,
-        data: Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job),
-    });
+    return apiClient.post(`/${strippedName}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job));
 }
 exports.createJob = createJob;
 function deleteJob(name) {
-    return api.request("DELETE", `/${VERSION}/${name}`, {
-        auth: true,
-        origin: api.cloudschedulerOrigin,
-    });
+    return apiClient.delete(`/${name}`);
 }
 exports.deleteJob = deleteJob;
 function getJob(name) {
-    return api.request("GET", `/${VERSION}/${name}`, {
-        auth: true,
-        origin: api.cloudschedulerOrigin,
+    return apiClient.get(`/${name}`, {
         resolveOnHTTPError: true,
     });
 }
 exports.getJob = getJob;
 function updateJob(job) {
-    return api.request("PATCH", `/${VERSION}/${job.name}`, {
-        auth: true,
-        origin: api.cloudschedulerOrigin,
-        data: Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job),
-    });
+    return apiClient.patch(`/${job.name}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job));
 }
 exports.updateJob = updateJob;
 async function createOrReplaceJob(job) {

package/lib/gcp/firedata.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listDatabaseInstances = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
 const utils = require("../utils");
 function _handleErrorResponse(response) {
@@ -14,9 +15,9 @@ function _handleErrorResponse(response) {
     });
 }
 async function listDatabaseInstances(projectNumber) {
-    const response = await api.request("GET", `/v1/projects/${projectNumber}/databases`, {
-        auth: true,
-        origin: api.firedataOrigin,
+    const client = new apiv2_1.Client({ urlPrefix: api_1.firedataOrigin, apiVersion: "v1" });
+    const response = await client.get(`/projects/${projectNumber}/databases`, {
+        resolveOnHTTPError: true,
     });
     if (response.status === 200) {
         return response.body.instance;

package/lib/gcp/firestore.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteDocuments = exports.deleteDocument = exports.listCollectionIds = void 0;
 const api_1 = require("../api");
-const apiv2 = require("../apiv2");
-const _CLIENT = new apiv2.Client({
+const apiv2_1 = require("../apiv2");
+const apiClient = new apiv2_1.Client({
     auth: true,
     apiVersion: "v1",
     urlPrefix: api_1.firestoreOriginOrEmulator,
@@ -13,13 +13,13 @@ function listCollectionIds(project) {
     const data = {
         pageSize: 2147483647,
     };
-    return _CLIENT.post(url, data).then((res) => {
+    return apiClient.post(url, data).then((res) => {
         return res.body.collectionIds || [];
     });
 }
 exports.listCollectionIds = listCollectionIds;
 async function deleteDocument(doc) {
-    return _CLIENT.delete(doc.name);
+    return apiClient.delete(doc.name);
 }
 exports.deleteDocument = deleteDocument;
 async function deleteDocuments(project, docs) {
@@ -28,7 +28,7 @@ async function deleteDocuments(project, docs) {
         return { delete: doc.name };
     });
     const data = { writes };
-    const res = await _CLIENT.post(url, data);
+    const res = await apiClient.post(url, data);
     return res.body.writeResults.length;
 }
 exports.deleteDocuments = deleteDocuments;

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/rules.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testRuleset = exports.updateOrCreateRelease = exports.updateRelease = exports.createRelease = exports.createRuleset = exports.deleteRuleset = exports.getRulesetId = exports.listAllRulesets = exports.listRulesets = exports.getRulesetContent = exports.listAllReleases = exports.listReleases = exports.getLatestRulesetName = void 0;
 const _ = require("lodash");
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
 const utils = require("../utils");
 const API_VERSION = "v1";
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.rulesOrigin, apiVersion: API_VERSION });
 function _handleErrorResponse(response) {
     if (response.body && response.body.error) {
         return utils.reject(response.body.error, { code: 2 });
@@ -18,7 +20,7 @@ function _handleErrorResponse(response) {
 async function getLatestRulesetName(projectId, service) {
     const releases = await listAllReleases(projectId);
     const prefix = `projects/${projectId}/releases/${service}`;
-    const release = _.find(releases, (r) => r.name.indexOf(prefix) === 0);
+    const release = _.find(releases, (r) => r.name.startsWith(prefix));
     if (!release) {
         return null;
     }
@@ -26,11 +28,9 @@ async function getLatestRulesetName(projectId, service) {
 }
 exports.getLatestRulesetName = getLatestRulesetName;
 const MAX_RELEASES_PAGE_SIZE = 10;
-async function listReleases(projectId, pageToken) {
-    const response = await api.request("GET", `/${API_VERSION}/projects/${projectId}/releases`, {
-        auth: true,
-        origin: api.rulesOrigin,
-        query: {
+async function listReleases(projectId, pageToken = "") {
+    const response = await apiClient.get(`/projects/${projectId}/releases`, {
+        queryParams: {
             pageSize: MAX_RELEASES_PAGE_SIZE,
             pageToken,
         },
@@ -55,9 +55,8 @@ async function listAllReleases(projectId) {
 }
 exports.listAllReleases = listAllReleases;
 async function getRulesetContent(name) {
-    const response = await api.request("GET", `/${API_VERSION}/${name}`, {
-        auth: true,
-        origin: api.rulesOrigin,
+    const response = await apiClient.get(`/${name}`, {
+        skipLog: { resBody: true },
     });
     if (response.status === 200) {
         const source = response.body.source;
@@ -67,14 +66,13 @@ async function getRulesetContent(name) {
 }
 exports.getRulesetContent = getRulesetContent;
 const MAX_RULESET_PAGE_SIZE = 100;
-async function listRulesets(projectId, pageToken) {
-    const response = await api.request("GET", `/${API_VERSION}/projects/${projectId}/rulesets`, {
-        auth: true,
-        origin: api.rulesOrigin,
-        query: {
+async function listRulesets(projectId, pageToken = "") {
+    const response = await apiClient.get(`/projects/${projectId}/rulesets`, {
+        queryParams: {
             pageSize: MAX_RULESET_PAGE_SIZE,
             pageToken,
         },
+        skipLog: { resBody: true },
     });
     if (response.status === 200) {
         return response.body;
@@ -100,10 +98,7 @@ function getRulesetId(ruleset) {
 }
 exports.getRulesetId = getRulesetId;
 async function deleteRuleset(projectId, id) {
-    const response = await api.request("DELETE", `/${API_VERSION}/projects/${projectId}/rulesets/${id}`, {
-        auth: true,
-        origin: api.rulesOrigin,
-    });
+    const response = await apiClient.delete(`/projects/${projectId}/rulesets/${id}`);
     if (response.status === 200) {
         return;
     }
@@ -112,11 +107,7 @@ async function deleteRuleset(projectId, id) {
 exports.deleteRuleset = deleteRuleset;
 async function createRuleset(projectId, files) {
     const payload = { source: { files } };
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}/rulesets`, {
-        auth: true,
-        data: payload,
-        origin: api.rulesOrigin,
-    });
+    const response = await apiClient.post(`/projects/${projectId}/rulesets`, payload, { skipLog: { body: true } });
     if (response.status === 200) {
         logger_1.logger.debug("[rules] created ruleset", response.body.name);
         return response.body.name;
@@ -129,11 +120,7 @@ async function createRelease(projectId, rulesetName, releaseName) {
         name: `projects/${projectId}/releases/${releaseName}`,
         rulesetName,
     };
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}/releases`, {
-        auth: true,
-        data: payload,
-        origin: api.rulesOrigin,
-    });
+    const response = await apiClient.post(`/projects/${projectId}/releases`, payload);
     if (response.status === 200) {
         logger_1.logger.debug("[rules] created release", response.body.name);
         return response.body.name;
@@ -148,11 +135,7 @@ async function updateRelease(projectId, rulesetName, releaseName) {
             rulesetName,
         },
     };
-    const response = await api.request("PATCH", `/${API_VERSION}/projects/${projectId}/releases/${releaseName}`, {
-        auth: true,
-        data: payload,
-        origin: api.rulesOrigin,
-    });
+    const response = await apiClient.patch(`/projects/${projectId}/releases/${releaseName}`, payload);
     if (response.status === 200) {
         logger_1.logger.debug("[rules] updated release", response.body.name);
         return response.body.name;
@@ -169,12 +152,6 @@ async function updateOrCreateRelease(projectId, rulesetName, releaseName) {
 }
 exports.updateOrCreateRelease = updateOrCreateRelease;
 function testRuleset(projectId, files) {
-    return api.request("POST", `/${API_VERSION}/projects/${encodeURIComponent(projectId)}:test`, {
-        origin: api.rulesOrigin,
-        data: {
-            source: { files },
-        },
-        auth: true,
-    });
+    return apiClient.post(`/projects/${encodeURIComponent(projectId)}:test`, { source: { files } }, { skipLog: { body: true } });
 }
 exports.testRuleset = testRuleset;