@mcpher/gas-fakes 2.3.6 → 2.3.7

package/appsscript.json

@@ -3,17 +3,17 @@
   "exceptionLogging": "STACKDRIVER",
   "runtimeVersion": "V8",
   "oauthScopes": [
+    "openid",
+    "https://www.googleapis.com/auth/userinfo.email",
     "https://www.googleapis.com/auth/cloud-platform",
     "https://www.googleapis.com/auth/drive",
     "https://www.googleapis.com/auth/sqlservice",
     "https://www.googleapis.com/auth/script.external_request",
     "https://www.googleapis.com/auth/spreadsheets",
-    "https://www.googleapis.com/auth/userinfo.email",
     "https://www.googleapis.com/auth/documents",
     "https://www.googleapis.com/auth/presentations",
     "https://www.googleapis.com/auth/forms",
     "https://mail.google.com/",
-    "openid",
     "https://www.googleapis.com/auth/calendar"
   ],
   "dependencies": {
@@ -99,4 +99,4 @@
       }
     ]
   }
-}
+}

package/package.json

@@ -38,7 +38,7 @@
   },
   "name": "@mcpher/gas-fakes",
   "author": "bruce mcpherson",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "license": "MIT",
   "main": "main.js",
   "description": "An implementation of the Google Workspace Apps Script runtime: Run native App Script Code on Node and Cloud Run",

package/src/cli/setup.js

@@ -5,7 +5,7 @@ import path from "path";
 import os from "os";
 import { randomUUID } from "node:crypto";
 import { execSync } from "child_process";
-import { checkForGcloudCli, runCommandSync } from "./utils.js";
+import { checkForGcloudCli, runCommandSync, runCommandWithRetrySync } from "./utils.js";
 import { getMsGraphToken, mapGasScopesToMsGraph } from "../support/msgraph/msauth.js";
 
 // --- Utility Functions ---
@@ -794,9 +794,9 @@ export async function authenticateUser(options = {}) {
         }
 
         console.log("...applying IAM permissions");
-        runCommandSync(`gcloud projects add-iam-policy-binding "${projectId}" --member="serviceAccount:${sa_email}" --role="roles/editor" --quiet`, true);
-        runCommandSync(`gcloud iam service-accounts add-iam-policy-binding "${sa_email}" --member="serviceAccount:${sa_email}" --role="roles/iam.serviceAccountTokenCreator" --quiet`, true);
-        runCommandSync(`gcloud iam service-accounts add-iam-policy-binding "${sa_email}" --member="user:${current_user}" --role="roles/iam.serviceAccountTokenCreator" --quiet`, true);
+        runCommandWithRetrySync(`gcloud projects add-iam-policy-binding "${projectId}" --member="serviceAccount:${sa_email}" --role="roles/editor" --quiet`, true);
+        runCommandWithRetrySync(`gcloud iam service-accounts add-iam-policy-binding "${sa_email}" --member="serviceAccount:${sa_email}" --role="roles/iam.serviceAccountTokenCreator" --quiet`, true);
+        runCommandWithRetrySync(`gcloud iam service-accounts add-iam-policy-binding "${sa_email}" --member="user:${current_user}" --role="roles/iam.serviceAccountTokenCreator" --quiet`, true);
 
         const saUniqueId = execSync(`gcloud iam service-accounts describe "${sa_email}" --format="value(uniqueId)"`, { shell: true }).toString().trim();
         console.log(`\n\x1b[1;33m*************************************************************************************************`);

package/src/cli/utils.js

@@ -99,6 +99,27 @@ export function runCommandSync(command, silent = false) {
   }
 }
 
+/**
+ * Helper function to run a shell command sync with retries (useful for GCP eventual consistency).
+ */
+export function runCommandWithRetrySync(command, silent = false, retries = 5, delay = 5000) {
+  for (let i = 0; i <= retries; i++) {
+    try {
+      execSync(command, { stdio: silent ? "ignore" : "inherit", shell: true });
+      return;
+    } catch (error) {
+      if (i < retries) {
+        console.log(`...command failed, retrying in ${delay / 1000}s (${i + 1}/${retries})...`);
+        const start = Date.now();
+        while (Date.now() - start < delay);
+        continue;
+      }
+      console.error(`\nError executing command after ${retries} retries: ${command}`);
+      process.exit(1);
+    }
+  }
+}
+
 /**
  * Parses sandbox-related CLI options into a structured config object.
  */