Generalize createArchive for any directory. (#9131)

* Generalize createArchive for any directory.

Author: annajowang

src/deploy/apphosting/deploy.spec.ts

@@ -89,10 +89,7 @@ describe("apphosting", () => {
         }),
       );
       createBucketStub.resolves();
-      createArchiveStub.resolves({
-        projectSourcePath: "my-project/",
-        zippedSourcePath: "path/to/foo-1234.zip",
-      });
+      createArchiveStub.resolves("path/to/foo-1234.zip");
       uploadObjectStub.resolves({
         bucket: "firebaseapphosting-sources-12345678-us-central1",
         object: "foo-1234",
@@ -109,10 +106,7 @@ describe("apphosting", () => {
       getProjectNumberStub.resolves("000000000000");
       getBucketStub.resolves();
       createBucketStub.resolves();
-      createArchiveStub.resolves({
-        projectSourcePath: "my-project/",
-        zippedSourcePath: "path/to/foo-1234.zip",
-      });
+      createArchiveStub.resolves("path/to/foo-1234.zip");
       uploadObjectStub.resolves({
         bucket: "firebaseapphosting-sources-12345678-us-central1",
         object: "foo-1234",

src/deploy/apphosting/deploy.ts

@@ -73,7 +73,8 @@ export default async function (context: Context, options: Options): Promise<void
   }
 
   for (const cfg of context.backendConfigs.values()) {
-    const { projectSourcePath, zippedSourcePath } = await createArchive(cfg, options.projectRoot);
+    const projectSourcePath = options.projectRoot ? options.projectRoot : process.cwd();
+    const zippedSourcePath = await createArchive(cfg, projectSourcePath);
     const backendLocation = context.backendLocations.get(cfg.backendId);
     if (!backendLocation) {
       throw new FirebaseError(

src/deploy/apphosting/util.ts

@@ -10,33 +10,27 @@ import * as fsAsync from "../../fsAsync";
  * Locates the source code for a backend and creates an archive to eventually upload to GCS.
  * Based heavily on functions upload logic in src/deploy/functions/prepareFunctionsUpload.ts.
  */
-export async function createArchive(
-  config: AppHostingSingle,
-  projectRoot?: string,
-): Promise<{ projectSourcePath: string; zippedSourcePath: string }> {
+export async function createArchive(config: AppHostingSingle, rootDir: string): Promise<string> {
   const tmpFile = tmp.fileSync({ prefix: `${config.backendId}-`, postfix: ".zip" }).name;
   const fileStream = fs.createWriteStream(tmpFile, {
     flags: "w",
     encoding: "binary",
   });
   const archive = archiver("zip");
 
-  if (!projectRoot) {
-    projectRoot = process.cwd();
-  }
   // We must ignore firebase-debug.log or weird things happen if you're in the public dir when you deploy.
   const ignore = config.ignore || ["node_modules", ".git"];
   ignore.push("firebase-debug.log", "firebase-debug.*.log");
-  const gitIgnorePatterns = parseGitIgnorePatterns(projectRoot);
+  const gitIgnorePatterns = parseGitIgnorePatterns(rootDir);
   ignore.push(...gitIgnorePatterns);
   try {
     const files = await fsAsync.readdirRecursive({
-      path: projectRoot,
+      path: rootDir,
       ignore: ignore,
       isGitIgnore: true,
     });
     for (const file of files) {
-      const name = path.relative(projectRoot, file.name);
+      const name = path.relative(rootDir, file.name);
       archive.file(file.name, {
         name,
         mode: file.mode,
@@ -49,7 +43,7 @@ export async function createArchive(
       { original: err as Error, exit: 1 },
     );
   }
-  return { projectSourcePath: projectRoot, zippedSourcePath: tmpFile };
+  return tmpFile;
 }
 
 function parseGitIgnorePatterns(projectRoot: string, gitIgnorePath = ".gitignore"): string[] {