Skip to content

Commit 033bfc8

Browse files
sofislgcf-owl-bot[bot]
sofisl
and
gcf-owl-bot[bot]
authored
build!: update library to use Node 12 (#1089)
* build!: Update library to use Node 12 Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 0a07c24 commit 033bfc8

21 files changed

+55
-180
lines changed

‎.github/sync-repo-settings.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ branchProtectionRules:
99
- "ci/kokoro: System test"
1010
- docs
1111
- lint
12-
- test (10)
1312
- test (12)
1413
- test (14)
14+
- test (16)
1515
- cla/google
1616
- windows
1717
- OwlBot Post Processor

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
node: [10, 12, 14]
12+
node: [12, 14, 16]
1313
steps:
1414
- uses: actions/checkout@v3
1515
- uses: actions/setup-node@v3

‎.kokoro/continuous/node10/common.cfg

-34
This file was deleted.

‎.kokoro/continuous/node10/docs.cfg

-4
This file was deleted.

‎.kokoro/continuous/node10/test.cfg

-9
This file was deleted.

‎.kokoro/continuous/node8/common.cfg

-24
This file was deleted.

‎.kokoro/continuous/node8/test.cfg

Whitespace-only changes.

‎.kokoro/presubmit/node10/common.cfg

-34
This file was deleted.

‎.kokoro/presubmit/node10/docs.cfg

-4
This file was deleted.

‎.kokoro/presubmit/node10/lint.cfg

-4
This file was deleted.

‎.kokoro/presubmit/node10/test.cfg

Whitespace-only changes.

‎.kokoro/presubmit/node8/common.cfg

-24
This file was deleted.

‎.kokoro/presubmit/node8/test.cfg

Whitespace-only changes.

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"dot-prop": "^6.0.0",
5454
"escape-string-regexp": "^4.0.0",
5555
"extend": "^3.0.2",
56-
"google-gax": "^2.29.5",
56+
"google-gax": "^3.0.1",
5757
"grpc-gcp": "0.4.2",
5858
"is": "^3.0.1",
5959
"is-utf8": "^0.2.1",
@@ -75,24 +75,24 @@
7575
"@types/uuid": "^8.0.0",
7676
"c8": "^7.1.0",
7777
"codecov": "^3.6.5",
78-
"gts": "^3.0.0",
78+
"gts": "^3.1.0",
7979
"jsdoc": "^3.6.3",
8080
"jsdoc-fresh": "^1.0.2",
8181
"jsdoc-region-tag": "^1.0.4",
8282
"linkinator": "^2.0.3",
83-
"mocha": "^8.0.0",
83+
"mocha": "^9.2.2",
8484
"null-loader": "^4.0.0",
8585
"p-queue": "^6.0.2",
8686
"pack-n-play": "^1.0.0-2",
8787
"proxyquire": "^2.0.0",
8888
"sinon": "^14.0.0",
8989
"ts-loader": "^9.0.0",
90-
"typescript": "^3.8.3",
90+
"typescript": "^4.6.4",
9191
"uuid": "^8.0.0",
9292
"webpack": "^5.0.0",
9393
"webpack-cli": "^4.0.0"
9494
},
9595
"engines": {
96-
"node": ">=10"
96+
"node": ">=12.0.0"
9797
}
9898
}

