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 (googleapis#155)

Run the latest version of the generator, update google-gax, update gts, and remove direct dependencies on eslint.
  • Loading branch information
alexander-fenster committed Apr 11, 2020
1 parent 1354e32 commit 21b09f5
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .jsdoc.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module.exports = {
includePattern: '\\.js$'
},
templates: {
copyright: 'Copyright 2019 Google, LLC.',
copyright: 'Copyright 2020 Google LLC',
includeDate: false,
sourceFiles: false,
systemName: '@google-cloud/recaptcha-enterprise',
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
12 changes: 4 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,14 @@
"reCAPTCHA Enterprise API"
],
"dependencies": {
"google-gax": "^2.0.1"
"google-gax": "^2.1.0"
},
"devDependencies": {
"@types/mocha": "^7.0.0",
"@types/node": "^12.0.0",
"@types/sinon": "^9.0.0",
"c8": "^7.0.0",
"eslint": "^6.0.0",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-prettier": "^3.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 All @@ -52,7 +48,7 @@
"webpack-cli": "^3.3.10"
},
"scripts": {
"lint": "gts fix && eslint --fix samples/*.js",
"lint": "gts fix",
"fix": "gts fix",
"samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../",
"system-test": "mocha build/system-test",
Expand All @@ -64,7 +60,7 @@
"compile-protos": "compileProtos src",
"predocs-test": "npm run docs",
"prepare": "npm run compile",
"prelint": "cd samples; npm link ../; npm i"
"prelint": "cd samples; npm link ../; npm install"
},
"license": "Apache-2.0",
"engines": {
Expand Down
13 changes: 3 additions & 10 deletions synth.metadata
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
{
"updateTime": "2020-04-03T12:01:49.096475Z",
"updateTime": "2020-04-11T00:42:58.646069Z",
"sources": [
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "3d5d228a58bdf875e6147b228db3159010c735ee",
"internalRef": "304500143"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "99820243d348191bc9c634f2b48ddf65096285ed"
"sha": "6f32150677c9784f3c3a7e1949472bd29c9d72c5",
"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"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion synth.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@

# Node.js specific cleanup
subprocess.run(['npm', 'install'])
subprocess.run(['npm', 'run', 'fix'])
subprocess.run(['npm', 'run', 'lint'])
subprocess.run(['npx', 'compileProtos', 'src'])
18 changes: 9 additions & 9 deletions test/gapic_recaptcha_enterprise_service_v1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
undefined,
expectedError
);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.createAssessment(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -440,7 +440,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
undefined,
expectedError
);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.annotateAssessment(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -557,7 +557,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.createKey = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.createKey(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -674,7 +674,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.getKey = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.getKey(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -794,7 +794,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.updateKey = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.updateKey(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -911,7 +911,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.deleteKey = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.deleteKey(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -1044,7 +1044,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.listKeys = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.listKeys(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -1145,7 +1145,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
reject(err);
});
});
assert.rejects(async () => {
await assert.rejects(async () => {
await promise;
}, expectedError);
assert(
Expand Down Expand Up @@ -1224,7 +1224,7 @@ describe('v1.RecaptchaEnterpriseServiceClient', () => {
expectedError
);
const iterable = client.listKeysAsync(request);
assert.rejects(async () => {
await assert.rejects(async () => {
const responses: protos.google.cloud.recaptchaenterprise.v1.IKey[] = [];
for await (const resource of iterable) {
responses.push(resource!);
Expand Down
18 changes: 9 additions & 9 deletions test/gapic_recaptcha_enterprise_service_v1_beta1_v1beta1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
undefined,
expectedError
);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.createAssessment(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -441,7 +441,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
undefined,
expectedError
);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.annotateAssessment(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -558,7 +558,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.createKey = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.createKey(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -675,7 +675,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.getKey = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.getKey(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -795,7 +795,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.updateKey = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.updateKey(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -912,7 +912,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.deleteKey = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.deleteKey(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -1047,7 +1047,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
};
const expectedError = new Error('expected');
client.innerApiCalls.listKeys = stubSimpleCall(undefined, expectedError);
assert.rejects(async () => {
await assert.rejects(async () => {
await client.listKeys(request);
}, expectedError);
assert(
Expand Down Expand Up @@ -1148,7 +1148,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
reject(err);
});
});
assert.rejects(async () => {
await assert.rejects(async () => {
await promise;
}, expectedError);
assert(
Expand Down Expand Up @@ -1227,7 +1227,7 @@ describe('v1beta1.RecaptchaEnterpriseServiceV1Beta1Client', () => {
expectedError
);
const iterable = client.listKeysAsync(request);
assert.rejects(async () => {
await assert.rejects(async () => {
const responses: protos.google.cloud.recaptchaenterprise.v1beta1.IKey[] = [];
for await (const resource of iterable) {
responses.push(resource!);
Expand Down

0 comments on commit 21b09f5

Please sign in to comment.