From c45c6410d4b9f8f8f101f64c942e1e064e4c168e Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Tue, 10 May 2022 10:43:57 -0700 Subject: [PATCH 01/10] feat!: Update library to use Node 12 --- .kokoro/continuous/node10/common.cfg | 34 ---------------------------- .kokoro/continuous/node10/docs.cfg | 4 ---- .kokoro/continuous/node10/test.cfg | 9 -------- .kokoro/continuous/node8/common.cfg | 24 -------------------- .kokoro/continuous/node8/test.cfg | 0 .kokoro/presubmit/node10/common.cfg | 34 ---------------------------- .kokoro/presubmit/node10/docs.cfg | 4 ---- .kokoro/presubmit/node10/lint.cfg | 4 ---- .kokoro/presubmit/node10/test.cfg | 0 .kokoro/presubmit/node8/common.cfg | 24 -------------------- .kokoro/presubmit/node8/test.cfg | 0 package.json | 8 +++---- samples/package.json | 4 ++-- 13 files changed, 6 insertions(+), 143 deletions(-) delete mode 100644 .kokoro/continuous/node10/common.cfg delete mode 100644 .kokoro/continuous/node10/docs.cfg delete mode 100644 .kokoro/continuous/node10/test.cfg delete mode 100644 .kokoro/continuous/node8/common.cfg delete mode 100644 .kokoro/continuous/node8/test.cfg delete mode 100644 .kokoro/presubmit/node10/common.cfg delete mode 100644 .kokoro/presubmit/node10/docs.cfg delete mode 100644 .kokoro/presubmit/node10/lint.cfg delete mode 100644 .kokoro/presubmit/node10/test.cfg delete mode 100644 .kokoro/presubmit/node8/common.cfg delete mode 100644 .kokoro/presubmit/node8/test.cfg diff --git a/.kokoro/continuous/node10/common.cfg b/.kokoro/continuous/node10/common.cfg deleted file mode 100644 index 3fb9c95..0000000 --- a/.kokoro/continuous/node10/common.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-grafeas/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-grafeas/.kokoro/test.sh" -} diff --git a/.kokoro/continuous/node10/docs.cfg b/.kokoro/continuous/node10/docs.cfg deleted file mode 100644 index bedf0a1..0000000 --- a/.kokoro/continuous/node10/docs.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-grafeas/.kokoro/docs.sh" -} diff --git a/.kokoro/continuous/node10/test.cfg b/.kokoro/continuous/node10/test.cfg deleted file mode 100644 index 609c0cf..0000000 --- a/.kokoro/continuous/node10/test.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} diff --git a/.kokoro/continuous/node8/common.cfg b/.kokoro/continuous/node8/common.cfg deleted file mode 100644 index ab78c9b..0000000 --- a/.kokoro/continuous/node8/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-grafeas/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-grafeas/.kokoro/test.sh" -} diff --git a/.kokoro/continuous/node8/test.cfg b/.kokoro/continuous/node8/test.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/.kokoro/presubmit/node10/common.cfg b/.kokoro/presubmit/node10/common.cfg deleted file mode 100644 index 3fb9c95..0000000 --- a/.kokoro/presubmit/node10/common.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-grafeas/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-grafeas/.kokoro/test.sh" -} diff --git a/.kokoro/presubmit/node10/docs.cfg b/.kokoro/presubmit/node10/docs.cfg deleted file mode 100644 index bedf0a1..0000000 --- a/.kokoro/presubmit/node10/docs.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-grafeas/.kokoro/docs.sh" -} diff --git a/.kokoro/presubmit/node10/lint.cfg b/.kokoro/presubmit/node10/lint.cfg deleted file mode 100644 index efc3402..0000000 --- a/.kokoro/presubmit/node10/lint.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-grafeas/.kokoro/lint.sh" -} diff --git a/.kokoro/presubmit/node10/test.cfg b/.kokoro/presubmit/node10/test.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/.kokoro/presubmit/node8/common.cfg b/.kokoro/presubmit/node8/common.cfg deleted file mode 100644 index ab78c9b..0000000 --- a/.kokoro/presubmit/node8/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-grafeas/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-grafeas/.kokoro/test.sh" -} diff --git a/.kokoro/presubmit/node8/test.cfg b/.kokoro/presubmit/node8/test.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/package.json b/package.json index f53fbce..4ab7b35 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "Container Analysis API" ], "dependencies": { - "google-gax": "^2.24.1" + "google-gax": "^3.0.0" }, "devDependencies": { "@types/mocha": "^9.0.0", @@ -35,12 +35,12 @@ "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", "linkinator": "^2.0.0", - "mocha": "^8.0.0", + "mocha": "^9.2.2", "null-loader": "^4.0.0", "pack-n-play": "^1.0.0-2", "sinon": "^14.0.0", "ts-loader": "^9.0.0", - "typescript": "^3.8.3", + "typescript": "^4.6.4", "webpack": "^5.0.0", "webpack-cli": "^4.0.0" }, @@ -63,6 +63,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=10" + "node": ">=12.0.0" } } diff --git a/samples/package.json b/samples/package.json index 4c9919b..36be002 100644 --- a/samples/package.json +++ b/samples/package.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "author": "Google LLC", "engines": { - "node": ">=10" + "node": ">=12.0.0" }, "files": [ "*.js" @@ -20,4 +20,4 @@ "chai": "^4.2.0", "mocha": "^8.0.0" } -} +} \ No newline at end of file From 8cbdc636adf77aa693e022a53c2e0b6108e4c876 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 10 May 2022 17:45:38 +0000 Subject: [PATCH 02/10] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20?= =?UTF-8?q?post-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 --- .github/sync-repo-settings.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 1b36268..d1e8b5e 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -9,9 +9,9 @@ branchProtectionRules: - "ci/kokoro: System test" - docs - lint - - test (10) - test (12) - test (14) + - test (16) - cla/google - windows - OwlBot Post Processor diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 25251db..f447b84 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [10, 12, 14] + node: [12, 14, 16] steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 From 64297a2aa8fc3b311b940a52f5858da58b2ac19a Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 11 May 2022 00:01:51 -0700 Subject: [PATCH 03/10] fix test --- package.json | 2 +- samples/package.json | 2 +- system-test/test.ts | 12 +++--------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 4ab7b35..99a9b8e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@types/node": "^16.0.0", "@types/sinon": "^10.0.0", "c8": "^7.0.0", - "gts": "^3.0.0", + "gts": "^3.1.0", "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", diff --git a/samples/package.json b/samples/package.json index 36be002..2a7ee0c 100644 --- a/samples/package.json +++ b/samples/package.json @@ -20,4 +20,4 @@ "chai": "^4.2.0", "mocha": "^8.0.0" } -} \ No newline at end of file +} diff --git a/system-test/test.ts b/system-test/test.ts index 1024e40..dc31580 100644 --- a/system-test/test.ts +++ b/system-test/test.ts @@ -19,15 +19,9 @@ describe('GrafeasSystemTest', () => { it('lists occurrences', async () => { const client = new GrafeasClient(); const projectId = await client.getProjectId(); - const [resp] = await client.listOccurrences( - { - parent: client.projectPath(projectId), - }, - { - autoPaginate: false, - pageSize: 1, - } - ); + const resp = await client.listOccurrences({ + parent: client.projectPath(projectId), + }); assert.ok(resp.length > 0); }); }); From 527042be595895ee4abc6afa175d6408429c0b88 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Mon, 16 May 2022 14:26:00 -0700 Subject: [PATCH 04/10] dep: update google-gax --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 99a9b8e..f049692 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "Container Analysis API" ], "dependencies": { - "google-gax": "^3.0.0" + "google-gax": "^3.0.1" }, "devDependencies": { "@types/mocha": "^9.0.0", From 7c4900dd636e9e2a6fa1b652a5e08f8b5d1cc3b3 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 20 May 2022 11:47:47 -0700 Subject: [PATCH 05/10] add mocha types --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f049692..e5393af 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "google-gax": "^3.0.1" }, "devDependencies": { - "@types/mocha": "^9.0.0", + "@types/mocha": "^9.1.1", "@types/node": "^16.0.0", "@types/sinon": "^10.0.0", "c8": "^7.0.0", From 240e6d6bf92872b2bcc2816d284180773d9c67c7 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 20 May 2022 13:41:40 -0700 Subject: [PATCH 06/10] increase timeout --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5393af..fca1f18 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "scripts": { "test": "c8 mocha build/test", "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", - "system-test": "mocha build/system-test", + "system-test": "mocha build/system-test --timeout 120000", "presystem-test": "npm run compile", "docs": "jsdoc -c .jsdoc.js", "lint": "gts check", From 7440189b8e643a23e004fbfd53709ab271a672e7 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Mon, 23 May 2022 15:10:16 -0700 Subject: [PATCH 07/10] make async --- system-test/test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-test/test.ts b/system-test/test.ts index dc31580..b3aedaf 100644 --- a/system-test/test.ts +++ b/system-test/test.ts @@ -15,7 +15,7 @@ import {describe, it} from 'mocha'; import * as assert from 'assert'; import {GrafeasClient} from '../src'; -describe('GrafeasSystemTest', () => { +describe('GrafeasSystemTest', async () => { it('lists occurrences', async () => { const client = new GrafeasClient(); const projectId = await client.getProjectId(); From fe4e427427af5153818d023cb73dbccab28a5ab8 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 27 May 2022 13:49:55 -0700 Subject: [PATCH 08/10] increase timeout --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fca1f18..d14534e 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "scripts": { "test": "c8 mocha build/test", "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", - "system-test": "mocha build/system-test --timeout 120000", + "system-test": "mocha build/system-test --timeout 360000", "presystem-test": "npm run compile", "docs": "jsdoc -c .jsdoc.js", "lint": "gts check", From 870fd84e99490523f35416eb36a8b5e28b36536c Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 27 May 2022 14:09:03 -0700 Subject: [PATCH 09/10] retry --- package.json | 2 +- system-test/test.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d14534e..e5393af 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "scripts": { "test": "c8 mocha build/test", "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", - "system-test": "mocha build/system-test --timeout 360000", + "system-test": "mocha build/system-test", "presystem-test": "npm run compile", "docs": "jsdoc -c .jsdoc.js", "lint": "gts check", diff --git a/system-test/test.ts b/system-test/test.ts index b3aedaf..16befd3 100644 --- a/system-test/test.ts +++ b/system-test/test.ts @@ -21,6 +21,7 @@ describe('GrafeasSystemTest', async () => { const projectId = await client.getProjectId(); const resp = await client.listOccurrences({ parent: client.projectPath(projectId), + pageSize: 1, }); assert.ok(resp.length > 0); }); From a97ee1dd6db9920a30cdcfde0f2b16a01f97a39b Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Fri, 27 May 2022 23:03:29 -0700 Subject: [PATCH 10/10] retry --- system-test/test.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/system-test/test.ts b/system-test/test.ts index 16befd3..5e9bfd0 100644 --- a/system-test/test.ts +++ b/system-test/test.ts @@ -14,15 +14,19 @@ import {describe, it} from 'mocha'; import * as assert from 'assert'; import {GrafeasClient} from '../src'; +import {CallOptions} from 'google-gax'; describe('GrafeasSystemTest', async () => { it('lists occurrences', async () => { const client = new GrafeasClient(); const projectId = await client.getProjectId(); - const resp = await client.listOccurrences({ - parent: client.projectPath(projectId), - pageSize: 1, - }); + const resp = await client.listOccurrences( + { + parent: client.projectPath(projectId), + }, + + {pageSize: 1, autoPaginate: false} as CallOptions + ); assert.ok(resp.length > 0); }); });