From 130c40a778bcdfafc0ba843c6a978d99132fefe1 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 12 Mar 2025 16:00:59 -0700 Subject: [PATCH 1/8] chore!: migrate translate to Node 18 --- packages/google-cloud-translate/package.json | 30 +++++++++---------- .../samples/package.json | 2 +- packages/google-cloud-translate/test/index.ts | 3 +- packages/google-cloud-translate/tsconfig.json | 4 ++- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/packages/google-cloud-translate/package.json b/packages/google-cloud-translate/package.json index 81f86ae5f449..62563fa3bde1 100644 --- a/packages/google-cloud-translate/package.json +++ b/packages/google-cloud-translate/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "author": "Google Inc.", "engines": { - "node": ">=14.0.0" + "node": ">=18.0.0" }, "repository": { "type": "git", @@ -49,36 +49,36 @@ "test": "c8 mocha build/test" }, "dependencies": { - "@google-cloud/common": "^5.0.0", - "@google-cloud/promisify": "^4.0.0", + "@google-cloud/common": "^6.0.0", "arrify": "^2.0.0", - "extend": "^3.0.2", - "google-gax": "^4.0.3", + "google-gax": "^5.0.0-rc.3", "is-html": "^2.0.0" }, "devDependencies": { + "@google-cloud/promisify": "^5.0.0", "@types/extend": "^3.0.0", "@types/mocha": "^9.0.0", "@types/node": "^22.0.0", "@types/proxyquire": "^1.3.28", - "@types/request": "^2.47.1", + "@types/request": "^2.48.12", "@types/sinon": "^17.0.0", "c8": "^9.0.0", "codecov": "^3.0.2", - "gapic-tools": "^0.4.0", - "google-auth-library": "^9.0.0", - "gts": "^5.0.0", + "extend": "^3.0.2", + "gapic-tools": "^1.0.1", + "google-auth-library": "^10.0.0-rc.1", + "gts": "^6.0.2", "http2spy": "^2.0.0", - "jsdoc": "^4.0.0", + "jsdoc": "^4.0.4", "jsdoc-fresh": "^3.0.0", "jsdoc-region-tag": "^3.0.0", "linkinator": "4.1.2", "long": "^5.2.3", - "mocha": "^9.2.2", + "mocha": "^11.1.0", "pack-n-play": "^2.0.0", - "proxyquire": "^2.0.1", - "sinon": "^18.0.0", - "typescript": "^5.1.6" + "proxyquire": "^2.1.3", + "sinon": "^19.0.2", + "typescript": "^5.8.2" }, "homepage": "https://github.com/googleapis/google-cloud-node/tree/main/packages/google-cloud-translate" -} \ No newline at end of file +} diff --git a/packages/google-cloud-translate/samples/package.json b/packages/google-cloud-translate/samples/package.json index 7098f0743ed1..7cde6e81c39f 100644 --- a/packages/google-cloud-translate/samples/package.json +++ b/packages/google-cloud-translate/samples/package.json @@ -8,7 +8,7 @@ "!test/" ], "engines": { - "node": ">=14.0.0" + "node": ">=18" }, "scripts": { "test": "mocha --recursive --timeout 240000" diff --git a/packages/google-cloud-translate/test/index.ts b/packages/google-cloud-translate/test/index.ts index 24ebb33a8268..7b4c98121dbf 100644 --- a/packages/google-cloud-translate/test/index.ts +++ b/packages/google-cloud-translate/test/index.ts @@ -570,7 +570,7 @@ describe('Translate v2', () => { FakeService.prototype.request = request; }); - it('should make the correct request', done => { + it.only('should make the correct request', done => { const fakeOptions = { uri: '/test', a: 'b', @@ -587,6 +587,7 @@ describe('Translate v2', () => { callback(); }; + console.log(translate); translate.request(fakeOptions, done); }); }); diff --git a/packages/google-cloud-translate/tsconfig.json b/packages/google-cloud-translate/tsconfig.json index c78f1c884ef6..76a6f4d56f1c 100644 --- a/packages/google-cloud-translate/tsconfig.json +++ b/packages/google-cloud-translate/tsconfig.json @@ -14,6 +14,8 @@ "src/**/*.ts", "test/*.ts", "test/**/*.ts", - "system-test/*.ts" + "system-test/*.ts", + "src/**/*.json", + "protos/**/*.json", ] } From 37679408023884160bd5ba028c3b780980176dcf Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 12 Mar 2025 23:08:29 +0000 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- packages/google-cloud-translate/README.md | 4 ++-- packages/google-cloud-translate/protos/protos.json | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/google-cloud-translate/README.md b/packages/google-cloud-translate/README.md index 11cbc7675ca3..f0b337787c32 100644 --- a/packages/google-cloud-translate/README.md +++ b/packages/google-cloud-translate/README.md @@ -44,7 +44,7 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained]. 1. [Select or create a Cloud Platform project][projects]. 1. [Enable billing for your project][billing]. 1. [Enable the Cloud Translation API][enable_api]. -1. [Set up authentication][auth] so you can access the +1. [Set up authentication with a service account][auth] so you can access the API from your local workstation. ### Installing the client library @@ -211,4 +211,4 @@ See [LICENSE](https://github.com/googleapis/google-cloud-node/blob/main/LICENSE) [projects]: https://console.cloud.google.com/project [billing]: https://support.google.com/cloud/answer/6293499#enable-billing [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=translate.googleapis.com -[auth]: https://cloud.google.com/docs/authentication/external/set-up-adc-local +[auth]: https://cloud.google.com/docs/authentication/getting-started diff --git a/packages/google-cloud-translate/protos/protos.json b/packages/google-cloud-translate/protos/protos.json index 1861d8893bff..ed952b8b6d36 100644 --- a/packages/google-cloud-translate/protos/protos.json +++ b/packages/google-cloud-translate/protos/protos.json @@ -1,7 +1,4 @@ { - "options": { - "syntax": "proto3" - }, "nested": { "google": { "nested": { From 16323d238725f8eec51fac6f82fee0c281391f88 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 12 Mar 2025 16:21:26 -0700 Subject: [PATCH 3/8] redo some upgrades --- packages/google-cloud-translate/package.json | 20 +++++++++---------- packages/google-cloud-translate/test/index.ts | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/google-cloud-translate/package.json b/packages/google-cloud-translate/package.json index 62563fa3bde1..5e76fe6e8a92 100644 --- a/packages/google-cloud-translate/package.json +++ b/packages/google-cloud-translate/package.json @@ -50,35 +50,35 @@ }, "dependencies": { "@google-cloud/common": "^6.0.0", + "@google-cloud/promisify": "^5.0.0", "arrify": "^2.0.0", + "extend": "^3.0.2", "google-gax": "^5.0.0-rc.3", "is-html": "^2.0.0" }, "devDependencies": { - "@google-cloud/promisify": "^5.0.0", "@types/extend": "^3.0.0", "@types/mocha": "^9.0.0", "@types/node": "^22.0.0", "@types/proxyquire": "^1.3.28", - "@types/request": "^2.48.12", + "@types/request": "^2.47.1", "@types/sinon": "^17.0.0", "c8": "^9.0.0", "codecov": "^3.0.2", - "extend": "^3.0.2", - "gapic-tools": "^1.0.1", + "gapic-tools": "^0.4.0", "google-auth-library": "^10.0.0-rc.1", - "gts": "^6.0.2", + "gts": "^5.0.0", "http2spy": "^2.0.0", - "jsdoc": "^4.0.4", + "jsdoc": "^4.0.0", "jsdoc-fresh": "^3.0.0", "jsdoc-region-tag": "^3.0.0", "linkinator": "4.1.2", "long": "^5.2.3", - "mocha": "^11.1.0", + "mocha": "^9.2.2", "pack-n-play": "^2.0.0", - "proxyquire": "^2.1.3", - "sinon": "^19.0.2", - "typescript": "^5.8.2" + "proxyquire": "^2.0.1", + "sinon": "^18.0.0", + "typescript": "^5.1.6" }, "homepage": "https://github.com/googleapis/google-cloud-node/tree/main/packages/google-cloud-translate" } diff --git a/packages/google-cloud-translate/test/index.ts b/packages/google-cloud-translate/test/index.ts index 7b4c98121dbf..deaca10c4aa0 100644 --- a/packages/google-cloud-translate/test/index.ts +++ b/packages/google-cloud-translate/test/index.ts @@ -570,7 +570,7 @@ describe('Translate v2', () => { FakeService.prototype.request = request; }); - it.only('should make the correct request', done => { + it('should make the correct request', done => { const fakeOptions = { uri: '/test', a: 'b', From 2eb85b691bcc7cfbadf5ed509df17b945e36b8e2 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 12 Mar 2025 16:38:02 -0700 Subject: [PATCH 4/8] upgrade some more deps --- packages/google-cloud-translate/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/google-cloud-translate/package.json b/packages/google-cloud-translate/package.json index 5e76fe6e8a92..a374ee51604f 100644 --- a/packages/google-cloud-translate/package.json +++ b/packages/google-cloud-translate/package.json @@ -65,9 +65,9 @@ "@types/sinon": "^17.0.0", "c8": "^9.0.0", "codecov": "^3.0.2", - "gapic-tools": "^0.4.0", + "gapic-tools": "^1.0.1", "google-auth-library": "^10.0.0-rc.1", - "gts": "^5.0.0", + "gts": "^6.0.2", "http2spy": "^2.0.0", "jsdoc": "^4.0.0", "jsdoc-fresh": "^3.0.0", @@ -75,10 +75,10 @@ "linkinator": "4.1.2", "long": "^5.2.3", "mocha": "^9.2.2", - "pack-n-play": "^2.0.0", + "pack-n-play": "^3.0.0", "proxyquire": "^2.0.1", "sinon": "^18.0.0", - "typescript": "^5.1.6" + "typescript": "^5.8.2" }, "homepage": "https://github.com/googleapis/google-cloud-node/tree/main/packages/google-cloud-translate" } From 801ddad621f5a472765b49a1d0cc9f8432cab490 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 12 Mar 2025 17:18:51 -0700 Subject: [PATCH 5/8] test broken dep --- packages/google-cloud-translate/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google-cloud-translate/package.json b/packages/google-cloud-translate/package.json index a374ee51604f..1c2f30812f14 100644 --- a/packages/google-cloud-translate/package.json +++ b/packages/google-cloud-translate/package.json @@ -67,7 +67,7 @@ "codecov": "^3.0.2", "gapic-tools": "^1.0.1", "google-auth-library": "^10.0.0-rc.1", - "gts": "^6.0.2", + "gts": "^5.0.0", "http2spy": "^2.0.0", "jsdoc": "^4.0.0", "jsdoc-fresh": "^3.0.0", From 516bb1590dab1452835a0ebd62d727d7f9a86179 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 12 Mar 2025 17:30:00 -0700 Subject: [PATCH 6/8] retry --- packages/google-cloud-translate/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google-cloud-translate/package.json b/packages/google-cloud-translate/package.json index 1c2f30812f14..a374ee51604f 100644 --- a/packages/google-cloud-translate/package.json +++ b/packages/google-cloud-translate/package.json @@ -67,7 +67,7 @@ "codecov": "^3.0.2", "gapic-tools": "^1.0.1", "google-auth-library": "^10.0.0-rc.1", - "gts": "^5.0.0", + "gts": "^6.0.2", "http2spy": "^2.0.0", "jsdoc": "^4.0.0", "jsdoc-fresh": "^3.0.0", From e91419cbc5b7e2f012528b5bcc8f236f62c5dfb8 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 12 Mar 2025 18:33:14 -0700 Subject: [PATCH 7/8] fix broken tests --- packages/google-cloud-translate/package.json | 34 +++++++++---------- packages/google-cloud-translate/test/index.ts | 7 +++- packages/google-cloud-translate/tsconfig.json | 2 +- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/packages/google-cloud-translate/package.json b/packages/google-cloud-translate/package.json index a374ee51604f..147fd13d5fb8 100644 --- a/packages/google-cloud-translate/package.json +++ b/packages/google-cloud-translate/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "author": "Google Inc.", "engines": { - "node": ">=18.0.0" + "node": ">=18" }, "repository": { "type": "git", @@ -57,27 +57,27 @@ "is-html": "^2.0.0" }, "devDependencies": { - "@types/extend": "^3.0.0", - "@types/mocha": "^9.0.0", - "@types/node": "^22.0.0", - "@types/proxyquire": "^1.3.28", - "@types/request": "^2.47.1", - "@types/sinon": "^17.0.0", - "c8": "^9.0.0", - "codecov": "^3.0.2", + "@types/extend": "^3.0.4", + "@types/mocha": "^10.0.10", + "@types/node": "^22.13.10", + "@types/proxyquire": "^1.3.31", + "@types/request": "^2.48.12", + "@types/sinon": "^17.0.4", + "c8": "^10.1.3", + "codecov": "^3.8.3", "gapic-tools": "^1.0.1", - "google-auth-library": "^10.0.0-rc.1", + "google-auth-library": "^9.15.1", "gts": "^6.0.2", - "http2spy": "^2.0.0", - "jsdoc": "^4.0.0", + "http2spy": "^2.0.2", + "jsdoc": "^4.0.4", "jsdoc-fresh": "^3.0.0", "jsdoc-region-tag": "^3.0.0", - "linkinator": "4.1.2", - "long": "^5.2.3", - "mocha": "^9.2.2", + "linkinator": "^6.1.2", + "long": "^5.3.1", + "mocha": "^11.1.0", "pack-n-play": "^3.0.0", - "proxyquire": "^2.0.1", - "sinon": "^18.0.0", + "proxyquire": "^2.1.3", + "sinon": "^19.0.2", "typescript": "^5.8.2" }, "homepage": "https://github.com/googleapis/google-cloud-node/tree/main/packages/google-cloud-translate" diff --git a/packages/google-cloud-translate/test/index.ts b/packages/google-cloud-translate/test/index.ts index deaca10c4aa0..a4ed87242120 100644 --- a/packages/google-cloud-translate/test/index.ts +++ b/packages/google-cloud-translate/test/index.ts @@ -571,6 +571,9 @@ describe('Translate v2', () => { }); it('should make the correct request', done => { + translate.request = () => { + done(); + }; const fakeOptions = { uri: '/test', a: 'b', @@ -587,7 +590,6 @@ describe('Translate v2', () => { callback(); }; - console.log(translate); translate.request(fakeOptions, done); }); }); @@ -602,6 +604,9 @@ describe('Translate v2', () => { }); it('should make the correct request', done => { + translate.request = () => { + done(); + }; const userAgent = 'user-agent/0.0.0'; const getUserAgentFn = fakeUtil.getUserAgentFromPackageJson; diff --git a/packages/google-cloud-translate/tsconfig.json b/packages/google-cloud-translate/tsconfig.json index 76a6f4d56f1c..8b51265586ef 100644 --- a/packages/google-cloud-translate/tsconfig.json +++ b/packages/google-cloud-translate/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "build", "resolveJsonModule": true, "lib": [ - "es2018", + "es2023", "dom" ] }, From 93f3dfa3ac1e956e3bfe732b4a261b45c9dac10e Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 12 Mar 2025 18:40:15 -0700 Subject: [PATCH 8/8] add auth lib --- packages/google-cloud-translate/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google-cloud-translate/package.json b/packages/google-cloud-translate/package.json index 147fd13d5fb8..7375e3b999b8 100644 --- a/packages/google-cloud-translate/package.json +++ b/packages/google-cloud-translate/package.json @@ -66,7 +66,7 @@ "c8": "^10.1.3", "codecov": "^3.8.3", "gapic-tools": "^1.0.1", - "google-auth-library": "^9.15.1", + "google-auth-library": "^10.0.0-rc.1", "gts": "^6.0.2", "http2spy": "^2.0.2", "jsdoc": "^4.0.4",