firebase-tools 12.6.1 → 12.6.2

package/lib/gcp/cloudfunctionsv2.js

@@ -91,7 +91,7 @@ async function createFunction(cloudFunction) {
     const components = cloudFunction.name.split("/");
     const functionId = components.splice(-1, 1)[0];
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replace("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replaceAll("-", ".") });
     try {
         const res = await client.post(components.join("/"), cloudFunction, { queryParams: { functionId } });
         return res.body;
@@ -149,7 +149,7 @@ async function updateFunction(cloudFunction) {
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables");
     cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
     fieldMasks.push("buildConfig.buildEnvironmentVariables");
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replace("-", ".") });
+    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: functionId.replaceAll("-", ".") });
     try {
         const queryParams = {
             updateMask: fieldMasks.join(","),

package/lib/gcp/storage.js

@@ -6,21 +6,19 @@ const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const ensureApiEnabled_1 = require("../ensureApiEnabled");
+const projects_1 = require("../management/projects");
 async function getDefaultBucket(projectId) {
     var _a;
-    await (0, ensureApiEnabled_1.ensure)(projectId, "firebasestorage.googleapis.com", "storage", false);
     try {
-        const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.firebaseStorageOrigin, apiVersion: "v1alpha" });
-        const response = await localAPIClient.get(`/projects/${projectId}/defaultBucket`);
-        if (!((_a = response.body) === null || _a === void 0 ? void 0 : _a.name)) {
+        const metadata = await (0, projects_1.getFirebaseProject)(projectId);
+        if (!((_a = metadata.resources) === null || _a === void 0 ? void 0 : _a.storageBucket)) {
             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.");
         }
-        return response.body.name;
+        return metadata.resources.storageBucket;
     }
     catch (err) {
-        logger_1.logger.info("\n\nThere was an issue deploying your Storage rules. 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.");
+        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.");
         throw err;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.6.1",
+  "version": "12.6.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {