Skip to content

Commit 879bb27

Browse files
fix: remove eslint, update gax, fix generated protos, run the generator (#327)
Run the latest version of the generator, update google-gax, update gts, and remove direct dependencies on eslint.
1 parent adcdb6e commit 879bb27

7 files changed

Lines changed: 22 additions & 33 deletions

File tree

packages/google-cloud-oslogin/.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/os-login',

packages/google-cloud-oslogin/.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-cloud-oslogin/package.json

Lines changed: 4 additions & 8 deletions
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 samples/**/*.js",
35+
"lint": "gts fix",
3636
"fix": "gts fix",
3737
"docs": "jsdoc -c .jsdoc.js",
3838
"docs-test": "linkinator docs",
@@ -41,21 +41,17 @@
4141
"compile": "tsc -p . && cp -r protos build/",
4242
"compile-protos": "compileProtos src",
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": "^7.0.0",
54-
"eslint": "^6.0.0",
55-
"eslint-config-prettier": "^6.0.0",
56-
"eslint-plugin-node": "^11.0.0",
57-
"eslint-plugin-prettier": "^3.0.0",
58-
"gts": "2.0.0",
54+
"gts": "^2.0.0",
5955
"jsdoc": "^3.5.5",
6056
"jsdoc-fresh": "^1.0.1",
6157
"jsdoc-region-tag": "^1.0.2",

packages/google-cloud-oslogin/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:58:20.765950Z",
2+
"updateTime": "2020-04-11T00:37:35.035596Z",
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-cloud-oslogin/synth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@
5050

5151
# Node.js specific cleanup
5252
subprocess.run(['npm', 'install'])
53-
subprocess.run(['npm', 'run', 'fix'])
53+
subprocess.run(['npm', 'run', 'lint'])
5454
subprocess.run(['npx', 'compileProtos', 'src'])

packages/google-cloud-oslogin/test/gapic_os_login_service_v1.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ describe('v1.OsLoginServiceClient', () => {
238238
undefined,
239239
expectedError
240240
);
241-
assert.rejects(async () => {
241+
await assert.rejects(async () => {
242242
await client.deletePosixAccount(request);
243243
}, expectedError);
244244
assert(
@@ -354,7 +354,7 @@ describe('v1.OsLoginServiceClient', () => {
354354
undefined,
355355
expectedError
356356
);
357-
assert.rejects(async () => {
357+
await assert.rejects(async () => {
358358
await client.deleteSshPublicKey(request);
359359
}, expectedError);
360360
assert(
@@ -468,7 +468,7 @@ describe('v1.OsLoginServiceClient', () => {
468468
undefined,
469469
expectedError
470470
);
471-
assert.rejects(async () => {
471+
await assert.rejects(async () => {
472472
await client.getLoginProfile(request);
473473
}, expectedError);
474474
assert(
@@ -582,7 +582,7 @@ describe('v1.OsLoginServiceClient', () => {
582582
undefined,
583583
expectedError
584584
);
585-
assert.rejects(async () => {
585+
await assert.rejects(async () => {
586586
await client.getSshPublicKey(request);
587587
}, expectedError);
588588
assert(
@@ -698,7 +698,7 @@ describe('v1.OsLoginServiceClient', () => {
698698
undefined,
699699
expectedError
700700
);
701-
assert.rejects(async () => {
701+
await assert.rejects(async () => {
702702
await client.importSshPublicKey(request);
703703
}, expectedError);
704704
assert(
@@ -814,7 +814,7 @@ describe('v1.OsLoginServiceClient', () => {
814814
undefined,
815815
expectedError
816816
);
817-
assert.rejects(async () => {
817+
await assert.rejects(async () => {
818818
await client.updateSshPublicKey(request);
819819
}, expectedError);
820820
assert(

packages/google-cloud-oslogin/test/gapic_os_login_service_v1beta.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ describe('v1beta.OsLoginServiceClient', () => {
238238
undefined,
239239
expectedError
240240
);
241-
assert.rejects(async () => {
241+
await assert.rejects(async () => {
242242
await client.deletePosixAccount(request);
243243
}, expectedError);
244244
assert(
@@ -354,7 +354,7 @@ describe('v1beta.OsLoginServiceClient', () => {
354354
undefined,
355355
expectedError
356356
);
357-
assert.rejects(async () => {
357+
await assert.rejects(async () => {
358358
await client.deleteSshPublicKey(request);
359359
}, expectedError);
360360
assert(
@@ -468,7 +468,7 @@ describe('v1beta.OsLoginServiceClient', () => {
468468
undefined,
469469
expectedError
470470
);
471-
assert.rejects(async () => {
471+
await assert.rejects(async () => {
472472
await client.getLoginProfile(request);
473473
}, expectedError);
474474
assert(
@@ -582,7 +582,7 @@ describe('v1beta.OsLoginServiceClient', () => {
582582
undefined,
583583
expectedError
584584
);
585-
assert.rejects(async () => {
585+
await assert.rejects(async () => {
586586
await client.getSshPublicKey(request);
587587
}, expectedError);
588588
assert(
@@ -698,7 +698,7 @@ describe('v1beta.OsLoginServiceClient', () => {
698698
undefined,
699699
expectedError
700700
);
701-
assert.rejects(async () => {
701+
await assert.rejects(async () => {
702702
await client.importSshPublicKey(request);
703703
}, expectedError);
704704
assert(
@@ -814,7 +814,7 @@ describe('v1beta.OsLoginServiceClient', () => {
814814
undefined,
815815
expectedError
816816
);
817-
assert.rejects(async () => {
817+
await assert.rejects(async () => {
818818
await client.updateSshPublicKey(request);
819819
}, expectedError);
820820
assert(

0 commit comments

Comments
 (0)