Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit 2267bc4

Browse files
feywindfeywind
committed
chore: merge branch 'conformance-fixes' into conformance-fixes-2
2 parents eb5c6b3 + b74b137 commit 2267bc4

7 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎__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-central2-d',
22+
location: 'us-central2-b',
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-central2-d',
32+
location: 'us-central2-b',
3333
serveNodes: 2,
3434
},
3535
updateMask: {
@@ -49,7 +49,7 @@ exports[
4949
options: {
5050
nodes: 2,
5151
storage: 'ssd',
52-
location: 'us-central2-d',
52+
location: 'us-central2-b',
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-central2-d',
62+
location: 'us-central2-b',
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-central2-d',
83+
location: 'us-central2-b',
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-central2-d',
93+
location: 'us-central2-b',
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-central2-d',
116+
location: 'us-central2-b',
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-central2-d',
126+
location: 'us-central2-b',
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-central2-d',
150+
location: 'us-central2-b',
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-central2-d',
160+
location: 'us-central2-b',
161161
clusterConfig: {
162162
clusterAutoscalingConfig: {
163163
autoscalingTargets: {

‎__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-central2-d',
23+
location: 'us-central2-b',
2424
id: 'my-cluster',
2525
},
2626
},
@@ -37,7 +37,7 @@ exports[
3737
},
3838
clusters: {
3939
'my-cluster': {
40-
location: 'projects/test-project/locations/us-central2-d',
40+
location: 'projects/test-project/locations/us-central2-b',
4141
serveNodes: 2,
4242
defaultStorageType: 0,
4343
},
@@ -56,7 +56,7 @@ exports[
5656
clusters: {
5757
nodes: 2,
5858
storage: 'ssd',
59-
location: 'us-central2-d',
59+
location: 'us-central2-b',
6060
id: 'my-cluster',
6161
},
6262
},
@@ -73,7 +73,7 @@ exports[
7373
},
7474
clusters: {
7575
'my-cluster': {
76-
location: 'projects/test-project/locations/us-central2-d',
76+
location: 'projects/test-project/locations/us-central2-b',
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-central2-d',
95+
location: 'us-central2-b',
9696
id: 'my-cluster',
9797
},
9898
},
@@ -109,7 +109,7 @@ exports[
109109
},
110110
clusters: {
111111
'my-cluster': {
112-
location: 'projects/test-project/locations/us-central2-d',
112+
location: 'projects/test-project/locations/us-central2-b',
113113
serveNodes: 2,
114114
defaultStorageType: 0,
115115
encryptionConfig: {
@@ -133,7 +133,7 @@ exports[
133133
encryption: {
134134
kmsKeyName: 'kms-key-name',
135135
},
136-
location: 'us-central2-d',
136+
location: 'us-central2-b',
137137
id: 'my-cluster',
138138
},
139139
},
@@ -150,7 +150,7 @@ exports[
150150
},
151151
clusters: {
152152
'my-cluster': {
153-
location: 'projects/test-project/locations/us-central2-d',
153+
location: 'projects/test-project/locations/us-central2-b',
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-central2-d',
176+
location: 'us-central2-b',
177177
id: 'my-cluster',
178178
},
179179
},
@@ -190,7 +190,7 @@ exports[
190190
},
191191
clusters: {
192192
'my-cluster': {
193-
location: 'projects/test-project/locations/us-central2-d',
193+
location: 'projects/test-project/locations/us-central2-b',
194194
clusterConfig: {
195195
clusterAutoscalingConfig: {
196196
autoscalingTargets: {

‎__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-central2-d',
22+
location: 'us-central2-b',
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-central2-d',
33+
location: 'projects/my-project/locations/us-central2-b',
3434
serveNodes: 2,
3535
},
3636
},
@@ -46,7 +46,7 @@ exports[
4646
options: {
4747
nodes: 2,
4848
storage: 'ssd',
49-
location: 'us-central2-d',
49+
location: 'us-central2-b',
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-central2-d',
60+
location: 'projects/my-project/locations/us-central2-b',
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-central2-d',
77+
location: 'us-central2-b',
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-central2-d',
88+
location: 'projects/my-project/locations/us-central2-b',
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-central2-d',
109+
location: 'us-central2-b',
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-central2-d',
120+
location: 'projects/my-project/locations/us-central2-b',
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-central2-d',
140+
location: 'us-central2-b',
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-central2-d',
151+
location: 'projects/my-project/locations/us-central2-b',
152152
clusterConfig: {
153153
clusterAutoscalingConfig: {
154154
autoscalingTargets: {

‎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-central2-d',
44+
'us-central2-b',
4545
'us-west1-b',
4646
].map(location => {
4747
return {

‎system-test/bigtable.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ describe('Bigtable', () => {
103103
clusters: [
104104
{
105105
id: CLUSTER_ID,
106-
location: 'us-central1-c',
106+
location: 'us-central2-c',
107107
nodes: 3,
108108
storage: 'ssd',
109109
},
@@ -116,7 +116,7 @@ describe('Bigtable', () => {
116116
clusters: [
117117
{
118118
id: CLUSTER_ID_HDD,
119-
location: 'us-central1-c',
119+
location: 'us-central2-c',
120120
nodes: 3,
121121
storage: 'hdd',
122122
},
@@ -214,7 +214,7 @@ describe('Bigtable', () => {
214214
clusters: [
215215
{
216216
id: clusteId,
217-
location: 'us-central1-c',
217+
location: 'us-central2-c',
218218
nodes: 3,
219219
},
220220
],
@@ -244,8 +244,8 @@ describe('Bigtable', () => {
244244

245245
before(async () => {
246246
const projectId = await bigtable.auth.getProjectId();
247-
kmsKeyName = `projects/${projectId}/locations/us-central1/keyRings/${keyRingId}/cryptoKeys/${cryptoKeyId}`;
248-
keyRingsBaseUrl = `https://cloudkms.googleapis.com/v1/projects/${projectId}/locations/us-central1/keyRings`;
247+
kmsKeyName = `projects/${projectId}/locations/us-central2/keyRings/${keyRingId}/cryptoKeys/${cryptoKeyId}`;
248+
keyRingsBaseUrl = `https://cloudkms.googleapis.com/v1/projects/${projectId}/locations/us-central2/keyRings`;
249249

250250
await bigtable.auth.request({
251251
method: 'POST',
@@ -267,7 +267,7 @@ describe('Bigtable', () => {
267267
clusters: [
268268
{
269269
id: CMEK_CLUSTER.id,
270-
location: 'us-central1-a',
270+
location: 'us-central2-a',
271271
nodes: 3,
272272
key: kmsKeyName,
273273
},
@@ -299,7 +299,7 @@ describe('Bigtable', () => {
299299

300300
// eslint-disable-next-line @typescript-eslint/no-unused-vars
301301
const [_, operation] = await cluster.create({
302-
location: 'us-central2-d',
302+
location: 'us-central2-b',
303303
nodes: 3,
304304
key: kmsKeyName,
305305
});
@@ -315,7 +315,7 @@ describe('Bigtable', () => {
315315
try {
316316
// eslint-disable-next-line @typescript-eslint/no-unused-vars
317317
const [_, operation] = await cluster.create({
318-
location: 'us-central2-d',
318+
location: 'us-central2-b',
319319
nodes: 3,
320320
});
321321
await operation.promise();
@@ -1717,7 +1717,7 @@ describe('Bigtable', () => {
17171717
{
17181718
id: destinationClusterId,
17191719
nodes: 3,
1720-
location: 'us-central1-f',
1720+
location: 'us-central2-d',
17211721
storage: 'ssd',
17221722
},
17231723
],
@@ -1759,7 +1759,7 @@ describe('Bigtable', () => {
17591759
const [, operation] = await INSTANCE.cluster(
17601760
destinationClusterId,
17611761
).create({
1762-
location: 'us-central2-d',
1762+
location: 'us-central2-b',
17631763
nodes: 3,
17641764
});
17651765
await operation.promise();
@@ -1806,7 +1806,7 @@ describe('Bigtable', () => {
18061806
{
18071807
id: destinationClusterId,
18081808
nodes: 3,
1809-
location: 'us-central1-f',
1809+
location: 'us-central2-d',
18101810
storage: 'ssd',
18111811
},
18121812
],

‎system-test/read-modify-write-row-interceptors.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {createMetricsUnaryInterceptorProvider} from '../src/client-side-metrics/
3232

3333
const INSTANCE_ID = 'isolated-rmw-instance';
3434
const TABLE_ID = 'isolated-rmw-table';
35-
const ZONE = 'us-central1-a';
35+
const ZONE = 'us-central2-a';
3636
const CLUSTER = 'fake-cluster';
3737
const COLUMN_FAMILY = 'traits';
3838
const COLUMN_FAMILIES = [COLUMN_FAMILY];

‎test/instance.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ describe('Bigtable/Instance', () => {
465465
it('should respect the nodes option', done => {
466466
const options = {
467467
nodes: 3,
468-
location: 'us-central1-c',
468+
location: 'us-central2-c',
469469
};
470470
// eslint-disable-next-line @typescript-eslint/no-explicit-any
471471
(instance.bigtable.request as Function) = (config: any) => {

0 commit comments

Comments
 (0)