firebase-tools 10.1.1 → 10.1.2

package/lib/extensions/changelog.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseChangelog = exports.getLocalChangelog = exports.breakingChangesInUpdate = exports.displayReleaseNotes = exports.getReleaseNotesForUpdate = void 0;
 const clc = require("cli-color");
-const marked = require("marked");
+const { marked } = require("marked");
 const path = require("path");
 const semver = require("semver");
 const TerminalRenderer = require("marked-terminal");

package/lib/extensions/displayExtensionInfo.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.printSourceDownloadLink = exports.displayUpdateChangesRequiringConfirmation = exports.displayUpdateChangesNoInput = exports.displayExtInfo = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
-const marked = require("marked");
+const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const utils = require("../utils");
 const extensionsHelper_1 = require("./extensionsHelper");

package/lib/extensions/extensionsApi.js

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtension = exports.deleteExtension = exports.unpublishExtension = exports.publishExtensionVersion = exports.undeprecateExtensionVersion = exports.deprecateExtensionVersion = exports.registerPublisherProfile = exports.getPublisherProfile = exports.listExtensionVersions = exports.listExtensions = exports.getExtensionVersion = exports.getSource = exports.createSource = exports.updateInstanceFromRegistry = exports.updateInstance = exports.configureInstance = exports.listInstances = exports.getInstance = exports.deleteInstance = exports.createInstance = exports.ParamType = exports.Visibility = exports.RegistryLaunchStage = void 0;
 const yaml = require("js-yaml");
-const _ = require("lodash");
 const clc = require("cli-color");
-const marked = require("marked");
-const api = require("../api");
-const apiv2 = require("../apiv2");
-const refs = require("./refs");
+const { marked } = require("marked");
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
+const error_1 = require("../error");
 const logger_1 = require("../logger");
 const operationPoller = require("../operation-poller");
