From 3bf20615fa4ba887dfcb29c7b183f9270e06722f Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Tue, 1 Apr 2025 12:03:12 +1100 Subject: [PATCH 1/4] chore(ci): migrate sqlserver/mssql sample to new ci --- .github/config/nodejs-dev.jsonc | 1 + .github/config/nodejs.jsonc | 1 - cloud-sql/sqlserver/mssql/ci-setup.json | 14 ++++++++++++++ cloud-sql/sqlserver/mssql/package.json | 3 ++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 cloud-sql/sqlserver/mssql/ci-setup.json diff --git a/.github/config/nodejs-dev.jsonc b/.github/config/nodejs-dev.jsonc index b2192a0525..c8ca78b18b 100644 --- a/.github/config/nodejs-dev.jsonc +++ b/.github/config/nodejs-dev.jsonc @@ -103,6 +103,7 @@ "cloud-sql/mysql/mysql", "cloud-sql/mysql/mysql2", "cloud-sql/postgres/knex", + "cloud-sql/sqlserver/mssql", "cloud-tasks/snippets", "cloud-tasks/tutorial-gcf/app", "cloud-tasks/tutorial-gcf/function", diff --git a/.github/config/nodejs.jsonc b/.github/config/nodejs.jsonc index da7625698a..b8bc67ffcb 100644 --- a/.github/config/nodejs.jsonc +++ b/.github/config/nodejs.jsonc @@ -77,7 +77,6 @@ // TODO: fix these "ai-platform/snippets", // PERMISSION_DENIED: Permission denied: Consumer 'projects/undefined' has been suspended. "automl", // (untested) FAILED_PRECONDITION: Google Cloud AutoML Natural Language was retired on March 15, 2024. Please migrate to Vertex AI instead - "cloud-sql/sqlserver/mssql", // (untested) TypeError: The "config.server" property is required and must be of type string. "cloud-sql/sqlserver/tedious", // (untested) TypeError: The "config.server" property is required and must be of type string. "compute", // GoogleError: The resource 'projects/long-door-651/zones/us-central1-a/disks/disk-from-pool-name' was not found "dataproc", // GoogleError: Error submitting create cluster request: Multiple validation errors diff --git a/cloud-sql/sqlserver/mssql/ci-setup.json b/cloud-sql/sqlserver/mssql/ci-setup.json new file mode 100644 index 0000000000..0096fb06cb --- /dev/null +++ b/cloud-sql/sqlserver/mssql/ci-setup.json @@ -0,0 +1,14 @@ +{ + "env": { + "INSTANCE_HOST": "127.0.0.1", + "INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:sql-server-ci", + "UNIX_SOCKET_DIR": "tmp/cloudsql", + "CLOUD_SQL_CONNECTION_NAME": "$INSTANCE_CONNECTION_NAME", + "INSTANCE_UNIX_SOCKET": "$UNIX_SOCKET_DIR/$INSTANCE_CONNECTION_NAME", + "DB_NAME": "kokoro_ci", + "DB_USER": "kokoro_ci" + }, + "secrets": { + "DB_PASS": "nodejs-docs-samples-tests/nodejs-docs-samples-sql-password" + } + } diff --git a/cloud-sql/sqlserver/mssql/package.json b/cloud-sql/sqlserver/mssql/package.json index c048ae73a4..f1831404cc 100644 --- a/cloud-sql/sqlserver/mssql/package.json +++ b/cloud-sql/sqlserver/mssql/package.json @@ -13,7 +13,8 @@ }, "scripts": { "start": "node server/server.js", - "system-test": "c8 mocha -p -j 2 test/*.test.js --timeout=60000 --exit", + "proxy": "$GITHUB_WORKSPACE/.github/workflows/utils/sql-proxy.sh", + "system-test": "npm run proxy -- c8 mocha -p -j 2 test/*.test.js --timeout=60000 --exit", "test": "npm run system-test" }, "dependencies": { From 58d98eea9143a685da4bd37debfc4e627f884a23 Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Thu, 17 Apr 2025 14:59:29 +1000 Subject: [PATCH 2/4] remove unneeded envvars --- cloud-sql/sqlserver/mssql/ci-setup.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/cloud-sql/sqlserver/mssql/ci-setup.json b/cloud-sql/sqlserver/mssql/ci-setup.json index 0096fb06cb..95547780f2 100644 --- a/cloud-sql/sqlserver/mssql/ci-setup.json +++ b/cloud-sql/sqlserver/mssql/ci-setup.json @@ -2,9 +2,7 @@ "env": { "INSTANCE_HOST": "127.0.0.1", "INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:sql-server-ci", - "UNIX_SOCKET_DIR": "tmp/cloudsql", "CLOUD_SQL_CONNECTION_NAME": "$INSTANCE_CONNECTION_NAME", - "INSTANCE_UNIX_SOCKET": "$UNIX_SOCKET_DIR/$INSTANCE_CONNECTION_NAME", "DB_NAME": "kokoro_ci", "DB_USER": "kokoro_ci" }, From d56c99f475245e61d4645e09eaac202e09f7eed0 Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Thu, 17 Apr 2025 15:00:10 +1000 Subject: [PATCH 3/4] another --- cloud-sql/sqlserver/mssql/ci-setup.json | 1 - 1 file changed, 1 deletion(-) diff --git a/cloud-sql/sqlserver/mssql/ci-setup.json b/cloud-sql/sqlserver/mssql/ci-setup.json index 95547780f2..7681a382fa 100644 --- a/cloud-sql/sqlserver/mssql/ci-setup.json +++ b/cloud-sql/sqlserver/mssql/ci-setup.json @@ -2,7 +2,6 @@ "env": { "INSTANCE_HOST": "127.0.0.1", "INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:sql-server-ci", - "CLOUD_SQL_CONNECTION_NAME": "$INSTANCE_CONNECTION_NAME", "DB_NAME": "kokoro_ci", "DB_USER": "kokoro_ci" }, From bca80e98ca0c69ed88c01d58b333698183f2706c Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Thu, 17 Apr 2025 15:03:10 +1000 Subject: [PATCH 4/4] used by proxy (other samples use this) --- cloud-sql/sqlserver/mssql/ci-setup.json | 1 + 1 file changed, 1 insertion(+) diff --git a/cloud-sql/sqlserver/mssql/ci-setup.json b/cloud-sql/sqlserver/mssql/ci-setup.json index 7681a382fa..95547780f2 100644 --- a/cloud-sql/sqlserver/mssql/ci-setup.json +++ b/cloud-sql/sqlserver/mssql/ci-setup.json @@ -2,6 +2,7 @@ "env": { "INSTANCE_HOST": "127.0.0.1", "INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:sql-server-ci", + "CLOUD_SQL_CONNECTION_NAME": "$INSTANCE_CONNECTION_NAME", "DB_NAME": "kokoro_ci", "DB_USER": "kokoro_ci" },