Merge branch 'master' into hlshen/v1beta

hlshen · web-flow · commit 435e2bf86882 · 2024-09-03T16:14:33.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Re-add a dialog to let users know TLS is being provisioned in App Hosting (#7595)
 - Improve Firebase Data Connect postgres security by granting fine grained SQL privileges to the users the need it. (#7578)
 - Remove `dataconnect:sql:migrate` command hard dependency on 'roles/cloudsql.admin'. (#7578)
 - Add support for setting the encryption configuration of restored firestore databases (#7483)
diff --git a/src/apphosting/index.ts b/src/apphosting/index.ts
@@ -45,8 +45,11 @@ async function tlsReady(url: string): Promise<boolean> {
     // At the time of this writing, the error code is ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE.
     // I've chosen to use a regexp in an attempt to be forwards compatible with new versions of
     // SSL.
-    const maybeNodeError = err as { cause: { code: string } };
-    if (/HANDSHAKE_FAILURE/.test(maybeNodeError?.cause?.code)) {
+    const maybeNodeError = err as { cause: { code: string }; code: string };
+    if (
+      /HANDSHAKE_FAILURE/.test(maybeNodeError?.cause?.code) ||
+      "EPROTO" === maybeNodeError?.code
+    ) {
       return false;
     }
     return true;
diff --git a/src/utils.ts b/src/utils.ts
@@ -915,5 +915,12 @@ export function readSecretValue(prompt: string, dataFile?: string): Promise<stri
   if (dataFile && dataFile !== "-") {
     input = dataFile;
   }
-  return Promise.resolve(fs.readFileSync(input, "utf-8"));
+  try {
+    return Promise.resolve(fs.readFileSync(input, "utf-8"));
+  } catch (e: any) {
+    if (e.code === "ENOENT") {
+      throw new FirebaseError(`File not found: ${input}`, { original: e });
+    }
+    throw e;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -915,5 +915,12 @@ export function readSecretValue(prompt: string, dataFile?: string): Promise<stri`
`915`	`915`	`if (dataFile && dataFile !== "-") {`
`916`	`916`	`input = dataFile;`
`917`	`917`	`}`
`918`		`- return Promise.resolve(fs.readFileSync(input, "utf-8"));`
	`918`	`+ try {`
	`919`	`+ return Promise.resolve(fs.readFileSync(input, "utf-8"));`
	`920`	`+ } catch (e: any) {`
	`921`	`+ if (e.code === "ENOENT") {`
	`922`	+ throw new FirebaseError(`File not found: ${input}`, { original: e });
	`923`	`+ }`
	`924`	`+ throw e;`
	`925`	`+ }`
`919`	`926`	`}`