Skip to content

Commit 6a26c07

Browse files
authoredFeb 1, 2022
fix: update to latest generator with fix for regex bug (#1000)
1 parent 6a9e2fc commit 6a26c07

26 files changed

+1044
-532
lines changed
 

‎.github/.OwlBot.lock.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
22
image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest
3-
digest: sha256:89c5b2f3decec8ad64febbebea671076c119d1ab43700da380846a315600de8a
3+
digest: sha256:a014d05bf3b3ba52143ba26a7208177e186e1d574fdc1f82a340b68f8bea4768

‎.jsdoc.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -34,15 +34,13 @@ module.exports = {
3434
source: {
3535
excludePattern: '(^|\\/|\\\\)[._]',
3636
include: [
37-
'build/src'
38-
],
39-
exclude: [
40-
'build/src/v2'
37+
'build/src',
38+
'protos'
4139
],
4240
includePattern: '\\.js$'
4341
},
4442
templates: {
45-
copyright: 'Copyright 2021 Google LLC',
43+
copyright: 'Copyright 2022 Google LLC',
4644
includeDate: false,
4745
sourceFiles: false,
4846
systemName: '@google-cloud/bigtable',

‎linkinator.config.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
"skip": [
44
"https://codecov.io/gh/googleapis/",
55
"www.googleapis.com",
6-
"img.shields.io"
6+
"img.shields.io",
7+
"https://console.cloud.google.com/cloudshell",
8+
"https://support.google.com"
79
],
810
"silent": true,
9-
"concurrency": 5
11+
"concurrency": 5,
12+
"retry": true,
13+
"retryErrors": true,
14+
"retryErrorsCount": 5,
15+
"retryErrorsJitter": 3000
1016
}

‎owlbot.py

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
for file in system_test_files:
5151
s.replace(file, 'BigtableClient', 'Bigtable')
5252
s.replace(file, 'client.close', '// client.close') # this does not work with the manual layer
53+
s.replace(file, 'function doStuffWith', '// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction doStuffWith')
5354

5455
# The staging directory should never be merged into the main branch.
5556
shutil.rmtree(staging)

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"fix": "gts fix",
3535
"prelint": "cd samples; npm link ../; npm install",
3636
"lint": "gts check",
37-
"prepare": "npm run compile",
37+
"prepare": "npm run compile-protos && npm run compile",
3838
"samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../",
3939
"snippet-test": "mocha samples/api-reference-doc-snippets/tests/*.js --timeout 600000",
4040
"presystem-test": "npm run compile",
@@ -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.27.1",
56+
"google-gax": "^2.29.5",
5757
"is": "^3.0.1",
5858
"is-utf8": "^0.2.1",
5959
"lodash.snakecase": "^4.1.1",

‎protos/google/bigtable/v2/bigtable.proto

+59-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019 Google LLC.
1+
// Copyright 2019 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import "google/api/annotations.proto";
2020
import "google/api/client.proto";
2121
import "google/api/field_behavior.proto";
2222
import "google/api/resource.proto";
23+
import "google/api/routing.proto";
2324
import "google/bigtable/v2/data.proto";
2425
import "google/protobuf/wrappers.proto";
2526
import "google/rpc/status.proto";
@@ -57,6 +58,15 @@ service Bigtable {
5758
post: "/v2/{table_name=projects/*/instances/*/tables/*}:readRows"
5859
body: "*"
5960
};
61+
option (google.api.routing) = {
62+
routing_parameters {
63+
field: "table_name"
64+
path_template: "{table_name=projects/*/instances/*/tables/*}"
65+
}
66+
routing_parameters {
67+
field: "app_profile_id"
68+
}
69+
};
6070
option (google.api.method_signature) = "table_name";
6171
option (google.api.method_signature) = "table_name,app_profile_id";
6272
}
@@ -69,6 +79,15 @@ service Bigtable {
6979
option (google.api.http) = {
7080
get: "/v2/{table_name=projects/*/instances/*/tables/*}:sampleRowKeys"
7181
};
82+
option (google.api.routing) = {
83+
routing_parameters {
84+
field: "table_name"
85+
path_template: "{table_name=projects/*/instances/*/tables/*}"
86+
}
87+
routing_parameters {
88+
field: "app_profile_id"
89+
}
90+
};
7291
option (google.api.method_signature) = "table_name";
7392
option (google.api.method_signature) = "table_name,app_profile_id";
7493
}
@@ -80,6 +99,15 @@ service Bigtable {
8099
post: "/v2/{table_name=projects/*/instances/*/tables/*}:mutateRow"
81100
body: "*"
82101
};
102+
option (google.api.routing) = {
103+
routing_parameters {
104+
field: "table_name"
105+
path_template: "{table_name=projects/*/instances/*/tables/*}"
106+
}
107+
routing_parameters {
108+
field: "app_profile_id"
109+
}
110+
};
83111
option (google.api.method_signature) = "table_name,row_key,mutations";
84112
option (google.api.method_signature) = "table_name,row_key,mutations,app_profile_id";
85113
}
@@ -92,6 +120,15 @@ service Bigtable {
92120
post: "/v2/{table_name=projects/*/instances/*/tables/*}:mutateRows"
93121
body: "*"
94122
};
123+
option (google.api.routing) = {
124+
routing_parameters {
125+
field: "table_name"
126+
path_template: "{table_name=projects/*/instances/*/tables/*}"
127+
}
128+
routing_parameters {
129+
field: "app_profile_id"
130+
}
131+
};
95132
option (google.api.method_signature) = "table_name,entries";
96133
option (google.api.method_signature) = "table_name,entries,app_profile_id";
97134
}
@@ -102,6 +139,15 @@ service Bigtable {
102139
post: "/v2/{table_name=projects/*/instances/*/tables/*}:checkAndMutateRow"
103140
body: "*"
104141
};
142+
option (google.api.routing) = {
143+
routing_parameters {
144+
field: "table_name"
145+
path_template: "{table_name=projects/*/instances/*/tables/*}"
146+
}
147+
routing_parameters {
148+
field: "app_profile_id"
149+
}
150+
};
105151
option (google.api.method_signature) = "table_name,row_key,predicate_filter,true_mutations,false_mutations";
106152
option (google.api.method_signature) = "table_name,row_key,predicate_filter,true_mutations,false_mutations,app_profile_id";
107153
}
@@ -116,6 +162,15 @@ service Bigtable {
116162
post: "/v2/{table_name=projects/*/instances/*/tables/*}:readModifyWriteRow"
117163
body: "*"
118164
};
165+
option (google.api.routing) = {
166+
routing_parameters {
167+
field: "table_name"
168+
path_template: "{table_name=projects/*/instances/*/tables/*}"
169+
}
170+
routing_parameters {
171+
field: "app_profile_id"
172+
}
173+
};
119174
option (google.api.method_signature) = "table_name,row_key,rules";
120175
option (google.api.method_signature) = "table_name,row_key,rules,app_profile_id";
121176
}
@@ -137,14 +192,15 @@ message ReadRowsRequest {
137192
// "default" application profile will be used.
138193
string app_profile_id = 5;
139194

140-
// The row keys and/or ranges to read. If not specified, reads from all rows.
195+
// The row keys and/or ranges to read sequentially. If not specified, reads
196+
// from all rows.
141197
RowSet rows = 2;
142198

143199
// The filter to apply to the contents of the specified row(s). If unset,
144200
// reads the entirety of each row.
145201
RowFilter filter = 3;
146202

147-
// The read will terminate after committing to N rows' worth of results. The
203+
// The read will stop after committing to N rows' worth of results. The
148204
// default (zero) is to return all results.
149205
int64 rows_limit = 4;
150206
}

‎protos/google/bigtable/v2/data.proto

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019 Google LLC.
1+
// Copyright 2019 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
//
1514

1615
syntax = "proto3";
1716

@@ -210,7 +209,7 @@ message ValueRange {
210209
// RowFilter.Chain and RowFilter.Interleave documentation.
211210
//
212211
// The total serialized size of a RowFilter message must not
213-
// exceed 4096 bytes, and RowFilters may not be nested within each other
212+
// exceed 20480 bytes, and RowFilters may not be nested within each other
214213
// (in Chains or Interleaves) to a depth of more than 20.
215214
message RowFilter {
216215
// A RowFilter which sends rows through several RowFilters in sequence.

0 commit comments

Comments
 (0)