Merge 92365e8 into 2ce9f33

firebase · Jun 21, 2024 · 3616bcc · 3616bcc
2 parents 2ce9f33 + 92365e8
commit 3616bcc
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 5 deletions.
diff --git a/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/analytics/google-services.json.gpg b/scripts/gha-encrypted/analytics/google-services.json.gpg
diff --git a/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/app/google-services.json.gpg b/scripts/gha-encrypted/app/google-services.json.gpg
diff --git a/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/app_check/app_check_token.txt.gpg b/scripts/gha-encrypted/app_check/app_check_token.txt.gpg
diff --git a/scripts/gha-encrypted/app_check/google-services.json.gpg b/scripts/gha-encrypted/app_check/google-services.json.gpg
diff --git a/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/auth/google-services.json.gpg b/scripts/gha-encrypted/auth/google-services.json.gpg
diff --git a/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/database/google-services.json.gpg b/scripts/gha-encrypted/database/google-services.json.gpg
diff --git a/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/dynamic_links/google-services.json.gpg b/scripts/gha-encrypted/dynamic_links/google-services.json.gpg
diff --git a/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg b/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg
diff --git a/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/firestore/google-services.json.gpg b/scripts/gha-encrypted/firestore/google-services.json.gpg
diff --git a/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/functions/google-services.json.gpg b/scripts/gha-encrypted/functions/google-services.json.gpg
diff --git a/scripts/gha-encrypted/gcs_key_file.json.gpg b/scripts/gha-encrypted/gcs_key_file.json.gpg
diff --git a/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/gma/google-services.json.gpg b/scripts/gha-encrypted/gma/google-services.json.gpg
diff --git a/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/installations/google-services.json.gpg b/scripts/gha-encrypted/installations/google-services.json.gpg
diff --git a/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/messaging/google-services.json.gpg b/scripts/gha-encrypted/messaging/google-services.json.gpg
diff --git a/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/remote_config/google-services.json.gpg b/scripts/gha-encrypted/remote_config/google-services.json.gpg
diff --git a/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg
diff --git a/scripts/gha-encrypted/storage/google-services.json.gpg b/scripts/gha-encrypted/storage/google-services.json.gpg
diff --git a/scripts/gha/restore_secrets.py b/scripts/gha/restore_secrets.py
@@ -169,7 +169,8 @@ def _decrypt(encrypted_file, passphrase):
           encrypted_file],
       check=False,
       text=True,
-      capture_output=True)
+      capture_output=True,
+      encoding="cp1252")
   if result.returncode:
     # Remove any instances of the passphrase from error before logging it.
     raise RuntimeError(result.stderr.replace(passphrase, "****"))
@@ -183,10 +184,14 @@ def _patch_reverse_id(service_plist_path):
   print("Attempting to patch reverse id in Info.plist")
   with open(service_plist_path, "rb") as f:
     service_plist = plistlib.load(f)
-  _patch_file(
-      path=os.path.join(os.path.dirname(service_plist_path), "Info.plist"),
-      placeholder="REPLACE_WITH_REVERSED_CLIENT_ID",
-      value=service_plist["REVERSED_CLIENT_ID"])
+
+  try:
+    _patch_file(
+        path=os.path.join(os.path.dirname(service_plist_path), "Info.plist"),
+        placeholder="REPLACE_WITH_REVERSED_CLIENT_ID",
+        value=service_plist["REVERSED_CLIENT_ID"])
+  except KeyError as e:
+    print("No REVERSED_CLIENT_ID in plist, skipping.")
 
 
 def _patch_bundle_id(service_plist_path):