‎samples/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"api-reference-doc-snippets/*.js"
1212
],
1313
"engines": {
14-
"node": ">=12"
14+
"node": ">=12.0.0"
1515
},
1616
"dependencies": {
1717
"@google-cloud/bigtable": "^3.12.0",

‎src/cluster.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export interface BasicClusterConfig {
8989
}
9090

9191
export interface CreateBackupConfig extends ModifiableBackupFields {
92-
table: string | Table;
92+
table?: string | Table;
9393
gaxOptions?: CallOptions;
9494
}
9595

@@ -487,13 +487,13 @@ Please use the format 'my-cluster' or '${instance.name}/clusters/my-cluster'.`);
487487

488488
const reqOpts: google.bigtable.admin.v2.IListBackupsRequest = {
489489
parent: this.name,
490-
pageSize: gaxOpts.pageSize,
491-
pageToken: gaxOpts.pageToken,
490+
pageSize: (gaxOpts as GetBackupsOptions).pageSize,
491+
pageToken: (gaxOpts as GetBackupsOptions).pageToken,
492492
...options,
493493
};
494494

495-
delete gaxOpts.pageSize;
496-
delete gaxOpts.pageToken;
495+
delete (gaxOpts as GetBackupsOptions).pageSize;
496+
delete (gaxOpts as GetBackupsOptions).pageToken;
497497
delete (reqOpts as CallOptions).autoPaginate;
498498
delete (reqOpts as GetBackupsOptions).gaxOptions;
499499

‎src/instance.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -703,15 +703,15 @@ Please use the format 'my-instance' or '${bigtable.projectName}/instances/my-ins
703703
parent: this.name,
704704
};
705705

706-
if (is.number(gaxOpts.pageSize)) {
707-
reqOpts.pageSize = gaxOpts.pageSize;
706+
if (is.number((gaxOpts as GetBackupsOptions).pageSize)) {
707+
reqOpts.pageSize = (gaxOpts as GetBackupsOptions).pageSize;
708708
}
709-
delete gaxOpts.pageSize;
709+
delete (gaxOpts as GetBackupsOptions).pageSize;
710710

711-
if (gaxOpts.pageToken) {
712-
reqOpts.pageToken = gaxOpts.pageToken;
711+
if ((gaxOpts as GetBackupsOptions).pageToken) {
712+
reqOpts.pageToken = (gaxOpts as GetBackupsOptions).pageToken;
713713
}
714-
delete gaxOpts.pageToken;
714+
delete (gaxOpts as GetBackupsOptions).pageToken;
715715

716716
this.bigtable.request<google.bigtable.admin.v2.IAppProfile[]>(
717717
{
@@ -777,15 +777,15 @@ Please use the format 'my-instance' or '${bigtable.projectName}/instances/my-ins
777777
};
778778
const gaxOpts = extend(true, {}, gaxOptions);
779779

780-
if (is.number(gaxOpts.pageSize)) {
781-
reqOpts.pageSize = gaxOpts.pageSize;
780+
if (is.number((gaxOpts as GetBackupsOptions).pageSize)) {
781+
reqOpts.pageSize = (gaxOpts as GetBackupsOptions).pageSize;
782782
}
783-
delete gaxOpts.pageSize;
783+
delete (gaxOpts as GetBackupsOptions).pageSize;
784784

785-
if (gaxOpts.pageToken) {
786-
reqOpts.pageToken = gaxOpts.pageToken;
785+
if ((gaxOpts as GetBackupsOptions).pageToken) {
786+
reqOpts.pageToken = (gaxOpts as GetBackupsOptions).pageToken;
787787
}
788-
delete gaxOpts.pageToken;
788+
delete (gaxOpts as GetBackupsOptions).pageToken;
789789

790790
// eslint-disable-next-line @typescript-eslint/no-this-alias
791791
const self = this;
@@ -1103,13 +1103,13 @@ Please use the format 'my-instance' or '${bigtable.projectName}/instances/my-ins
11031103
reqOpts = extend(
11041104
{},
11051105
{
1106-
pageSize: gaxOpts.pageSize,
1107-
pageToken: gaxOpts.pageToken,
1106+
pageSize: (gaxOpts as GetBackupsOptions).pageSize,
1107+
pageToken: (gaxOpts as GetBackupsOptions).pageToken,
11081108
},
11091109
reqOpts
11101110
);
1111-
delete gaxOpts.pageSize;
1112-
delete gaxOpts.pageToken;
1111+
delete (gaxOpts as GetBackupsOptions).pageSize;
1112+
delete (gaxOpts as GetBackupsOptions).pageToken;
11131113
}
11141114

11151115
delete (reqOpts as GetTablesOptions).gaxOptions;
@@ -1184,13 +1184,13 @@ Please use the format 'my-instance' or '${bigtable.projectName}/instances/my-ins
11841184
reqOpts = extend(
11851185
{},
11861186
{
1187-
pageSize: gaxOpts.pageSize,
1188-
pageToken: gaxOpts.pageToken,
1187+
pageSize: (gaxOpts as GetBackupsOptions).pageSize,
1188+
pageToken: (gaxOpts as GetBackupsOptions).pageToken,
11891189
},
11901190
reqOpts
11911191
);
1192-
delete gaxOpts.pageSize;
1193-
delete gaxOpts.pageToken;
1192+
delete (gaxOpts as GetBackupsOptions).pageSize;
1193+
delete (gaxOpts as GetBackupsOptions).pageToken;
11941194
}
11951195

11961196
// eslint-disable-next-line @typescript-eslint/no-this-alias

‎system-test/bigtable.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,11 @@ describe('Bigtable', () => {
279279
await operation.promise();
280280
throw new Error('Cluster creation should not have succeeded');
281281
} catch (e) {
282-
assert(e.message.includes('default keys and CMEKs are not allowed'));
282+
assert(
283+
(e as Error).message.includes(
284+
'default keys and CMEKs are not allowed'
285+
)
286+
);
283287
}
284288
});
285289
});
@@ -913,7 +917,7 @@ describe('Bigtable', () => {
913917
];
914918
await TABLE.insert(entries);
915919
const rows: Row[] = [];
916-
await new Promise((resolve, reject) => {
920+
await new Promise<void>((resolve, reject) => {
917921
const stream = TABLE.createReadStream()
918922
.on('error', reject)
919923
.on('data', row => {

‎system-test/install.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ describe('📦 pack-n-play test', () => {
5050
await packNTest(options);
5151
} catch (e) {
5252
// all of the actionable information is on the output attribute
53-
if (e.output) {
54-
e.message += 'output: ' + e.output;
53+
if ((e as any).output) {
54+
(e as any).message += 'output: ' + (e as any).output;
5555
}
5656
throw e;
5757
}

‎test/cluster.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ import {PassThrough, Readable} from 'stream';
2020
import {CallOptions} from 'google-gax';
2121
import {PreciseDate} from '@google-cloud/precise-date';
2222

23+
export interface Options {
24+
nodes?: Number;
25+
gaxOptions?: {
26+
timeout: number;
27+
};
28+
}
29+
2330
let promisified = false;
2431
const fakePromisify = Object.assign({}, promisify, {
2532
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -987,7 +994,7 @@ describe('Bigtable/Cluster', () => {
987994
defaultStorageType: 'exellent_type',
988995
};
989996

990-
const expectedReqOpts = Object.assign(
997+
const expectedReqOpts: Options = Object.assign(
991998
{},
992999
{name: CLUSTER_NAME, serveNodes: options.nodes},
9931000
options

0 commit comments

Comments
 (0)