Robo feedabck

Author: inlined

src/apphosting/config.ts

@@ -1,4 +1,4 @@
-import { join, dirname, basename } from "path";
+import { join, dirname } from "path";
 import { writeFileSync } from "fs";
 import * as yaml from "yaml";
 import * as clc from "colorette";
@@ -63,7 +63,7 @@ export function discoverBackendRoot(cwd: string): string | null {
 
   while (true) {
     const files = fs.listFiles(dir);
-    if (files.some((file) => APPHOSTING_YAML_FILE_REGEX.test(file) || basename(file) === ".env")) {
+    if (files.some((file) => APPHOSTING_YAML_FILE_REGEX.test(file) || file === ".env")) {
       return dir;
     }
 

src/apphosting/env.ts

@@ -29,33 +29,34 @@ export async function diffEnvs(
   const matched: string[] = [];
   const conflicts: string[] = [];
 
-  // Note: Can conceivably optimize this by parallelizing lookups of secret values with fetchSecrets.
-  // Unlikely to actually cause noticeable benefits.
-  for (const [key, value] of Object.entries(envs)) {
-    const existingEnv = config.findEnv(doc, key);
-    if (!existingEnv) {
-      newVars.push(key);
-      continue;
-    }
+  await Promise.all(
+    Object.entries(envs).map(async ([key, value]) => {
+      const existingEnv = config.findEnv(doc, key);
+      if (!existingEnv) {
+        newVars.push(key);
+        return;
+      }
 
-    let match = false;
-    if (existingEnv.value) {
-      match = existingEnv.value === value;
-    } else {
-      try {
-        match =
-          value ===
-          (await secretManager.accessSecretVersion(projectId, existingEnv.secret!, "latest"));
-      } catch (err) {
-        utils.logLabeledWarning(
-          "apphosting",
-          `Cannot read value of existing secret ${existingEnv.secret!} to see if it has changed. Assuming it has changed.`,
-        );
+      let match = false;
+      if (existingEnv.value) {
+        match = existingEnv.value === value;
+      } else {
+        try {
+          match =
+            value ===
+            (await secretManager.accessSecretVersion(projectId, existingEnv.secret!, "latest"));
+        } catch (err) {
+          utils.logLabeledWarning(
+            "apphosting",
+            `Cannot read value of existing secret ${existingEnv.secret!} to see if it has changed. Assuming it has changed.`,
+          );
+        }
       }
-    }
 
-    (match ? matched : conflicts).push(key);
-  }
+      (match ? matched : conflicts).push(key);
+    }),
+  );
+
   return { newVars, matched, conflicts };
 }
 

src/commands/apphosting-env-import.ts

@@ -9,7 +9,7 @@ import { fileExistsSync } from "../fsutils";
 import { FirebaseError } from "../error";
 import { promises as fs } from "fs";
 import * as path from "path";
-import * as env from "../functions/env";
+import * as functionsEnv from "../functions/env";
 import * as config from "../apphosting/config";
 import * as prompt from "../prompt";
 import { requirePermissions } from "../requirePermissions";
@@ -57,7 +57,7 @@ export const command = new Command("apphosting:env:import")
     }
 
     const envFileContent = await fs.readFile(envFilePath, "utf8");
-    const { envs, errors } = env.parse(envFileContent);
+    const { envs, errors } = functionsEnv.parse(envFileContent);
 
     if (errors.length > 0) {
       throw new FirebaseError(`Invalid .env file: ${errors.join(", ")}`);