Use correct bucket name field when reading DefaultBucket for storage

src/gcp/storage.ts

@@ -114,7 +114,7 @@
  ];
  };
  labels: {
  (key: any): string;
  };
  storageClass: string;
  billing: {
@@ -133,39 +133,47 @@
  ];
 }
 
+interface GetDefaultBucketResponse {
+ name: string;
+ location: string;
+ bucket: {
+ name: string;
+ };
+}
+
 /** Response type for obtaining the storage service agent */
 interface StorageServiceAccountResponse {
  email_address: string;
  kind: string;
 }
 
 export async function getDefaultBucket(projectId: string): Promise<string> {
  await ensure(projectId, "firebasestorage.googleapis.com", "storage", false);
  try {
  const localAPIClient = new Client({ urlPrefix: firebaseStorageOrigin, apiVersion: "v1alpha" });
- const response = await localAPIClient.get<{ name: string }>(
+ const response = await localAPIClient.get<GetDefaultBucketResponse>(
  `/projects/${projectId}/defaultBucket`
  );
- if (!response.body?.name) {
+ if (!response.body?.bucket.name) {
  logger.debug("Default storage bucket is undefined.");
  throw new FirebaseError(
  "Your project is being set up. Please wait a minute before deploying again."
  );
  }
- return response.body.name;
+ return response.body.bucket.name.split("/").pop()!;
  } catch (err: any) {
  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."
+ "\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;
  }
 }
 
 export async function upload(
  source: any,
  uploadUrl: string,
  extraHeaders?: Record<string, string>
 ): Promise<any> {
  const url = new URL(uploadUrl);
  const localAPIClient = new Client({ urlPrefix: url.origin, auth: false });
  const res = await localAPIClient.request({
@@ -177,7 +185,7 @@
  "content-type": "application/zip",
  ...extraHeaders,
  },
  body: source.stream,
  skipLog: { resBody: true },
  });
  return {
@@ -219,7 +227,7 @@
  * Deletes an object via Firebase Storage.
  * @param {string} location A Firebase Storage location, of the form "/v0/b/<bucket>/o/<object>"
  */
 export function deleteObject(location: string): Promise<any> {
  const localAPIClient = new Client({ urlPrefix: storageOrigin });
  return localAPIClient.delete(location);
 }