diff --git a/cloud-sql/mysql/mysql/app.standard.yaml b/cloud-sql/mysql/mysql/app.standard.yaml index a57d01a405..8103e36f58 100644 --- a/cloud-sql/mysql/mysql/app.standard.yaml +++ b/cloud-sql/mysql/mysql/app.standard.yaml @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -runtime: nodejs8 +runtime: nodejs10 # The following env variables may contain sensitive information that grants # anyone access to your database. Do not add this file to your source control. diff --git a/cloud-sql/mysql/mysql/package.json b/cloud-sql/mysql/mysql/package.json index e6e565b526..808d133804 100644 --- a/cloud-sql/mysql/mysql/package.json +++ b/cloud-sql/mysql/mysql/package.json @@ -1,7 +1,6 @@ { "name": "cloudsql-mysql-mysql", "description": "Node.js Cloud SQL MySQL Connectivity Sample", - "version": "0.0.1", "private": true, "license": "Apache-2.0", "author": "Google Inc.", @@ -10,7 +9,7 @@ "url": "https://github.com/GoogleCloudPlatform/nodejs-docs-samples.git" }, "engines": { - "node": ">=8.0.0" + "node": ">=10.0.0" }, "scripts": { "system-test": "mocha test/*.test.js --timeout=60000 --exit", @@ -18,7 +17,7 @@ }, "dependencies": { "@google-cloud/logging-winston": "^3.0.0", - "body-parser": "1.19.0", + "body-parser": "^1.19.0", "express": "^4.17.1", "promise-mysql": "^4.0.0", "prompt": "^1.0.0", @@ -26,35 +25,9 @@ "winston": "^3.1.0" }, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "^3.3.0", "mocha": "^6.0.0", "proxyquire": "^2.1.0", "supertest": "^4.0.0", "sinon": "^7.1.1" - }, - "cloud-repo-tools": { - "requiresKeyFile": true, - "requiresProjectId": true, - "test": { - "app": { - "requiredEnvVars": [ - "DB_USER", - "DB_PASS", - "DB_NAME", - "CLOUD_SQL_INSTANCE_NAME" - ], - "args": [ - "server.js" - ] - }, - "build": { - "requiredEnvVars": [ - "DB_USER", - "DB_PASS", - "DB_NAME", - "CLOUD_SQL_INSTANCE_NAME" - ] - } - } } } diff --git a/cloud-sql/mysql/mysql/test/server.test.js b/cloud-sql/mysql/mysql/test/server.test.js index 451a4c9170..82dd88dec9 100644 --- a/cloud-sql/mysql/mysql/test/server.test.js +++ b/cloud-sql/mysql/mysql/test/server.test.js @@ -17,7 +17,6 @@ const request = require('supertest'); const sinon = require('sinon'); const assert = require('assert'); -const tools = require('@google-cloud/nodejs-repo-tools'); // Stub out MySQL calls const stubMysql = sinon.stub(require('promise-mysql')); @@ -30,9 +29,6 @@ stubMysql.createPool.returns(poolStub); const server = require('../server.js'); -beforeEach(tools.stubConsole); -afterEach(tools.restoreConsole); - it('check index page', async () => { const response = await request(server) .get('/')