Skip to content

Commit 257b30f

Browse files
fix: remove eslint, update gax, fix generated protos, run the generator (#68)
Run the latest version of the generator, update google-gax, update gts, and remove direct dependencies on eslint.
1 parent 3b7c0eb commit 257b30f

6 files changed

Lines changed: 18 additions & 29 deletions

File tree

packages/google-monitoring-dashboard/.jsdoc.js

Lines changed: 1 addition & 1 deletion
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/monitoring-dashboards',

packages/google-monitoring-dashboard/.prettierrc.js

Lines changed: 1 addition & 1 deletion
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-monitoring-dashboard/package.json

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,24 @@
1616
"compile-protos": "compileProtos src",
1717
"docs": "jsdoc -c .jsdoc.js",
1818
"docs-test": "linkinator docs",
19-
"fix": "gts fix && eslint samples --fix",
20-
"lint": "gts check && eslint samples",
19+
"fix": "gts fix",
20+
"lint": "gts fix",
2121
"predocs-test": "npm run docs",
2222
"prepare": "npm run compile-protos && npm run compile",
2323
"system-test": "c8 mocha build/system-test",
2424
"test": "c8 mocha build/test",
2525
"samples-test": "cd samples/ && npm link ../ && npm test && cd ../",
26-
"prelint": "cd samples; npm link ../; npm i"
26+
"prelint": "cd samples; npm link ../; npm install"
2727
},
2828
"dependencies": {
29-
"google-gax": "^2.0.1"
29+
"google-gax": "^2.1.0"
3030
},
3131
"devDependencies": {
3232
"@types/mocha": "^7.0.0",
3333
"@types/node": "^12.0.0",
3434
"@types/sinon": "^9.0.0",
3535
"c8": "^7.0.0",
36-
"eslint": "^6.8.0",
37-
"eslint-config-prettier": "^6.9.0",
38-
"eslint-plugin-node": "^11.0.0",
39-
"eslint-plugin-prettier": "^3.1.2",
40-
"gts": "2.0.0",
36+
"gts": "^2.0.0",
4137
"jsdoc": "^3.5.5",
4238
"jsdoc-fresh": "^1.0.1",
4339
"jsdoc-region-tag": "^1.0.2",

packages/google-monitoring-dashboard/synth.metadata

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
{
2-
"updateTime": "2020-04-03T11:56:37.405558Z",
2+
"updateTime": "2020-04-11T00:36:02.116747Z",
33
"sources": [
4-
{
5-
"git": {
6-
"name": "googleapis",
7-
"remote": "https://github.com/googleapis/googleapis.git",
8-
"sha": "3d5d228a58bdf875e6147b228db3159010c735ee",
9-
"internalRef": "304500143"
10-
}
11-
},
124
{
135
"git": {
146
"name": "synthtool",
157
"remote": "https://github.com/googleapis/synthtool.git",
16-
"sha": "99820243d348191bc9c634f2b48ddf65096285ed"
8+
"sha": "6f32150677c9784f3c3a7e1949472bd29c9d72c5",
9+
"log": "6f32150677c9784f3c3a7e1949472bd29c9d72c5\nfix: installs test_utils from its common repo (#480)\n\n\n74ce986d3b5431eb66985e9a00c4eb45295a4020\nfix: stop recording update_time in synth.metadata (#478)\n\n\n7f8e62aa3edd225f76347a16f92e400661fdfb52\nchore(java): release-please only updates non maven versions in README (#476)\n\nPrevent release-please and synthtool from fighting over the released library version. Synthtool updates the install snippets from the samples pom.xml files so the bots fight if they are temporarily out of sync after a release.\nc7e0e517d7f46f77bebd27da2e5afcaa6eee7e25\nbuild(java): fix nightly integration test config to run integrations (#465)\n\nThis was only running the units.\nbd69a2aa7b70875f3c988e269706b22fefbef40e\nbuild(java): fix retry_with_backoff when -e option set (#475)\n\n\nd9b173c427bfa0c6cca818233562e7e8841a357c\nfix: record version of working repo in synth.metadata (#473)\n\nPartial revert of b37cf74d12e9a42b9de9e61a4f26133d7cd9c168.\nf73a541770d95a609e5be6bf6b3b220d17cefcbe\nfeat(discogapic): allow local discovery-artifact-manager (#474)\n\n\n8cf0f5d93a70c3dcb0b4999d3152c46d4d9264bf\ndoc: describe the Autosynth & Synthtool protocol (#472)\n\n* doc: describe the Autosynth & Synthtool protocol\n\n* Accommodate review comments.\n980baaa738a1ad8fa02b4fdbd56be075ee77ece5\nfix: pin sphinx to <3.0.0 as new version causes new error (#471)\n\nThe error `toctree contains reference to document changlelog that doesn't have a title: no link will be generated` occurs as of 3.0.0. Pinning to 2.x until we address the docs build issue.\n\nTowards #470\n\nI did this manually for python-datastore https://github.com/googleapis/python-datastore/pull/22\n928b2998ac5023e7c7e254ab935f9ef022455aad\nchore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.15 (#466)\n\nCo-authored-by: Jeffrey Rennie <rennie@google.com>\n188f1b1d53181f739b98f8aa5d40cfe99eb90c47\nfix: allow local and external deps to be specified (#469)\n\nModify noxfile.py to allow local and external dependencies for\nsystem tests to be specified.\n1df68ed6735ddce6797d0f83641a731c3c3f75b4\nfix: apache license URL (#468)\n\n\nf4a59efa54808c4b958263de87bc666ce41e415f\nfeat: Add discogapic support for GAPICBazel generation (#459)\n\n* feat: Add discogapic support for GAPICBazel generation\n\n* reformat with black\n\n* Rename source repository variable\n\nCo-authored-by: Jeffrey Rennie <rennie@google.com>\n"
1710
}
1811
}
1912
],

packages/google-monitoring-dashboard/synth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343

4444
# Node.js specific cleanup
4545
subprocess.run(['npm', 'install'])
46-
subprocess.run(['npm', 'run', 'fix'])
46+
subprocess.run(['npm', 'run', 'lint'])
4747
subprocess.run(['npx', 'compileProtos', 'src'])
4848

packages/google-monitoring-dashboard/test/gapic_dashboards_service_v1.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ describe('v1.DashboardsServiceClient', () => {
299299
undefined,
300300
expectedError
301301
);
302-
assert.rejects(async () => {
302+
await assert.rejects(async () => {
303303
await client.createDashboard(request);
304304
}, expectedError);
305305
assert(
@@ -413,7 +413,7 @@ describe('v1.DashboardsServiceClient', () => {
413413
undefined,
414414
expectedError
415415
);
416-
assert.rejects(async () => {
416+
await assert.rejects(async () => {
417417
await client.getDashboard(request);
418418
}, expectedError);
419419
assert(
@@ -527,7 +527,7 @@ describe('v1.DashboardsServiceClient', () => {
527527
undefined,
528528
expectedError
529529
);
530-
assert.rejects(async () => {
530+
await assert.rejects(async () => {
531531
await client.deleteDashboard(request);
532532
}, expectedError);
533533
assert(
@@ -644,7 +644,7 @@ describe('v1.DashboardsServiceClient', () => {
644644
undefined,
645645
expectedError
646646
);
647-
assert.rejects(async () => {
647+
await assert.rejects(async () => {
648648
await client.updateDashboard(request);
649649
}, expectedError);
650650
assert(
@@ -774,7 +774,7 @@ describe('v1.DashboardsServiceClient', () => {
774774
undefined,
775775
expectedError
776776
);
777-
assert.rejects(async () => {
777+
await assert.rejects(async () => {
778778
await client.listDashboards(request);
779779
}, expectedError);
780780
assert(
@@ -873,7 +873,7 @@ describe('v1.DashboardsServiceClient', () => {
873873
reject(err);
874874
});
875875
});
876-
assert.rejects(async () => {
876+
await assert.rejects(async () => {
877877
await promise;
878878
}, expectedError);
879879
assert(
@@ -952,7 +952,7 @@ describe('v1.DashboardsServiceClient', () => {
952952
expectedError
953953
);
954954
const iterable = client.listDashboardsAsync(request);
955-
assert.rejects(async () => {
955+
await assert.rejects(async () => {
956956
const responses: protos.google.monitoring.dashboard.v1.IDashboard[] = [];
957957
for await (const resource of iterable) {
958958
responses.push(resource!);

0 commit comments

Comments
 (0)