Merge branch 'main' into sql-tests-2

Author: glasnt

.github/config/nodejs-dev.jsonc

@@ -36,9 +36,9 @@
     ".github/ISSUE_TEMPLATE/",
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".github/auto-label.yaml",
-    ".github/blunderbuss.yaml",
+    ".github/blunderbuss.yml",
     ".github/flakybot.yaml",
-    ".github/header-checker-lint.yaml",
+    ".github/header-checker-lint.yml",
     ".github/scripts/",
     ".github/snippet-bot.yml",
     ".github/trusted-contribution.yml",

.github/config/nodejs-prod.jsonc

@@ -36,9 +36,9 @@
     ".github/ISSUE_TEMPLATE/",
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".github/auto-label.yaml",
-    ".github/blunderbuss.yaml",
+    ".github/blunderbuss.yml",
     ".github/flakybot.yaml",
-    ".github/header-checker-lint.yaml",
+    ".github/header-checker-lint.yml",
     ".github/scripts/",
     ".github/snippet-bot.yml",
     ".github/trusted-contribution.yml",

recaptcha_enterprise/demosite/app/controllers/controller.js

@@ -249,6 +249,7 @@ const onCommentSubmit = async (req, res) => {
 };
 
 // Classify the action as BAD/ NOT_BAD based on conditions specified.
+// See https://cloud.google.com/recaptcha/docs/interpret-assessment-website
 const checkForBadAction = function (assessmentResponse, recaptchaAction) {
   let label = Label.NOT_BAD;
   let reason = '';

run/idp-sql/package.json

@@ -15,7 +15,7 @@
   "scripts": {
     "start": "node index.js",
     "unit-test": "c8 mocha -p -j 2 test/app.test.js --timeout=120000 --exit",
-    "system-test": "test/proxy-setup.sh && c8 mocha -p -j 2 test/system.test.js --timeout=1800000 --exit",
+    "system-test": "c8 mocha -p -j 2 test/system.test.js --timeout=1800000 --exit",
     "all-test": "npm run unit-test && npm run system-test",
     "test": "npm -- run all-test"
   },

run/idp-sql/test/proxy-setup.sh

@@ -33,35 +33,32 @@
 # If first cmd executes successfully then execute second cmd
 runIfSuccessful() {
   echo "running: $1"
-  $($1 > /dev/null)
+  $($1 >/dev/null)
   if [ $? -eq 0 ]; then
     echo "running: $2"
-    $($2 > /dev/null)
+    $($2 >/dev/null)
   fi
 }
 
 # Define max retries
-max_attempts=3;
-attempt_num=1;
+max_attempts=3
+attempt_num=1
 
 arg1="$1"
 arg2="$2"
 
-if [ $# -eq 1 ]
-then
+if [ $# -eq 1 ]; then
   cmd="$arg1"
 else
   cmd="runIfSuccessful \"$arg1\" \"$arg2\""
 fi
 
-until eval $cmd
-do
-    if ((attempt_num==max_attempts))
-    then
-        echo "Attempt $attempt_num / $max_attempts failed! No more retries left!"
-        exit
-    else
-        echo "Attempt $attempt_num / $max_attempts failed!"
-        sleep $((attempt_num++))
-    fi
+until eval $cmd; do
+  if ((attempt_num == max_attempts)); then
+    echo "Attempt $attempt_num / $max_attempts failed! No more retries left!"
+    exit 1
+  else
+    echo "Attempt $attempt_num / $max_attempts failed!"
+    sleep $((attempt_num++))
+  fi
 done

run/markdown-preview/editor/test/retry.sh

@@ -40,8 +40,11 @@ describe('End-to-End Tests', () => {
       `gcloud builds submit --project ${GOOGLE_CLOUD_PROJECT} ` +
       '--config ../renderer/test/e2e_test_setup.yaml ' +
       `--substitutions _SERVICE=renderer-${SERVICE_NAME},_REGION=${REGION}`;
+
     if (SAMPLE_VERSION) buildRendererCmd += `,_VERSION=${SAMPLE_VERSION}`;
-    if (SERVICE_ACCOUNT) buildRendererCmd += `,_SERVICE_ACCOUNT=${SERVICE_ACCOUNT}`;
+    if (SERVICE_ACCOUNT) {
+      buildRendererCmd += `,_SERVICE_ACCOUNT=${SERVICE_ACCOUNT}`;
+    }
 
     console.log('Starting Cloud Build for Renderer service...');
     execSync(buildRendererCmd, {cwd: '../renderer'});

run/markdown-preview/editor/test/system.test.js

@@ -33,35 +33,32 @@
 # If first cmd executes successfully then execute second cmd
 runIfSuccessful() {
   echo "running: $1"
-  $($1 > /dev/null)
+  $($1 >/dev/null)
   if [ $? -eq 0 ]; then
     echo "running: $2"
-    $($2 > /dev/null)
+    $($2 >/dev/null)
   fi
 }
 
 # Define max retries
-max_attempts=3;
-attempt_num=1;
+max_attempts=3
+attempt_num=1
 
 arg1="$1"
 arg2="$2"
 
-if [ $# -eq 1 ]
-then
+if [ $# -eq 1 ]; then
   cmd="$arg1"
 else
   cmd="runIfSuccessful \"$arg1\" \"$arg2\""
 fi
 
-until eval $cmd
-do
-    if ((attempt_num==max_attempts))
-    then
-        echo "Attempt $attempt_num / $max_attempts failed! No more retries left!"
-        exit
-    else
-        echo "Attempt $attempt_num / $max_attempts failed!"
-        sleep $((attempt_num++))
-    fi
+until eval $cmd; do
+  if ((attempt_num == max_attempts)); then
+    echo "Attempt $attempt_num / $max_attempts failed! No more retries left!"
+    exit 1
+  else
+    echo "Attempt $attempt_num / $max_attempts failed!"
+    sleep $((attempt_num++))
+  fi
 done

run/markdown-preview/renderer/test/retry.sh

@@ -33,7 +33,6 @@ describe('End-to-End Tests', () => {
   const {SERVICE_ACCOUNT} = process.env;
   const REGION = 'us-central1';
 
-
   let BASE_URL;
   before(async () => {
     // Deploy service using Cloud Build
@@ -55,7 +54,6 @@ describe('End-to-End Tests', () => {
     );
     BASE_URL = url.toString('utf-8').trim();
     if (!BASE_URL) throw Error('Cloud Run service URL not found');
-
   });
 
   after(() => {