From d860a5f70bab6c2772176b1ca0c0e7a4d391537e Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Tue, 4 Mar 2025 15:18:16 +1100 Subject: [PATCH 1/2] ci(knex): migrate to new ci --- .github/config/nodejs-dev.jsonc | 1 + .github/config/nodejs-prod.jsonc | 1 - cloud-sql/postgres/knex/ci-setup.json | 11 +++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 cloud-sql/postgres/knex/ci-setup.json diff --git a/.github/config/nodejs-dev.jsonc b/.github/config/nodejs-dev.jsonc index 088934266a..73b0d24b80 100644 --- a/.github/config/nodejs-dev.jsonc +++ b/.github/config/nodejs-dev.jsonc @@ -100,6 +100,7 @@ "auth", "batch", "cloud-language", + "cloud-sql/postgres/knex", "cloud-tasks/snippets", "cloud-tasks/tutorial-gcf/app", "cloud-tasks/tutorial-gcf/function", diff --git a/.github/config/nodejs-prod.jsonc b/.github/config/nodejs-prod.jsonc index bee3b1d2ed..f9be4e53d1 100644 --- a/.github/config/nodejs-prod.jsonc +++ b/.github/config/nodejs-prod.jsonc @@ -79,7 +79,6 @@ "automl", // (untested) FAILED_PRECONDITION: Google Cloud AutoML Natural Language was retired on March 15, 2024. Please migrate to Vertex AI instead "cloud-sql/mysql/mysql", // (untested) Error: expected 200 "OK", got 500 "Internal Server Error" "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 diff --git a/cloud-sql/postgres/knex/ci-setup.json b/cloud-sql/postgres/knex/ci-setup.json new file mode 100644 index 0000000000..065c2fdc02 --- /dev/null +++ b/cloud-sql/postgres/knex/ci-setup.json @@ -0,0 +1,11 @@ +{ + "env": { + "INSTANCE_HOST": "127.0.0.1", + "INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:postgres-ci", + "DB_NAME": "kokoro_ci", + "DB_USER": "kokoro_ci" + }, + "secrets": { + "DB_PASSWORD": "nodejs-docs-samples-tests/nodejs-docs-samples-sql-password" + } + } From a5042699d385c1f22d83980fb4f00858710ab926 Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Tue, 4 Mar 2025 16:01:05 +1100 Subject: [PATCH 2/2] update setup --- cloud-sql/postgres/knex/ci-setup.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cloud-sql/postgres/knex/ci-setup.json b/cloud-sql/postgres/knex/ci-setup.json index 065c2fdc02..cc7dc66a30 100644 --- a/cloud-sql/postgres/knex/ci-setup.json +++ b/cloud-sql/postgres/knex/ci-setup.json @@ -1,11 +1,11 @@ { "env": { "INSTANCE_HOST": "127.0.0.1", - "INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:postgres-ci", - "DB_NAME": "kokoro_ci", - "DB_USER": "kokoro_ci" + "INSTANCE_CONNECTION_NAME": "nodejs-docs-samples-tests:us-central1:test-postgres-instance", + "DB_NAME": "ci-database", + "DB_USER": "ci-user" }, "secrets": { - "DB_PASSWORD": "nodejs-docs-samples-tests/nodejs-docs-samples-sql-password" + "DB_PASSWORD": "nodejs-docs-samples-tests/nodejs-docs-samples-test-postgres-instance-ci-user-password" } }