Skip to content

Commit

Permalink
fix: remove eslint, update gax, fix generated protos, run the generat…
Browse files Browse the repository at this point in the history
…or (#897)

Run the latest version of the generator, update google-gax, update gts, and remove direct dependencies on eslint.
  • Loading branch information
alexander-fenster authored Apr 11, 2020
1 parent 1cbb080 commit 7cfba21
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"scripts": {
"docs": "jsdoc -c .jsdoc.js",
"predocs": "npm run compile",
"lint": "gts check",
"lint": "gts fix",
"samples-test": "cd samples/ && npm link ../ && npm test && cd ../",
"system-test": "mocha build/system-test --timeout 600000",
"cleanup": "mocha scripts/cleanup.js --timeout 30000",
Expand All @@ -45,7 +45,7 @@
"docs-test": "linkinator docs",
"predocs-test": "npm run docs",
"benchwrapper": "node bin/benchwrapper.js",
"prelint": "cd samples; npm link ../; npm i"
"prelint": "cd samples; npm link ../; npm install"
},
"dependencies": {
"@google-cloud/common": "^2.2.2",
Expand All @@ -59,7 +59,7 @@
"events-intercept": "^2.0.0",
"extend": "^3.0.2",
"google-auth-library": "^6.0.0",
"google-gax": "^2.0.2",
"google-gax": "^2.1.0",
"grpc": "^1.21.1",
"grpc-gcp": "^0.1.1",
"is": "^3.2.1",
Expand Down Expand Up @@ -94,7 +94,7 @@
"dedent": "^0.7.0",
"duplexify": "^4.1.1",
"execa": "^4.0.0",
"gts": "2.0.0",
"gts": "^2.0.0",
"jsdoc": "^3.6.2",
"jsdoc-fresh": "^1.0.1",
"jsdoc-region-tag": "^1.0.2",
Expand Down
18 changes: 13 additions & 5 deletions protos/protos.json
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,8 @@
"java_multiple_files": true,
"java_outer_classname": "StatusProto",
"java_package": "com.google.rpc",
"objc_class_prefix": "RPC"
"objc_class_prefix": "RPC",
"cc_enable_arenas": true
},
"nested": {
"RetryInfo": {
Expand Down Expand Up @@ -3686,34 +3687,41 @@
"extend": "google.protobuf.MethodOptions"
},
"Operations": {
"options": {
"(google.api.default_host)": "longrunning.googleapis.com"
},
"methods": {
"ListOperations": {
"requestType": "ListOperationsRequest",
"responseType": "ListOperationsResponse",
"options": {
"(google.api.http).get": "/v1/{name=operations}"
"(google.api.http).get": "/v1/{name=operations}",
"(google.api.method_signature)": "name,filter"
}
},
"GetOperation": {
"requestType": "GetOperationRequest",
"responseType": "Operation",
"options": {
"(google.api.http).get": "/v1/{name=operations/**}"
"(google.api.http).get": "/v1/{name=operations/**}",
"(google.api.method_signature)": "name"
}
},
"DeleteOperation": {
"requestType": "DeleteOperationRequest",
"responseType": "google.protobuf.Empty",
"options": {
"(google.api.http).delete": "/v1/{name=operations/**}"
"(google.api.http).delete": "/v1/{name=operations/**}",
"(google.api.method_signature)": "name"
}
},
"CancelOperation": {
"requestType": "CancelOperationRequest",
"responseType": "google.protobuf.Empty",
"options": {
"(google.api.http).post": "/v1/{name=operations/**}:cancel",
"(google.api.http).body": "*"
"(google.api.http).body": "*",
"(google.api.method_signature)": "name"
}
},
"WaitOperation": {
Expand Down
14 changes: 3 additions & 11 deletions synth.metadata
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
{
"updateTime": "2020-04-09T21:34:30.852151Z",
"updateTime": "2020-04-11T00:56:45.691191Z",
"sources": [
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "ac1f904979899bc598fb0567cf7a367f08b40b43",
"internalRef": "305760190",
"log": "ac1f904979899bc598fb0567cf7a367f08b40b43\nfix (breaking change): reorder Company and Job resources in talent API to be consistent with old gapic config.\n\ncommitter: @hzyi-google\nPiperOrigin-RevId: 305760190\n\n"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "74ce986d3b5431eb66985e9a00c4eb45295a4020"
"sha": "6f32150677c9784f3c3a7e1949472bd29c9d72c5",
"log": "6f32150677c9784f3c3a7e1949472bd29c9d72c5\nfix: installs test_utils from its common repo (#480)\n\n\n"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion synth.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@
# Node.js specific cleanup
# '''
subprocess.run(['npm', 'install'])
subprocess.run(['npm', 'run', 'fix'])
subprocess.run(['npm', 'run', 'lint'])
subprocess.run(['npx', 'compileProtos', 'src'])

0 comments on commit 7cfba21

Please sign in to comment.