chore: Fix the coverage check github action.

Author: hessjcg

.github/workflows/coverage.yml

@@ -59,6 +59,7 @@ jobs:
         run: |
           echo "BASE BRANCH CODE COVERAGE is ${{ env.CUR_COVER }}%"
           echo "PULL REQUEST CODE COVERAGE is ${{ env.PR_COVER }}%"
-          if [ "${{ env.PR_COVER }}" -lt "$(( env.CUR_COVER - 2 ))"  ]; then
+          if (( PR_COVER - 2 > CUR_COVER )); then
+            echo "Coverage check failed: PR reduces code coverage by more than 2%."
             exit 1;
           fi

build.sh

@@ -74,41 +74,45 @@ function deps() {
 # write_e2e_env - Loads secrets from the gcloud project and writes
 #     them to target/e2e.env to run e2e tests.
 function write_e2e_env(){
-  # All secrets used by the e2e tests in the form <env_name>=<secret_name>
+  # Set the default to .envrc file if no argument is passed
+  # Format: <env-var-name>=<secret-name>
+  outfile="${1:-.envrc}"
   secret_vars=(
     MYSQL_CONNECTION_NAME=MYSQL_CONNECTION_NAME
     MYSQL_USER=MYSQL_USER
-    MYSQL_USER_IAM=MYSQL_USER_IAM_GO
     MYSQL_PASS=MYSQL_PASS
     MYSQL_DB=MYSQL_DB
     MYSQL_MCP_CONNECTION_NAME=MYSQL_MCP_CONNECTION_NAME
     MYSQL_MCP_PASS=MYSQL_MCP_PASS
     POSTGRES_CONNECTION_NAME=POSTGRES_CONNECTION_NAME
     POSTGRES_USER=POSTGRES_USER
-    POSTGRES_USER_IAM=POSTGRES_USER_IAM_GO
     POSTGRES_PASS=POSTGRES_PASS
     POSTGRES_DB=POSTGRES_DB
     POSTGRES_CAS_CONNECTION_NAME=POSTGRES_CAS_CONNECTION_NAME
     POSTGRES_CAS_PASS=POSTGRES_CAS_PASS
     POSTGRES_CUSTOMER_CAS_CONNECTION_NAME=POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
     POSTGRES_CUSTOMER_CAS_PASS=POSTGRES_CUSTOMER_CAS_PASS
-    POSTGRES_CUSTOMER_CAS_DOMAIN_NAME=POSTGRES_CUSTOMER_CAS_DOMAIN_NAME
-    POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME=POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME
+    POSTGRES_CUSTOMER_CAS_DOMAIN_NAME=POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME
+    POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME=POSTGRES_CUSTOMER_CAS_PASS_INVALID_DOMAIN_NAME
     POSTGRES_MCP_CONNECTION_NAME=POSTGRES_MCP_CONNECTION_NAME
     POSTGRES_MCP_PASS=POSTGRES_MCP_PASS
     SQLSERVER_CONNECTION_NAME=SQLSERVER_CONNECTION_NAME
     SQLSERVER_USER=SQLSERVER_USER
     SQLSERVER_PASS=SQLSERVER_PASS
     SQLSERVER_DB=SQLSERVER_DB
+    IMPERSONATED_USER=IMPERSONATED_USER
     QUOTA_PROJECT=QUOTA_PROJECT
   )
 
-  if [[ -z "$TEST_PROJECT" ]] ; then
+  if [[ -z "${TEST_PROJECT:-}" ]] ; then
     echo "Set TEST_PROJECT environment variable to the project containing"
     echo "the e2e test suite secrets."
     exit 1
   fi
 
+  echo "Getting test secrets from $TEST_PROJECT into $outfile"
+  local_user=$(gcloud auth list --format 'value(account)' | tr -d '\n')
+
   echo "Getting test secrets from $TEST_PROJECT into $1"
   {
   for env_name in "${secret_vars[@]}" ; do
@@ -118,7 +122,10 @@ function write_e2e_env(){
     val=$(gcloud secrets versions access latest --project "$TEST_PROJECT" --secret="$secret_name")
     echo "export $env_var_name='$val'"
   done
-  } > "$1"
+  # Set IAM User env vars to the local gcloud user
+  echo "export MYSQL_IAM_USER='${local_user%%@*}'"
+  echo "export POSTGRES_IAM_USER='$local_user'"
+  } > "$outfile"
 
 }
 

examples/prisma/mysql/test/connect.cjs

@@ -19,7 +19,7 @@ const t = require('tap');
 function generatePrismaClient() {
   const schemaPath = resolve(__dirname, '../schema.prisma');
 
-  execSync(`npx prisma generate --schema=${schemaPath}`);
+  execSync(`npm exec prisma -- generate --schema=${schemaPath}`);
 }
 
 t.test('mysql prisma cjs', async t => {

examples/prisma/mysql/test/connect.mjs

@@ -22,7 +22,7 @@ function generatePrismaClient() {
     const __dirname = dirname(p)
     const schemaPath = resolve(__dirname, '../schema.prisma');
 
-    execSync(`npx prisma generate --schema=${schemaPath}`);
+    execSync(`npm exec prisma -- generate --schema=${schemaPath}`);
 }
 
 t.test('mysql prisma mjs', async t => {

examples/prisma/mysql/test/connect.ts

@@ -19,7 +19,7 @@ import t from 'tap';
 function generatePrismaClient() {
   const schemaPath = resolve(__dirname, '../schema.prisma');
 
-  execSync(`npx prisma generate --schema=${schemaPath}`);
+  execSync(`npm exec prisma -- generate --schema=${schemaPath}`);
 }
 
 t.test('mysql prisma ts', async t => {

examples/prisma/postgresql/test/connect.cjs

@@ -19,7 +19,7 @@ const t = require('tap');
 function generatePrismaClient() {
   const schemaPath = resolve(__dirname, '../schema.prisma');
 
-  execSync(`npx prisma generate --schema=${schemaPath}`);
+  execSync(`npm exec prisma -- generate --schema=${schemaPath}`);
 }
 
 t.test('pg prisma cjs', async t => {

examples/prisma/postgresql/test/connect.mjs

@@ -22,7 +22,7 @@ function generatePrismaClient() {
     const __dirname = dirname(p)
     const schemaPath = resolve(__dirname, '../schema.prisma');
 
-    execSync(`npx prisma generate --schema=${schemaPath}`);
+    execSync(`npm exec prisma -- generate --schema=${schemaPath}`);
 }
 
 t.test('pg prisma mjs', async t => {

examples/prisma/postgresql/test/connect.ts

@@ -19,7 +19,7 @@ import t from 'tap';
 function generatePrismaClient() {
   const schemaPath = resolve(__dirname, '../schema.prisma');
 
-  execSync(`npx prisma generate --schema=${schemaPath}`);
+  execSync(`npm exec prisma -- generate --schema=${schemaPath}`);
 }
 
 t.test('pg prisma ts', async t => {