Skip to content

Commit

Permalink
fix: update to latest generator with fix for regex bug (#1000)
Browse files Browse the repository at this point in the history
  • Loading branch information
summer-ji-eng authored Feb 1, 2022
1 parent 6a9e2fc commit 6a26c07
Show file tree
Hide file tree
Showing 26 changed files with 1,044 additions and 532 deletions.
2 changes: 1 addition & 1 deletion .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest
digest: sha256:89c5b2f3decec8ad64febbebea671076c119d1ab43700da380846a315600de8a
digest: sha256:a014d05bf3b3ba52143ba26a7208177e186e1d574fdc1f82a340b68f8bea4768
10 changes: 4 additions & 6 deletions .jsdoc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,15 +34,13 @@ module.exports = {
source: {
excludePattern: '(^|\\/|\\\\)[._]',
include: [
'build/src'
],
exclude: [
'build/src/v2'
'build/src',
'protos'
],
includePattern: '\\.js$'
},
templates: {
copyright: 'Copyright 2021 Google LLC',
copyright: 'Copyright 2022 Google LLC',
includeDate: false,
sourceFiles: false,
systemName: '@google-cloud/bigtable',
Expand Down
10 changes: 8 additions & 2 deletions linkinator.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
"skip": [
"https://codecov.io/gh/googleapis/",
"www.googleapis.com",
"img.shields.io"
"img.shields.io",
"https://console.cloud.google.com/cloudshell",
"https://support.google.com"
],
"silent": true,
"concurrency": 5
"concurrency": 5,
"retry": true,
"retryErrors": true,
"retryErrorsCount": 5,
"retryErrorsJitter": 3000
}
1 change: 1 addition & 0 deletions owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
for file in system_test_files:
s.replace(file, 'BigtableClient', 'Bigtable')
s.replace(file, 'client.close', '// client.close') # this does not work with the manual layer
s.replace(file, 'function doStuffWith', '// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction doStuffWith')

# The staging directory should never be merged into the main branch.
shutil.rmtree(staging)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"fix": "gts fix",
"prelint": "cd samples; npm link ../; npm install",
"lint": "gts check",
"prepare": "npm run compile",
"prepare": "npm run compile-protos && npm run compile",
"samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../",
"snippet-test": "mocha samples/api-reference-doc-snippets/tests/*.js --timeout 600000",
"presystem-test": "npm run compile",
Expand All @@ -53,7 +53,7 @@
"dot-prop": "^6.0.0",
"escape-string-regexp": "^4.0.0",
"extend": "^3.0.2",
"google-gax": "^2.27.1",
"google-gax": "^2.29.5",
"is": "^3.0.1",
"is-utf8": "^0.2.1",
"lodash.snakecase": "^4.1.1",
Expand Down
62 changes: 59 additions & 3 deletions protos/google/bigtable/v2/bigtable.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 Google LLC.
// Copyright 2019 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -20,6 +20,7 @@ import "google/api/annotations.proto";
import "google/api/client.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/api/routing.proto";
import "google/bigtable/v2/data.proto";
import "google/protobuf/wrappers.proto";
import "google/rpc/status.proto";
Expand Down Expand Up @@ -57,6 +58,15 @@ service Bigtable {
post: "/v2/{table_name=projects/*/instances/*/tables/*}:readRows"
body: "*"
};
option (google.api.routing) = {
routing_parameters {
field: "table_name"
path_template: "{table_name=projects/*/instances/*/tables/*}"
}
routing_parameters {
field: "app_profile_id"
}
};
option (google.api.method_signature) = "table_name";
option (google.api.method_signature) = "table_name,app_profile_id";
}
Expand All @@ -69,6 +79,15 @@ service Bigtable {
option (google.api.http) = {
get: "/v2/{table_name=projects/*/instances/*/tables/*}:sampleRowKeys"
};
option (google.api.routing) = {
routing_parameters {
field: "table_name"
path_template: "{table_name=projects/*/instances/*/tables/*}"
}
routing_parameters {
field: "app_profile_id"
}
};
option (google.api.method_signature) = "table_name";
option (google.api.method_signature) = "table_name,app_profile_id";
}
Expand All @@ -80,6 +99,15 @@ service Bigtable {
post: "/v2/{table_name=projects/*/instances/*/tables/*}:mutateRow"
body: "*"
};
option (google.api.routing) = {
routing_parameters {
field: "table_name"
path_template: "{table_name=projects/*/instances/*/tables/*}"
}
routing_parameters {
field: "app_profile_id"
}
};
option (google.api.method_signature) = "table_name,row_key,mutations";
option (google.api.method_signature) = "table_name,row_key,mutations,app_profile_id";
}
Expand All @@ -92,6 +120,15 @@ service Bigtable {
post: "/v2/{table_name=projects/*/instances/*/tables/*}:mutateRows"
body: "*"
};
option (google.api.routing) = {
routing_parameters {
field: "table_name"
path_template: "{table_name=projects/*/instances/*/tables/*}"
}
routing_parameters {
field: "app_profile_id"
}
};
option (google.api.method_signature) = "table_name,entries";
option (google.api.method_signature) = "table_name,entries,app_profile_id";
}
Expand All @@ -102,6 +139,15 @@ service Bigtable {
post: "/v2/{table_name=projects/*/instances/*/tables/*}:checkAndMutateRow"
body: "*"
};
option (google.api.routing) = {
routing_parameters {
field: "table_name"
path_template: "{table_name=projects/*/instances/*/tables/*}"
}
routing_parameters {
field: "app_profile_id"
}
};
option (google.api.method_signature) = "table_name,row_key,predicate_filter,true_mutations,false_mutations";
option (google.api.method_signature) = "table_name,row_key,predicate_filter,true_mutations,false_mutations,app_profile_id";
}
Expand All @@ -116,6 +162,15 @@ service Bigtable {
post: "/v2/{table_name=projects/*/instances/*/tables/*}:readModifyWriteRow"
body: "*"
};
option (google.api.routing) = {
routing_parameters {
field: "table_name"
path_template: "{table_name=projects/*/instances/*/tables/*}"
}
routing_parameters {
field: "app_profile_id"
}
};
option (google.api.method_signature) = "table_name,row_key,rules";
option (google.api.method_signature) = "table_name,row_key,rules,app_profile_id";
}
Expand All @@ -137,14 +192,15 @@ message ReadRowsRequest {
// "default" application profile will be used.
string app_profile_id = 5;

// The row keys and/or ranges to read. If not specified, reads from all rows.
// The row keys and/or ranges to read sequentially. If not specified, reads
// from all rows.
RowSet rows = 2;

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

// The read will terminate after committing to N rows' worth of results. The
// The read will stop after committing to N rows' worth of results. The
// default (zero) is to return all results.
int64 rows_limit = 4;
}
Expand Down
5 changes: 2 additions & 3 deletions protos/google/bigtable/v2/data.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 Google LLC.
// Copyright 2019 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";

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

0 comments on commit 6a26c07

Please sign in to comment.