firebase-tools 10.1.3 → 10.1.4

package/lib/emulator/storage/apis/gcloud.js

@@ -14,10 +14,10 @@ function createCloudEndpoints(emulator) {
         storageLayer.createBucket(req.params[0]);
         next();
     });
-    gcloudStorageAPI.get("/b", (req, res) => {
+    gcloudStorageAPI.get("/b", async (req, res) => {
         res.json({
             kind: "storage#buckets",
-            items: storageLayer.listBuckets(),
+            items: await storageLayer.listBuckets(),
         });
     });
     gcloudStorageAPI.get(["/b/:bucketId/o/:objectId", "/download/storage/v1/b/:bucketId/o/:objectId"], (req, res) => {

package/lib/emulator/storage/files.js

@@ -19,6 +19,7 @@ const fse = require("fs-extra");
 const rimraf = require("rimraf");
 const cloudFunctions_1 = require("./cloudFunctions");
 const logger_1 = require("../../logger");
+const adminSdkConfig_1 = require("../adminSdkConfig");
 class StoredFile {
     constructor(metadata, path) {
         this.metadata = metadata;
@@ -108,9 +109,13 @@ class StorageLayer {
             this._buckets.set(id, new metadata_1.CloudStorageBucketMetadata(id));
         }
     }
-    listBuckets() {
+    async listBuckets() {
         if (this._buckets.size == 0) {
-            this.createBucket("default-bucket");
+            let adminSdkConfig = await (0, adminSdkConfig_1.getProjectAdminSdkConfigOrCached)(this._projectId);
+            if (!adminSdkConfig) {
+                adminSdkConfig = (0, adminSdkConfig_1.constructDefaultAdminSdkConfig)(this._projectId);
+            }
+            this.createBucket(adminSdkConfig.storageBucket);
         }
         return [...this._buckets.values()];
     }
@@ -355,7 +360,7 @@ class StorageLayer {
         const bucketsList = {
             buckets: [],
         };
-        for (const b of this.listBuckets()) {
+        for (const b of await this.listBuckets()) {
             bucketsList.buckets.push({ id: b.id });
         }
         const bucketsFilePath = path.join(storageExportPath, "buckets.json");

package/lib/gcp/storage.js

@@ -6,10 +6,10 @@ 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 storageAPIClient.get(`/apps/${projectId}`);
+        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.");
@@ -42,6 +42,7 @@ 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 storageAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin, apiVersion: "v1" });
     const location = `/${bucketName}/${path.basename(source.file)}`;
     const res = await storageAPIClient.request({
         method: "PUT",

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.1.3",
+  "version": "10.1.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.1.3",
+      "version": "10.1.4",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",
@@ -116,7 +116,6 @@
         "@types/triple-beam": "^1.3.0",
         "@types/unzipper": "^0.10.0",
         "@types/uuid": "^8.3.1",
-        "@types/winston": "^2.4.4",
         "@types/ws": "^7.2.3",
         "@typescript-eslint/eslint-plugin": "^5.9.0",
         "@typescript-eslint/parser": "^5.9.0",
@@ -2359,16 +2358,6 @@
       "integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
       "dev": true
     },
-    "node_modules/@types/winston": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/winston/-/winston-2.4.4.tgz",
-      "integrity": "sha512-BVGCztsypW8EYwJ+Hq+QNYiT/MUyCif0ouBH+flrY66O5W+KIXAMML6E/0fJpm7VjIzgangahl5S03bJJQGrZw==",
-      "deprecated": "This is a stub types definition. winston provides its own type definitions, so you do not need this installed.",
-      "dev": true,
-      "dependencies": {
-        "winston": "*"
-      }
-    },
     "node_modules/@types/ws": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.3.tgz",
@@ -15436,15 +15425,6 @@
       "integrity": "sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==",
       "dev": true
     },
-    "@types/winston": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/winston/-/winston-2.4.4.tgz",
-      "integrity": "sha512-BVGCztsypW8EYwJ+Hq+QNYiT/MUyCif0ouBH+flrY66O5W+KIXAMML6E/0fJpm7VjIzgangahl5S03bJJQGrZw==",
-      "dev": true,
-      "requires": {
-        "winston": "*"
-      }
-    },
     "@types/ws": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.3.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "10.1.3",
+  "version": "10.1.4",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -30,6 +30,7 @@
     "test:extensions-emulator": "./scripts/extensions-emulator-tests/run.sh",
     "test:hosting": "./scripts/hosting-tests/run.sh",
     "test:triggers-end-to-end": "./scripts/triggers-end-to-end-tests/run.sh",
+    "test:storage-deploy": "./scripts/storage-deploy-tests/run.sh",
     "test:storage-emulator-integration": "./scripts/storage-emulator-integration/run.sh"
   },
   "files": [
@@ -188,7 +189,6 @@
     "@types/triple-beam": "^1.3.0",
     "@types/unzipper": "^0.10.0",
     "@types/uuid": "^8.3.1",
-    "@types/winston": "^2.4.4",
     "@types/ws": "^7.2.3",
     "@typescript-eslint/eslint-plugin": "^5.9.0",
     "@typescript-eslint/parser": "^5.9.0",