Skip to content

Commit 24b78e2

Browse files
alexander-fensteralexander-fenster
authored
fix: remove eslint, update gax, fix generated protos, run the generator (#400)
Run the latest version of the generator, update google-gax, update gts, and remove direct dependencies on eslint.
1 parent ad1f101 commit 24b78e2

10 files changed

+77
-80
lines changed

‎packages/google-cloud-tasks/.jsdoc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module.exports = {
4040
includePattern: '\\.js$'
4141
},
4242
templates: {
43-
copyright: 'Copyright 2019 Google, LLC.',
43+
copyright: 'Copyright 2020 Google LLC',
4444
includeDate: false,
4545
sourceFiles: false,
4646
systemName: '@google-cloud/tasks',

‎packages/google-cloud-tasks/.prettierrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
66
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
7+
// https://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,

‎packages/google-cloud-tasks/package.json

+4-8
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"test": "c8 mocha build/test",
3333
"samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../",
3434
"system-test": "mocha build/system-test",
35-
"lint": "gts fix && eslint --fix samples/*.js",
35+
"lint": "gts fix",
3636
"fix": "gts fix",
3737
"docs": "jsdoc -c .jsdoc.js",
3838
"docs-test": "linkinator docs",
@@ -41,22 +41,18 @@
4141
"compile-protos": "compileProtos src",
4242
"predocs-test": "npm run docs",
4343
"prepare": "npm run compile",
44-
"prelint": "cd samples; npm link ../; npm i"
44+
"prelint": "cd samples; npm link ../; npm install"
4545
},
4646
"dependencies": {
47-
"google-gax": "^2.0.1"
47+
"google-gax": "^2.1.0"
4848
},
4949
"devDependencies": {
5050
"@types/mocha": "^7.0.0",
5151
"@types/node": "^12.0.0",
5252
"@types/sinon": "^9.0.0",
5353
"c8": "^6.0.0",
5454
"codecov": "^3.0.2",
55-
"eslint": "^6.0.0",
56-
"eslint-config-prettier": "^6.0.0",
57-
"eslint-plugin-node": "^11.0.0",
58-
"eslint-plugin-prettier": "^3.0.0",
59-
"gts": "2.0.0",
55+
"gts": "^2.0.0",
6056
"jsdoc": "^3.6.2",
6157
"jsdoc-fresh": "^1.0.2",
6258
"jsdoc-region-tag": "^1.0.2",

‎packages/google-cloud-tasks/protos/protos.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
2929

3030
// Exported root namespace
31-
var $root = $protobuf.roots._google_cloud_tasks_1_9_0_protos || ($protobuf.roots._google_cloud_tasks_1_9_0_protos = {});
31+
var $root = $protobuf.roots._google_cloud_tasks_2_0_0_protos || ($protobuf.roots._google_cloud_tasks_2_0_0_protos = {});
3232

3333
$root.google = (function() {
3434

‎packages/google-cloud-tasks/protos/protos.json

+1
Original file line numberDiff line numberDiff line change
@@ -3371,6 +3371,7 @@
33713371
},
33723372
"rpc": {
33733373
"options": {
3374+
"cc_enable_arenas": true,
33743375
"go_package": "google.golang.org/genproto/googleapis/rpc/status;status",
33753376
"java_multiple_files": true,
33763377
"java_outer_classname": "StatusProto",

‎packages/google-cloud-tasks/synth.metadata

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"updateTime": "2020-04-03T12:16:51.870175Z",
2+
"updateTime": "2020-04-11T01:45:48.684943Z",
33
"sources": [
44
{
55
"git": {
66
"name": "googleapis",
77
"remote": "https://github.com/googleapis/googleapis.git",
8-
"sha": "3d5d228a58bdf875e6147b228db3159010c735ee",
9-
"internalRef": "304500143"
8+
"sha": "1bd77e8ce6f953ac641af7966d0c52646afc16a8",
9+
"internalRef": "305974465"
1010
}
1111
},
1212
{
1313
"git": {
1414
"name": "synthtool",
1515
"remote": "https://github.com/googleapis/synthtool.git",
16-
"sha": "99820243d348191bc9c634f2b48ddf65096285ed"
16+
"sha": "6f32150677c9784f3c3a7e1949472bd29c9d72c5"
1717
}
1818
}
1919
],

‎packages/google-cloud-tasks/synth.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@
5454

5555
# Node.js specific cleanup
5656
subprocess.run(["npm", "install"])
57-
subprocess.run(["npm", "run", "fix"])
57+
subprocess.run(["npm", "run", "lint"])
5858
subprocess.run(['npx', 'compileProtos', 'src'])

‎packages/google-cloud-tasks/test/gapic_cloud_tasks_v2.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ describe('v2.CloudTasksClient', () => {
294294
};
295295
const expectedError = new Error('expected');
296296
client.innerApiCalls.getQueue = stubSimpleCall(undefined, expectedError);
297-
assert.rejects(async () => {
297+
await assert.rejects(async () => {
298298
await client.getQueue(request);
299299
}, expectedError);
300300
assert(
@@ -408,7 +408,7 @@ describe('v2.CloudTasksClient', () => {
408408
undefined,
409409
expectedError
410410
);
411-
assert.rejects(async () => {
411+
await assert.rejects(async () => {
412412
await client.createQueue(request);
413413
}, expectedError);
414414
assert(
@@ -525,7 +525,7 @@ describe('v2.CloudTasksClient', () => {
525525
undefined,
526526
expectedError
527527
);
528-
assert.rejects(async () => {
528+
await assert.rejects(async () => {
529529
await client.updateQueue(request);
530530
}, expectedError);
531531
assert(
@@ -639,7 +639,7 @@ describe('v2.CloudTasksClient', () => {
639639
undefined,
640640
expectedError
641641
);
642-
assert.rejects(async () => {
642+
await assert.rejects(async () => {
643643
await client.deleteQueue(request);
644644
}, expectedError);
645645
assert(
@@ -753,7 +753,7 @@ describe('v2.CloudTasksClient', () => {
753753
undefined,
754754
expectedError
755755
);
756-
assert.rejects(async () => {
756+
await assert.rejects(async () => {
757757
await client.purgeQueue(request);
758758
}, expectedError);
759759
assert(
@@ -867,7 +867,7 @@ describe('v2.CloudTasksClient', () => {
867867
undefined,
868868
expectedError
869869
);
870-
assert.rejects(async () => {
870+
await assert.rejects(async () => {
871871
await client.pauseQueue(request);
872872
}, expectedError);
873873
assert(
@@ -981,7 +981,7 @@ describe('v2.CloudTasksClient', () => {
981981
undefined,
982982
expectedError
983983
);
984-
assert.rejects(async () => {
984+
await assert.rejects(async () => {
985985
await client.resumeQueue(request);
986986
}, expectedError);
987987
assert(
@@ -1095,7 +1095,7 @@ describe('v2.CloudTasksClient', () => {
10951095
undefined,
10961096
expectedError
10971097
);
1098-
assert.rejects(async () => {
1098+
await assert.rejects(async () => {
10991099
await client.getIamPolicy(request);
11001100
}, expectedError);
11011101
assert(
@@ -1209,7 +1209,7 @@ describe('v2.CloudTasksClient', () => {
12091209
undefined,
12101210
expectedError
12111211
);
1212-
assert.rejects(async () => {
1212+
await assert.rejects(async () => {
12131213
await client.setIamPolicy(request);
12141214
}, expectedError);
12151215
assert(
@@ -1325,7 +1325,7 @@ describe('v2.CloudTasksClient', () => {
13251325
undefined,
13261326
expectedError
13271327
);
1328-
assert.rejects(async () => {
1328+
await assert.rejects(async () => {
13291329
await client.testIamPermissions(request);
13301330
}, expectedError);
13311331
assert(
@@ -1436,7 +1436,7 @@ describe('v2.CloudTasksClient', () => {
14361436
};
14371437
const expectedError = new Error('expected');
14381438
client.innerApiCalls.getTask = stubSimpleCall(undefined, expectedError);
1439-
assert.rejects(async () => {
1439+
await assert.rejects(async () => {
14401440
await client.getTask(request);
14411441
}, expectedError);
14421442
assert(
@@ -1550,7 +1550,7 @@ describe('v2.CloudTasksClient', () => {
15501550
undefined,
15511551
expectedError
15521552
);
1553-
assert.rejects(async () => {
1553+
await assert.rejects(async () => {
15541554
await client.createTask(request);
15551555
}, expectedError);
15561556
assert(
@@ -1664,7 +1664,7 @@ describe('v2.CloudTasksClient', () => {
16641664
undefined,
16651665
expectedError
16661666
);
1667-
assert.rejects(async () => {
1667+
await assert.rejects(async () => {
16681668
await client.deleteTask(request);
16691669
}, expectedError);
16701670
assert(
@@ -1775,7 +1775,7 @@ describe('v2.CloudTasksClient', () => {
17751775
};
17761776
const expectedError = new Error('expected');
17771777
client.innerApiCalls.runTask = stubSimpleCall(undefined, expectedError);
1778-
assert.rejects(async () => {
1778+
await assert.rejects(async () => {
17791779
await client.runTask(request);
17801780
}, expectedError);
17811781
assert(
@@ -1893,7 +1893,7 @@ describe('v2.CloudTasksClient', () => {
18931893
undefined,
18941894
expectedError
18951895
);
1896-
assert.rejects(async () => {
1896+
await assert.rejects(async () => {
18971897
await client.listQueues(request);
18981898
}, expectedError);
18991899
assert(
@@ -1979,7 +1979,7 @@ describe('v2.CloudTasksClient', () => {
19791979
reject(err);
19801980
});
19811981
});
1982-
assert.rejects(async () => {
1982+
await assert.rejects(async () => {
19831983
await promise;
19841984
}, expectedError);
19851985
assert(
@@ -2051,7 +2051,7 @@ describe('v2.CloudTasksClient', () => {
20512051
expectedError
20522052
);
20532053
const iterable = client.listQueuesAsync(request);
2054-
assert.rejects(async () => {
2054+
await assert.rejects(async () => {
20552055
const responses: protos.google.cloud.tasks.v2.IQueue[] = [];
20562056
for await (const resource of iterable) {
20572057
responses.push(resource!);
@@ -2176,7 +2176,7 @@ describe('v2.CloudTasksClient', () => {
21762176
};
21772177
const expectedError = new Error('expected');
21782178
client.innerApiCalls.listTasks = stubSimpleCall(undefined, expectedError);
2179-
assert.rejects(async () => {
2179+
await assert.rejects(async () => {
21802180
await client.listTasks(request);
21812181
}, expectedError);
21822182
assert(
@@ -2261,7 +2261,7 @@ describe('v2.CloudTasksClient', () => {
22612261
reject(err);
22622262
});
22632263
});
2264-
assert.rejects(async () => {
2264+
await assert.rejects(async () => {
22652265
await promise;
22662266
}, expectedError);
22672267
assert(
@@ -2330,7 +2330,7 @@ describe('v2.CloudTasksClient', () => {
23302330
expectedError
23312331
);
23322332
const iterable = client.listTasksAsync(request);
2333-
assert.rejects(async () => {
2333+
await assert.rejects(async () => {
23342334
const responses: protos.google.cloud.tasks.v2.ITask[] = [];
23352335
for await (const resource of iterable) {
23362336
responses.push(resource!);

0 commit comments

Comments
 (0)