Merge branch 'main' into garethgeorge/typed

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,6 +10,7 @@ Note: Before submitting a pull request, please open an issue for discussion if y
 - [ ] **Lint** pass:   `npm run lint` (see [Style](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md#style))
 - [ ] These samples need a new **API enabled** in testing projects to pass (let us know which ones)
 - [ ] These samples need a new/updated **env vars** in testing projects set to pass (let us know which ones)
+- [ ] This pull request is from a branch created directly off of `GoogleCloudPlatform/nodejs-docs-samples`. Not a fork.
 - [ ] This sample adds a new sample directory, and I updated the [CODEOWNERS file](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CODEOWNERS) with the codeowners for this sample
 - [ ] This sample adds a new sample directory, and I created [GitHub Actions workflow](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/CONTRIBUTING.md#adding-new-samples) for this sample
 - [ ] This sample adds a new **Product API**, and I updated the [Blunderbuss issue/PR auto-assigner](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/.github/blunderbuss.yml) with the codeowners for this sample

.kokoro/run/websockets.cfg

@@ -16,5 +16,5 @@ env_vars: {
 # Override common.cfg to include puppeteer
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/node:14-puppeteer"
+    value: "gcr.io/cloud-devrel-kokoro-resources/node:16-puppeteer"
 }

CONTRIBUTING.md

@@ -32,13 +32,15 @@ Console](https://console.cloud.google.com/apis/library).
 ## Adding new samples
 
 All samples must have tests. We use `mocha` as testing framework. The
-package.json file within your sample directory must contain a test script that
+`package.json` file within your sample directory must contain a test script that
 executes the `mocha` tests via `npm test`
 ([example](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/batch/package.json#L13)).
 
 For new samples, a GitHub Actions workflow should be created to run your tests
 on the CI system:
 
+1. Check that your new samples and sample tests are on a branch created directly from this repo `GoogleCloudPlatform/nodejs-docs-samples`. Not a fork.
+
 1. Add an entry to
    [.github/workflows/utils/workflows.json](https://github.com/GoogleCloudPlatform/nodejs-docs-samples/blob/main/.github/workflows/utils/workflows.json)
    matching the directory with your sample code.

cloud-sql/mysql/mysql2/package.json

@@ -19,7 +19,7 @@
     "test": "npm run system-test && npm run system-test-tcp && npm run system-test-unix"
   },
   "dependencies": {
-    "@google-cloud/cloud-sql-connector": "^0.4.0",
+    "@google-cloud/cloud-sql-connector": "^0.5.0",
     "@google-cloud/functions-framework": "^3.0.0",
     "@google-cloud/logging-winston": "^5.0.0",
     "@google-cloud/secret-manager": "^4.0.0",

cloud-sql/postgres/knex/package.json

@@ -18,7 +18,7 @@
     "test": "c8 mocha test/*.test.js --timeout=60000 --exit"
   },
   "dependencies": {
-    "@google-cloud/cloud-sql-connector": "^0.4.0",
+    "@google-cloud/cloud-sql-connector": "^0.5.0",
     "@google-cloud/functions-framework": "^3.0.0",
     "@google-cloud/logging-winston": "^5.0.0",
     "@google-cloud/secret-manager": "^4.0.0",

cloud-sql/sqlserver/tedious/Dockerfile

@@ -0,0 +1,37 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Use the official lightweight Node.js image.
+
+# https://hub.docker.com/_/node
+FROM node:18-slim
+
+# Create and change to the app directory.
+WORKDIR /app
+
+# Copy application dependency manifests to the container image.
+# A wildcard is used to ensure both package.json AND package-lock.json are copied.
+# Copying this separately prevents re-running npm install on every code change.
+COPY package*.json ./
+
+# Install dependencies.
+# If you add a package-lock.json speed your build by switching to 'npm ci'.
+# RUN npm ci --only=production
+RUN npm install --production
+
+# Copy local code to the container image.
+COPY . ./
+
+# Run the web service on container startup.
+CMD [ "npm", "start" ]