Skip to content

Commit 36e2a0f

Browse files
feywindgcf-owl-bot[bot]
authored and
GautamSharda
committed
tests: conformance test fixes 1 (#1719)
* tests: fix TestMutateRow_Generic_DeadlineExceeded * tests: fix TestReadRow_Generic_DeadlineExceeded * tests: wip on shifting test harness to TS * wip: work in progress on updating testproxy * tests: most of the conversion to typescript * tests: testproxy mostly working in TS now * chore: update copyrights * build: actually compile testproxy protos * chore: fix linting issues * tests: finish updating types for proxy unit tests * chore: more linting and types * tests: revert some typing changes * chore: still yet more joy of linting * tests: fix/bypass unit test issues caused by "tests: fix TestReadRow_Generic_DeadlineExceeded" (unit tests didn't match conformance test expectations) * chore: lint * tests: update known failures and unsupported conformance tests * chore: self-review from the branch * chore: remove testlog * chore: revert "tests: fix TestMutateRow_Generic_DeadlineExceeded" This reverts commit 76ac50c903f282d8c716f74bd534d60443cb3d6f. * chore: revert "tests: fix TestReadRow_Generic_DeadlineExceeded" This reverts commit f18d7b2ce43359cad3a2c50cce77f3fc810361db. * chore: revert "tests: fix/bypass unit test issues caused by "tests: fix TestReadRow_Generic_DeadlineExceeded"" This reverts commit 86c535ad5e5e3f8f41dcf67847cc32373729c812. * chore: more cleanup of reverted stuff * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * tests: fix lost close() during close test * chore: restore protos owlbot broke * chore: ignore log files in testproxy * build: separate testproxy protos * chore: move imports to point at new testproxy protos * build: include testproxy protos in build/ * tests: another broken usage of getBigtableClient * tests: fix testproxy regressions around client close * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * tests: move CI tests to a less crowded zone * chore: restore custom endpoint port logic * chore: fully restore the port logic * tests: move everything to central2 for system tests * tests: remap zones to try to resolve backup test issues * tests: update snapshots with correct regions * tests: missed snapshot update * tests: remove added clientConfig and change how it's passed in --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent e7467a0 commit 36e2a0f

49 files changed

Lines changed: 165576 additions & 369 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎handwritten/bigtable/.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
66

77

8-
# Unless specified, the cloud-sdk-nodejs-team is the default owner for nodejs repositories.
9-
* @googleapis/bigtable-team @googleapis/cloud-sdk-nodejs-team
8+
# Unless specified, the jsteam is the default owner for nodejs repositories.
9+
* @googleapis/bigtable-team @googleapis/cloud-sdk-nodejs-team @googleapis/jsteam

‎handwritten/bigtable/.kokoro/mandatory-conformance.sh‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎handwritten/bigtable/__snapshots__/cluster.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ exports[
1919
id: 'my-cluster',
2020
options: {
2121
nodes: 2,
22-
location: 'us-central1-b',
22+
location: 'us-central2-d',
2323
},
2424
},
2525
output: {
@@ -29,7 +29,7 @@ exports[
2929
reqOpts: {
3030
cluster: {
3131
name: 'projects/grape-spaceship-123/instances/i/clusters/my-cluster',
32-
location: 'us-central1-b',
32+
location: 'us-central2-d',
3333
serveNodes: 2,
3434
},
3535
updateMask: {
@@ -49,7 +49,7 @@ exports[
4949
options: {
5050
nodes: 2,
5151
storage: 'ssd',
52-
location: 'us-central1-b',
52+
location: 'us-central2-d',
5353
},
5454
},
5555
output: {
@@ -59,7 +59,7 @@ exports[
5959
reqOpts: {
6060
cluster: {
6161
name: 'projects/grape-spaceship-123/instances/i/clusters/my-cluster',
62-
location: 'us-central1-b',
62+
location: 'us-central2-d',
6363
serveNodes: 2,
6464
storage: 'ssd',
6565
},
@@ -80,7 +80,7 @@ exports[
8080
options: {
8181
nodes: 2,
8282
key: 'kms-key-name',
83-
location: 'us-central1-b',
83+
location: 'us-central2-d',
8484
},
8585
},
8686
output: {
@@ -90,7 +90,7 @@ exports[
9090
reqOpts: {
9191
cluster: {
9292
name: 'projects/grape-spaceship-123/instances/i/clusters/my-cluster',
93-
location: 'us-central1-b',
93+
location: 'us-central2-d',
9494
serveNodes: 2,
9595
key: 'kms-key-name',
9696
},
@@ -113,7 +113,7 @@ exports[
113113
encryption: {
114114
kmsKeyName: 'kms-key-name',
115115
},
116-
location: 'us-central1-b',
116+
location: 'us-central2-d',
117117
},
118118
},
119119
output: {
@@ -123,7 +123,7 @@ exports[
123123
reqOpts: {
124124
cluster: {
125125
name: 'projects/grape-spaceship-123/instances/i/clusters/my-cluster',
126-
location: 'us-central1-b',
126+
location: 'us-central2-d',
127127
serveNodes: 2,
128128
encryption: {
129129
kmsKeyName: 'kms-key-name',
@@ -147,7 +147,7 @@ exports[
147147
minServeNodes: 2,
148148
maxServeNodes: 3,
149149
cpuUtilizationPercent: 50,
150-
location: 'us-central1-b',
150+
location: 'us-central2-d',
151151
},
152152
},
153153
output: {
@@ -157,7 +157,7 @@ exports[
157157
reqOpts: {
158158
cluster: {
159159
name: 'projects/grape-spaceship-123/instances/i/clusters/my-cluster',
160-
location: 'us-central1-b',
160+
location: 'us-central2-d',
161161
clusterConfig: {
162162
clusterAutoscalingConfig: {
163163
autoscalingTargets: {

‎handwritten/bigtable/__snapshots__/index.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[
2020
options: {
2121
clusters: {
2222
nodes: 2,
23-
location: 'us-central1-b',
23+
location: 'us-central2-d',
2424
id: 'my-cluster',
2525
},
2626
},
@@ -37,7 +37,7 @@ exports[
3737
},
3838
clusters: {
3939
'my-cluster': {
40-
location: 'projects/test-project/locations/us-central1-b',
40+
location: 'projects/test-project/locations/us-central2-d',
4141
serveNodes: 2,
4242
defaultStorageType: 0,
4343
},
@@ -56,7 +56,7 @@ exports[
5656
clusters: {
5757
nodes: 2,
5858
storage: 'ssd',
59-
location: 'us-central1-b',
59+
location: 'us-central2-d',
6060
id: 'my-cluster',
6161
},
6262
},
@@ -73,7 +73,7 @@ exports[
7373
},
7474
clusters: {
7575
'my-cluster': {
76-
location: 'projects/test-project/locations/us-central1-b',
76+
location: 'projects/test-project/locations/us-central2-d',
7777
serveNodes: 2,
7878
defaultStorageType: 1,
7979
},
@@ -92,7 +92,7 @@ exports[
9292
clusters: {
9393
nodes: 2,
9494
key: 'kms-key-name',
95-
location: 'us-central1-b',
95+
location: 'us-central2-d',
9696
id: 'my-cluster',
9797
},
9898
},
@@ -109,7 +109,7 @@ exports[
109109
},
110110
clusters: {
111111
'my-cluster': {
112-
location: 'projects/test-project/locations/us-central1-b',
112+
location: 'projects/test-project/locations/us-central2-d',
113113
serveNodes: 2,
114114
defaultStorageType: 0,
115115
encryptionConfig: {
@@ -133,7 +133,7 @@ exports[
133133
encryption: {
134134
kmsKeyName: 'kms-key-name',
135135
},
136-
location: 'us-central1-b',
136+
location: 'us-central2-d',
137137
id: 'my-cluster',
138138
},
139139
},
@@ -150,7 +150,7 @@ exports[
150150
},
151151
clusters: {
152152
'my-cluster': {
153-
location: 'projects/test-project/locations/us-central1-b',
153+
location: 'projects/test-project/locations/us-central2-d',
154154
serveNodes: 2,
155155
defaultStorageType: 0,
156156
encryptionConfig: {
@@ -173,7 +173,7 @@ exports[
173173
minServeNodes: 2,
174174
maxServeNodes: 3,
175175
cpuUtilizationPercent: 50,
176-
location: 'us-central1-b',
176+
location: 'us-central2-d',
177177
id: 'my-cluster',
178178
},
179179
},
@@ -190,7 +190,7 @@ exports[
190190
},
191191
clusters: {
192192
'my-cluster': {
193-
location: 'projects/test-project/locations/us-central1-b',
193+
location: 'projects/test-project/locations/us-central2-d',
194194
clusterConfig: {
195195
clusterAutoscalingConfig: {
196196
autoscalingTargets: {

‎handwritten/bigtable/__snapshots__/instance.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ exports[
1919
id: 'my-cluster',
2020
options: {
2121
nodes: 2,
22-
location: 'us-central1-b',
22+
location: 'us-central2-d',
2323
},
2424
},
2525
output: {
@@ -30,7 +30,7 @@ exports[
3030
parent: 'projects/my-project/instances/my-instance',
3131
clusterId: 'my-cluster',
3232
cluster: {
33-
location: 'projects/my-project/locations/us-central1-b',
33+
location: 'projects/my-project/locations/us-central2-d',
3434
serveNodes: 2,
3535
},
3636
},
@@ -46,7 +46,7 @@ exports[
4646
options: {
4747
nodes: 2,
4848
storage: 'ssd',
49-
location: 'us-central1-b',
49+
location: 'us-central2-d',
5050
},
5151
},
5252
output: {
@@ -57,7 +57,7 @@ exports[
5757
parent: 'projects/my-project/instances/my-instance',
5858
clusterId: 'my-cluster',
5959
cluster: {
60-
location: 'projects/my-project/locations/us-central1-b',
60+
location: 'projects/my-project/locations/us-central2-d',
6161
serveNodes: 2,
6262
defaultStorageType: 1,
6363
},
@@ -74,7 +74,7 @@ exports[
7474
options: {
7575
nodes: 2,
7676
key: 'kms-key-name',
77-
location: 'us-central1-b',
77+
location: 'us-central2-d',
7878
},
7979
},
8080
output: {
@@ -85,7 +85,7 @@ exports[
8585
parent: 'projects/my-project/instances/my-instance',
8686
clusterId: 'my-cluster',
8787
cluster: {
88-
location: 'projects/my-project/locations/us-central1-b',
88+
location: 'projects/my-project/locations/us-central2-d',
8989
serveNodes: 2,
9090
encryptionConfig: {
9191
kmsKeyName: 'kms-key-name',
@@ -106,7 +106,7 @@ exports[
106106
encryption: {
107107
kmsKeyName: 'kms-key-name',
108108
},
109-
location: 'us-central1-b',
109+
location: 'us-central2-d',
110110
},
111111
},
112112
output: {
@@ -117,7 +117,7 @@ exports[
117117
parent: 'projects/my-project/instances/my-instance',
118118
clusterId: 'my-cluster',
119119
cluster: {
120-
location: 'projects/my-project/locations/us-central1-b',
120+
location: 'projects/my-project/locations/us-central2-d',
121121
serveNodes: 2,
122122
encryptionConfig: {
123123
kmsKeyName: 'kms-key-name',
@@ -137,7 +137,7 @@ exports[
137137
minServeNodes: 2,
138138
maxServeNodes: 3,
139139
cpuUtilizationPercent: 50,
140-
location: 'us-central1-b',
140+
location: 'us-central2-d',
141141
},
142142
},
143143
output: {
@@ -148,7 +148,7 @@ exports[
148148
parent: 'projects/my-project/instances/my-instance',
149149
clusterId: 'my-cluster',
150150
cluster: {
151-
location: 'projects/my-project/locations/us-central1-b',
151+
location: 'projects/my-project/locations/us-central2-d',
152152
clusterConfig: {
153153
clusterAutoscalingConfig: {
154154
autoscalingTargets: {

‎handwritten/bigtable/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"!**/*.map"
2626
],
2727
"scripts": {
28-
"compile": "tsc -p . && cp -r proto* build/",
29-
"compile-protos": "compileProtos src",
28+
"compile": "tsc -p . && cp -r proto* build/ && cp -r testproxy/proto* build/testproxy/",
29+
"compile-protos": "compileProtos src && sh testproxy/compile-protos.sh",
3030
"predocs": "npm run compile",
3131
"docs": "jsdoc -c .jsdoc.js",
3232
"predocs-test": "npm run docs",
@@ -42,7 +42,7 @@
4242
"pretest": "npm run compile",
4343
"test": "c8 mocha build/test",
4444
"test:snap": "SNAPSHOT_UPDATE=1 npm test",
45-
"testproxy": "npm run compile && node testproxy/index.js",
45+
"testproxy": "npm run compile && node build/testproxy/index.js",
4646
"clean": "gts clean",
4747
"precompile": "gts clean"
4848
},

‎handwritten/bigtable/src/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,9 @@ export class Bigtable {
509509
options.apiEndpoint || process.env.BIGTABLE_EMULATOR_HOST;
510510
this.customEndpoint = customEndpoint;
511511

512-
let customEndpointBaseUrl;
513-
let customEndpointPort;
514-
let sslCreds;
512+
let customEndpointBaseUrl: string | undefined;
513+
let customEndpointPort: number | undefined;
514+
let sslCreds: gaxVendoredGrpc.ChannelCredentials | undefined;
515515

516516
if (customEndpoint) {
517517
const customEndpointParts = customEndpoint.split(':');

‎handwritten/bigtable/system-test/app-profile.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('📦 App Profile', () => {
4141
// Creates an instance with clusters
4242
const instanceClusters = [
4343
'us-east1-c',
44-
'us-central1-b',
44+
'us-central2-b',
4545
'us-west1-b',
4646
].map(location => {
4747
return {

0 commit comments

Comments
 (0)