-const error_1 = require("../error");
+const refs = require("./refs");
 const VERSION = "v1beta";
 const PAGE_SIZE_MAX = 100;
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.extensionsOrigin, apiVersion: VERSION });
 var RegistryLaunchStage;
 (function (RegistryLaunchStage) {
     RegistryLaunchStage["EXPERIMENTAL"] = "EXPERIMENTAL";
@@ -34,22 +34,19 @@ var ParamType;
     ParamType["SECRET"] = "SECRET";
 })(ParamType = exports.ParamType || (exports.ParamType = {}));
 async function createInstanceHelper(projectId, instanceId, config, validateOnly = false) {
-    const createRes = await api.request("POST", `/${VERSION}/projects/${projectId}/instances/`, {
-        auth: true,
-        origin: api.extensionsOrigin,
-        data: {
-            name: `projects/${projectId}/instances/${instanceId}`,
-            config: config,
-        },
-        query: {
-            validateOnly,
+    const createRes = await apiClient.post(`/projects/${projectId}/instances/`, {
+        name: `projects/${projectId}/instances/${instanceId}`,
+        config,
+    }, {
+        queryParams: {
+            validateOnly: validateOnly ? "true" : "false",
         },
     });
     if (validateOnly) {
-        return createRes;
+        return createRes.body;
     }
     const pollRes = await operationPoller.pollOperation({
-        apiOrigin: api.extensionsOrigin,
+        apiOrigin: api_1.extensionsOrigin,
         apiVersion: VERSION,
         operationResourceName: createRes.body.name,
         masterTimeout: 600000,
@@ -79,12 +76,9 @@ async function createInstance(args) {
 }
 exports.createInstance = createInstance;
 async function deleteInstance(projectId, instanceId) {
-    const deleteRes = await api.request("DELETE", `/${VERSION}/projects/${projectId}/instances/${instanceId}`, {
-        auth: true,
-        origin: api.extensionsOrigin,
-    });
+    const deleteRes = await apiClient.delete(`/projects/${projectId}/instances/${instanceId}`);
     const pollRes = await operationPoller.pollOperation({
-        apiOrigin: api.extensionsOrigin,
+        apiOrigin: api_1.extensionsOrigin,
         apiVersion: VERSION,
         operationResourceName: deleteRes.body.name,
         masterTimeout: 600000,
@@ -92,21 +86,16 @@ async function deleteInstance(projectId, instanceId) {
     return pollRes;
 }
 exports.deleteInstance = deleteInstance;
-async function getInstance(projectId, instanceId, options = {}) {
-    const res = await api.request("GET", `/${VERSION}/projects/${projectId}/instances/${instanceId}`, _.assign({
-        auth: true,
-        origin: api.extensionsOrigin,
-    }, options));
+async function getInstance(projectId, instanceId) {
+    const res = await apiClient.get(`/projects/${projectId}/instances/${instanceId}`);
     return res.body;
 }
 exports.getInstance = getInstance;
 async function listInstances(projectId) {
     const instances = [];
-    const getNextPage = async (pageToken) => {
-        const res = await api.request("GET", `/${VERSION}/projects/${projectId}/instances`, {
-            auth: true,
-            origin: api.extensionsOrigin,
-            query: {
+    const getNextPage = async (pageToken = "") => {
+        const res = await apiClient.get(`/projects/${projectId}/instances`, {
+            queryParams: {
                 pageSize: PAGE_SIZE_MAX,
                 pageToken,
             },
@@ -183,20 +172,17 @@ async function updateInstanceFromRegistry(args) {
 }
 exports.updateInstanceFromRegistry = updateInstanceFromRegistry;
 async function patchInstance(args) {
-    const updateRes = await api.request("PATCH", `/${VERSION}/projects/${args.projectId}/instances/${args.instanceId}`, {
-        auth: true,
-        origin: api.extensionsOrigin,
-        query: {
+    const updateRes = await apiClient.patch(`/projects/${args.projectId}/instances/${args.instanceId}`, args.data, {
+        queryParams: {
             updateMask: args.updateMask,
-            validateOnly: args.validateOnly,
+            validateOnly: args.validateOnly ? "true" : "false",
         },
-        data: args.data,
     });
     if (args.validateOnly) {
         return updateRes;
     }
     const pollRes = await operationPoller.pollOperation({
-        apiOrigin: api.extensionsOrigin,
+        apiOrigin: api_1.extensionsOrigin,
         apiVersion: VERSION,
         operationResourceName: updateRes.body.name,
         masterTimeout: 600000,
@@ -218,16 +204,12 @@ function populateResourceProperties(spec) {
     }
 }
 async function createSource(projectId, packageUri, extensionRoot) {
-    const createRes = await api.request("POST", `/${VERSION}/projects/${projectId}/sources/`, {
-        auth: true,
-        origin: api.extensionsOrigin,
-        data: {
-            packageUri,
-            extensionRoot,
-        },
+    const createRes = await apiClient.post(`/projects/${projectId}/sources/`, {
+        packageUri,
+        extensionRoot,
     });
     const pollRes = await operationPoller.pollOperation({
-        apiOrigin: api.extensionsOrigin,
+        apiOrigin: api_1.extensionsOrigin,
         apiVersion: VERSION,
         operationResourceName: createRes.body.name,
         masterTimeout: 600000,
@@ -238,18 +220,12 @@ async function createSource(projectId, packageUri, extensionRoot) {
     return pollRes;
 }
 exports.createSource = createSource;
-function getSource(sourceName) {
-    return api
-        .request("GET", `/${VERSION}/${sourceName}`, {
-        auth: true,
-        origin: api.extensionsOrigin,
-    })
-        .then((res) => {
-        if (res.body.spec) {
-            populateResourceProperties(res.body.spec);
-        }
-        return res.body;
-    });
+async function getSource(sourceName) {
+    const res = await apiClient.get(`/${sourceName}`);
+    if (res.body.spec) {
+        populateResourceProperties(res.body.spec);
+    }
+    return res.body;
 }
 exports.getSource = getSource;
 async function getExtensionVersion(extensionVersionRef) {
@@ -258,10 +234,7 @@ async function getExtensionVersion(extensionVersionRef) {
         throw new error_1.FirebaseError(`ExtensionVersion ref "${extensionVersionRef}" must supply a version.`);
     }
     try {
-        const res = await api.request("GET", `/${VERSION}/${refs.toExtensionVersionName(ref)}`, {
-            auth: true,
-            origin: api.extensionsOrigin,
-        });
+        const res = await apiClient.get(`/${refs.toExtensionVersionName(ref)}`);
         if (res.body.spec) {
             populateResourceProperties(res.body.spec);
         }
@@ -280,12 +253,10 @@ async function getExtensionVersion(extensionVersionRef) {
 exports.getExtensionVersion = getExtensionVersion;
 async function listExtensions(publisherId) {
     const extensions = [];
-    const getNextPage = async (pageToken) => {
-        const res = await api.request("GET", `/${VERSION}/publishers/${publisherId}/extensions`, {
-            auth: true,
-            origin: api.extensionsOrigin,
-            showUnpublished: false,
-            query: {
+    const getNextPage = async (pageToken = "") => {
+        const res = await apiClient.get(`/publishers/${publisherId}/extensions`, {
+            queryParams: {
+                showUnpublished: "false",
                 pageSize: PAGE_SIZE_MAX,
                 pageToken,
             },
@@ -301,14 +272,12 @@ async function listExtensions(publisherId) {
     return extensions;
 }
 exports.listExtensions = listExtensions;
-async function listExtensionVersions(ref, filter) {
+async function listExtensionVersions(ref, filter = "") {
     const { publisherId, extensionId } = refs.parse(ref);
     const extensionVersions = [];
-    const getNextPage = async (pageToken) => {
-        const res = await api.request("GET", `/${VERSION}/publishers/${publisherId}/extensions/${extensionId}/versions`, {
-            auth: true,
-            origin: api.extensionsOrigin,
-            query: {
+    const getNextPage = async (pageToken = "") => {
+        const res = await apiClient.get(`/publishers/${publisherId}/extensions/${extensionId}/versions`, {
+            queryParams: {
                 filter,
                 pageSize: PAGE_SIZE_MAX,
                 pageToken,
@@ -326,8 +295,7 @@ async function listExtensionVersions(ref, filter) {
 }
 exports.listExtensionVersions = listExtensionVersions;
 async function getPublisherProfile(projectId, publisherId) {
-    const client = new apiv2.Client({ urlPrefix: api.extensionsOrigin });
-    const res = await client.get(`/${VERSION}/projects/${projectId}/publisherProfile`, {
+    const res = await apiClient.get(`/projects/${projectId}/publisherProfile`, {
         queryParams: publisherId == undefined
             ? undefined
             : {
@@ -338,10 +306,8 @@ async function getPublisherProfile(projectId, publisherId) {
 }
 exports.getPublisherProfile = getPublisherProfile;
 async function registerPublisherProfile(projectId, publisherId) {
-    const res = await api.request("POST", `/${VERSION}/projects/${projectId}/publisherProfile:register`, {
-        auth: true,
-        origin: api.extensionsOrigin,
-        data: { publisherId },
+    const res = await apiClient.post(`/projects/${projectId}/publisherProfile:register`, {
+        publisherId,
     });
     return res.body;
 }
@@ -349,10 +315,8 @@ exports.registerPublisherProfile = registerPublisherProfile;
 async function deprecateExtensionVersion(extensionRef, deprecationMessage) {
     const ref = refs.parse(extensionRef);
     try {
-        const res = await api.request("POST", `/${VERSION}/${refs.toExtensionVersionName(ref)}:deprecate`, {
-            auth: true,
-            origin: api.extensionsOrigin,
-            data: { deprecationMessage },
+        const res = await apiClient.post(`/${refs.toExtensionVersionName(ref)}:deprecate`, {
+            deprecationMessage,
         });
         return res.body;
     }
@@ -375,10 +339,7 @@ exports.deprecateExtensionVersion = deprecateExtensionVersion;
 async function undeprecateExtensionVersion(extensionRef) {
     const ref = refs.parse(extensionRef);
     try {
-        const res = await api.request("POST", `/${VERSION}/${refs.toExtensionVersionName(ref)}:undeprecate`, {
-            auth: true,
-            origin: api.extensionsOrigin,
-        });
+        const res = await apiClient.post(`/${refs.toExtensionVersionName(ref)}:undeprecate`);
         return res.body;
     }
     catch (err) {
@@ -402,17 +363,13 @@ async function publishExtensionVersion(extensionVersionRef, packageUri, extensio
     if (!ref.version) {
         throw new error_1.FirebaseError(`ExtensionVersion ref "${extensionVersionRef}" must supply a version.`);
     }
-    const publishRes = await api.request("POST", `/${VERSION}/${refs.toExtensionName(ref)}/versions:publish`, {
-        auth: true,
-        origin: api.extensionsOrigin,
-        data: {
-            versionId: ref.version,
-            packageUri,
-            extensionRoot: extensionRoot !== null && extensionRoot !== void 0 ? extensionRoot : "/",
-        },
+    const publishRes = await apiClient.post(`/${refs.toExtensionName(ref)}/versions:publish`, {
+        versionId: ref.version,
+        packageUri,
+        extensionRoot: extensionRoot !== null && extensionRoot !== void 0 ? extensionRoot : "/",
     });
     const pollRes = await operationPoller.pollOperation({
-        apiOrigin: api.extensionsOrigin,
+        apiOrigin: api_1.extensionsOrigin,
         apiVersion: VERSION,
         operationResourceName: publishRes.body.name,
         masterTimeout: 600000,
@@ -425,12 +382,8 @@ async function unpublishExtension(extensionRef) {
     if (ref.version) {
         throw new error_1.FirebaseError(`Extension reference "${extensionRef}" must not contain a version.`);
     }
-    const url = `/${VERSION}/${refs.toExtensionName(ref)}:unpublish`;
     try {
-        await api.request("POST", url, {
-            auth: true,
-            origin: api.extensionsOrigin,
-        });
+        await apiClient.post(`/${refs.toExtensionName(ref)}:unpublish`);
     }
     catch (err) {
         if (err.status === 403) {
@@ -450,12 +403,8 @@ async function deleteExtension(extensionRef) {
     if (ref.version) {
         throw new error_1.FirebaseError(`Extension reference "${extensionRef}" must not contain a version.`);
     }
-    const url = `/${VERSION}/${refs.toExtensionName(ref)}`;
     try {
-        await api.request("DELETE", url, {
-            auth: true,
-            origin: api.extensionsOrigin,
-        });
+        await apiClient.delete(`/${refs.toExtensionName(ref)}`);
     }
     catch (err) {
         if (err.status === 403) {
@@ -476,10 +425,7 @@ exports.deleteExtension = deleteExtension;
 async function getExtension(extensionRef) {
     const ref = refs.parse(extensionRef);
     try {
-        const res = await api.request("GET", `/${VERSION}/${refs.toExtensionName(ref)}`, {
-            auth: true,
-            origin: api.extensionsOrigin,
-        });
+        const res = await apiClient.get(`/${refs.toExtensionName(ref)}`);
         return res.body;
     }
     catch (err) {

package/lib/extensions/extensionsHelper.js

@@ -5,7 +5,7 @@ const _ = require("lodash");
 const clc = require("cli-color");
 const ora = require("ora");
 const semver = require("semver");
-const marked = require("marked");
+const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 marked.setOptions({
     renderer: new TerminalRenderer(),
@@ -68,7 +68,7 @@ exports.resourceTypeToNiceName = {
 };
 function getDBInstanceFromURL(databaseUrl = "") {
     const instanceRegex = new RegExp("(?:https://)(.*)(?:.firebaseio.com)");
-    const matches = databaseUrl.match(instanceRegex);
+    const matches = instanceRegex.exec(databaseUrl);
     if (matches && matches.length > 1) {
         return matches[1];
     }
@@ -348,7 +348,7 @@ async function createSourceFromLocation(projectId, sourceUri) {
     let packageUri;
     let extensionRoot;
     let objectPath = "";
-    if (!exports.URL_REGEX.test(sourceUri)) {
+    if (!sourceUri.startsWith("https:")) {
         const uploadSpinner = ora(" Archiving and uploading extension source code");
         try {
             uploadSpinner.start();
@@ -442,24 +442,28 @@ async function promptForRepeatInstance(projectName, extensionName) {
 }
 exports.promptForRepeatInstance = promptForRepeatInstance;
 async function instanceIdExists(projectId, instanceId) {
-    const instanceRes = await (0, extensionsApi_1.getInstance)(projectId, instanceId, {
-        resolveOnHTTPError: true,
-    });
-    if (instanceRes.error) {
-        if (_.get(instanceRes, "error.code") === 404) {
-            return false;
+    try {
+        await (0, extensionsApi_1.getInstance)(projectId, instanceId);
+    }
+    catch (err) {
+        if (err instanceof error_1.FirebaseError) {
+            if (err.status === 404) {
+                return false;
+            }
+            const msg = `Unexpected error when checking if instance ID exists: ${err}`;
+            throw new error_1.FirebaseError(msg, {
+                original: err,
+            });
+        }
+        else {
+            throw err;
         }
-        const msg = "Unexpected error when checking if instance ID exists: " +
-            _.get(instanceRes, "error.message");
-        throw new error_1.FirebaseError(msg, {
-            original: instanceRes.error,
-        });
     }
     return true;
 }
 exports.instanceIdExists = instanceIdExists;
 function isUrlPath(extInstallPath) {
-    return exports.URL_REGEX.test(extInstallPath);
+    return extInstallPath.startsWith("https:");
 }
 exports.isUrlPath = isUrlPath;
 function isLocalPath(extInstallPath) {

package/lib/extensions/provisioningHelper.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsedProducts = exports.bulkCheckProductsProvisioned = exports.checkProductsProvisioned = exports.DeferredProduct = void 0;
-const marked = require("marked");
-const api = require("../api");
+const { marked } = require("marked");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const functional_1 = require("../functional");
 const error_1 = require("../error");
 const planner_1 = require("../deploy/extensions/planner");
@@ -85,10 +86,8 @@ function getTriggerType(propertiesYaml) {
 }
 async function isStorageProvisioned(projectId) {
     var _a, _b;
-    const resp = await api.request("GET", `/v1beta/projects/${projectId}/buckets`, {
-        auth: true,
-        origin: api.firebaseStorageOrigin,
-    });
+    const client = new apiv2_1.Client({ urlPrefix: api_1.firebaseStorageOrigin, apiVersion: "v1beta" });
+    const resp = await client.get(`/projects/${projectId}/buckets`);
     return !!((_b = (_a = resp.body) === null || _a === void 0 ? void 0 : _a.buckets) === null || _b === void 0 ? void 0 : _b.find((bucket) => {
         const bucketResourceName = bucket.name;
         const bucketResourceNameTokens = bucketResourceName.split("/");
@@ -98,9 +97,7 @@ async function isStorageProvisioned(projectId) {
 }
 async function isAuthProvisioned(projectId) {
     var _a, _b;
-    const resp = await api.request("GET", `/v1/projects/${projectId}/products`, {
-        auth: true,
-        origin: api.firedataOrigin,
-    });
+    const client = new apiv2_1.Client({ urlPrefix: api_1.firedataOrigin, apiVersion: "v1" });
+    const resp = await client.get(`/projects/${projectId}/products`);
     return !!((_b = (_a = resp.body) === null || _a === void 0 ? void 0 : _a.activation) === null || _b === void 0 ? void 0 : _b.map((a) => a.service).includes("FIREBASE_AUTH"));
 }

package/lib/extensions/resolveSource.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTrustedPublishers = exports.getExtensionRegistry = exports.getMinRequiredVersion = exports.getTargetVersion = exports.resolveRegistryEntry = exports.isOfficialSource = exports.resolveSourceUrl = exports.confirmUpdateWarning = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
-const marked = require("marked");
-const api = require("../api");
+const { marked } = require("marked");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
 const EXTENSIONS_REGISTRY_ENDPOINT = "/extensions.json";
 async function confirmUpdateWarning(updateWarning) {
     logger_1.logger.info(marked(updateWarning.description));
@@ -58,9 +59,8 @@ function getMinRequiredVersion(registryEntry) {
 }
 exports.getMinRequiredVersion = getMinRequiredVersion;
 async function getExtensionRegistry(onlyFeatured) {
-    const res = await api.request("GET", EXTENSIONS_REGISTRY_ENDPOINT, {
-        origin: api.firebaseExtensionsRegistryOrigin,
-    });
+    const client = new apiv2_1.Client({ urlPrefix: api_1.firebaseExtensionsRegistryOrigin });
+    const res = await client.get(EXTENSIONS_REGISTRY_ENDPOINT);
     const extensions = _.get(res, "body.mods");
     if (onlyFeatured) {
         const featuredList = _.get(res, "body.featured.discover");

package/lib/extensions/updateHelper.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inferUpdateSource = exports.updateFromPublisherSource = exports.updateToVersionFromPublisherSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.displayChanges = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
 const clc = require("cli-color");
 const semver = require("semver");
-const marked = require("marked");
+const { marked } = require("marked");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const resolveSource = require("./resolveSource");

package/lib/extensions/warnings.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
-const marked = require("marked");
+const { marked } = require("marked");
 const clc = require("cli-color");
 const extensionsApi_1 = require("./extensionsApi");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");

package/lib/functionsConfig.js

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUnsetArgs = exports.parseSetArgs = exports.materializeAll = exports.materializeConfig = exports.setVariablesRecursive = exports.getFirebaseConfig = exports.getAppEngineLocation = exports.idsToVarName = exports.varNameToIds = exports.ensureApi = exports.RESERVED_NAMESPACES = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
-const api = require("./api");
+const api_1 = require("./api");
+const apiv2_1 = require("./apiv2");
 const ensureApiEnabled_1 = require("./ensureApiEnabled");
 const error_1 = require("./error");
 const projectUtils_1 = require("./projectUtils");
 const runtimeconfig = require("./gcp/runtimeconfig");
 exports.RESERVED_NAMESPACES = ["firebase"];
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.firebaseApiOrigin });
 function keyToIds(key) {
     const keyParts = key.split(".");
     const variable = keyParts.slice(1).join("/");
@@ -55,10 +57,7 @@ function getAppEngineLocation(config) {
 exports.getAppEngineLocation = getAppEngineLocation;
 async function getFirebaseConfig(options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const response = await api.request("GET", "/v1beta1/projects/" + projectId + "/adminSdkConfig", {
-        auth: true,
-        origin: api.firebaseApiOrigin,
-    });
+    const response = await apiClient.get(`/v1beta1/projects/${projectId}/adminSdkConfig`);
     return response.body;
 }
 exports.getFirebaseConfig = getFirebaseConfig;

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;