Skip to content

chore(cloud-sql): migrate mysql, postgres samples to new CI #4055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glasnt merged 6 commits into from
Apr 1, 2025
Merged

chore(cloud-sql): migrate mysql, postgres samples to new CI #4055

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efd5936
chore(cloud-sql): migrate mysql, postgres samples to new CI
glasnt Mar 31, 2025
f59eff6
rename to match postgres version
glasnt Mar 31, 2025
c153239
acquireTimeout warns in mysql2, remove
glasnt Apr 1, 2025
7696606
mysql2 query returns [results, fields], so only return fields
glasnt Apr 1, 2025
4eaadb5
remove unused test scripts
glasnt Apr 1, 2025
969e514
revert bot-suggested rename: would cause excessive region tag change
glasnt Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/config/nodejs-dev.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
"batch",
"cloud-language",
"cloud-sql/mysql/mysql",
"cloud-sql/mysql/mysql2",
"cloud-sql/postgres/knex",
"cloud-tasks/snippets",
"cloud-tasks/tutorial-gcf/app",
"cloud-tasks/tutorial-gcf/function",
Expand Down
2 changes: 0 additions & 2 deletions .github/config/nodejs-prod.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +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/mysql/mysql2", // (untested) Error: Cannot find module './connect-connector-with-iam-authn.js'
"cloud-sql/postgres/knex", // (untested) CloudSQLConnectorError: Malformed instance connection name provided: expected format of "PROJECT:REGION:INSTANCE", got undefined
"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
Expand Down
14 changes: 14 additions & 0 deletions cloud-sql/mysql/mysql2/ci-setup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"env": {
"INSTANCE_HOST": "127.0.0.1",
"INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:mysql-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"
}
}
2 changes: 1 addition & 1 deletion cloud-sql/mysql/mysql2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'use strict';

const express = require('express');
const createConnectorIAMAuthnPool = require('./connect-connector-with-iam-authn.js');
const createConnectorIAMAuthnPool = require('./connect-connector-auto-iam-authn.js');
const createConnectorPool = require('./connect-connector.js');
const createTcpPool = require('./connect-tcp.js');
const createUnixSocketPool = require('./connect-unix.js');
Expand Down
14 changes: 14 additions & 0 deletions cloud-sql/postgres/knex/ci-setup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"env": {
"INSTANCE_HOST": "127.0.0.1",
"INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:postgres-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"
}
}
3 changes: 2 additions & 1 deletion cloud-sql/postgres/knex/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
},
"scripts": {
"start": "node server/server.js",
"proxy": "$GITHUB_WORKSPACE/.github/workflows/utils/sql-proxy.sh",
"start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -dir=/cloudsql -instances=$INSTANCE_CONNECTION_NAME &",
"test": "c8 mocha -p -j 2 test/*.test.js --timeout=60000 --exit"
"test": "npm run proxy -- c8 mocha -p -j 2 test/*.test.js --timeout=60000 --exit"
},
"dependencies": {
"@google-cloud/cloud-sql-connector": "^1.0.0",
Expand Down
Loading