Skip to content

Commit 774fb10

Browse files
deps: remove lodash omit, omitby, and pick (#565)
* deps: remove omit, omitby, pick * 🦉 Updates from OwlBot Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent d900b75 commit 774fb10

4 files changed

Lines changed: 26 additions & 35 deletions

File tree

packages/handwritten/package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
"@types/hapi__hapi": "^20.0.5",
4848
"@types/json-stable-stringify": "^1.0.32",
4949
"@types/koa": "^2.0.48",
50-
"@types/lodash.omit": "^4.5.6",
51-
"@types/lodash.omitby": "^4.6.6",
52-
"@types/lodash.pick": "^4.4.6",
5350
"@types/lodash.random": "^3.2.6",
5451
"@types/lodash.without": "^4.4.6",
5552
"@types/mocha": "^8.0.0",
@@ -70,9 +67,6 @@
7067
"json-stable-stringify": "^1.0.1",
7168
"koa": "^2.7.0",
7269
"linkinator": "^2.0.0",
73-
"lodash.omit": "^4.5.0",
74-
"lodash.omitby": "^4.6.0",
75-
"lodash.pick": "^4.4.0",
7670
"lodash.random": "^3.2.0",
7771
"lodash.without": "^4.4.0",
7872
"mocha": "^8.0.0",

packages/handwritten/system-test/error-reporting.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ import {
2929
ErrorsApiTransport,
3030
} from '../utils/errors-api-transport';
3131

32-
import pick = require('lodash.pick');
33-
import omitBy = require('lodash.omitby');
3432
import * as uuid from 'uuid';
3533
import * as util from 'util';
3634
import * as path from 'path';
@@ -57,10 +55,14 @@ class InstancedEnv {
5755
}
5856

5957
_captureProcessProperties() {
60-
return omitBy(
61-
pick(process.env, envKeys),
62-
value => typeof value !== 'string'
58+
const envVars = {...process.env};
59+
Object.entries(envVars).forEach(
60+
([key, value]) =>
61+
envKeys.includes(key) &&
62+
typeof value !== 'string' &&
63+
delete envVars[key]
6364
);
65+
return envVars;
6466
}
6567

6668
sterilizeProcess() {

packages/handwritten/test/unit/request-extractors/manual.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import omit = require('lodash.omit');
1615
import {manualRequestInformationExtractor} from '../../../src/request-extractors/manual';
1716
import {Fuzzer} from '../../../utils/fuzzer';
1817
import {deepStrictEqual} from '../../util';
@@ -58,50 +57,54 @@ describe('manualRequestInformationExtractor', () => {
5857
'the output of the request extraction',
5958
].join(' ')
6059
);
60+
const {method, ...sansMethod} = FULL_VALID_INPUT;
6161
deepStrictEqual(
62-
manualRequestInformationExtractor(omit(FULL_VALID_INPUT, 'method')),
62+
manualRequestInformationExtractor(sansMethod),
6363
Object.assign({}, FULL_VALID_INPUT, {method: ''}),
6464
[
6565
'Given a full valid input object sans the method property values',
6666
'should be reflected by the output of the request extraction',
6767
].join(' ')
6868
);
69+
const {url, ...sansUrl} = FULL_VALID_INPUT;
6970
deepStrictEqual(
70-
manualRequestInformationExtractor(omit(FULL_VALID_INPUT, 'url')),
71+
manualRequestInformationExtractor(sansUrl),
7172
Object.assign({}, FULL_VALID_INPUT, {url: ''}),
7273
[
7374
'Given a valid input sans the url property these values should be',
7475
'reflected by the output of the request extraction',
7576
].join('')
7677
);
78+
const {userAgent, ...sansUserAgent} = FULL_VALID_INPUT;
7779
deepStrictEqual(
78-
manualRequestInformationExtractor(omit(FULL_VALID_INPUT, 'userAgent')),
80+
manualRequestInformationExtractor(sansUserAgent),
7981
Object.assign({}, FULL_VALID_INPUT, {userAgent: ''}),
8082
[
8183
'Given a full valid input sans the userAgent property these values',
8284
'should be reflected by the output of the request extraction',
8385
].join('')
8486
);
87+
const {referrer, ...sansReferrer} = FULL_VALID_INPUT;
8588
deepStrictEqual(
86-
manualRequestInformationExtractor(omit(FULL_VALID_INPUT, 'referrer')),
89+
manualRequestInformationExtractor(sansReferrer),
8790
Object.assign({}, FULL_VALID_INPUT, {referrer: ''}),
8891
[
8992
'Given a full valid input sans the referrer property these values',
9093
'should be reflected by the output of the request extraction',
9194
].join('')
9295
);
96+
const {statusCode, ...sansStatusCode} = FULL_VALID_INPUT;
9397
deepStrictEqual(
94-
manualRequestInformationExtractor(omit(FULL_VALID_INPUT, 'statusCode')),
98+
manualRequestInformationExtractor(sansStatusCode),
9599
Object.assign({}, FULL_VALID_INPUT, {statusCode: 0}),
96100
[
97101
'Given a full valid input sans the statusCode property these values',
98102
'should be reflected by the output of the request extraction',
99103
].join('')
100104
);
105+
const {remoteAddress, ...sansRemoteAddress} = FULL_VALID_INPUT;
101106
deepStrictEqual(
102-
manualRequestInformationExtractor(
103-
omit(FULL_VALID_INPUT, 'remoteAddress')
104-
),
107+
manualRequestInformationExtractor(sansRemoteAddress),
105108
Object.assign({}, FULL_VALID_INPUT, {remoteAddress: ''}),
106109
[
107110
'Given a valid input sans the remoteAddress property these values',

packages/handwritten/test/unit/service-configuration.ts

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import * as assert from 'assert';
1616
import {describe, beforeEach, after, it} from 'mocha';
17-
import omitBy = require('lodash.omitby');
1817
import {FakeConfiguration as Configuration} from '../fixtures/configuration';
1918
import {deepStrictEqual} from '../util';
2019
const level = process.env.GCLOUD_ERRORS_LOGLEVEL;
@@ -46,20 +45,13 @@ function setEnv(envData: {
4645
}) {
4746
Object.assign(
4847
process.env,
49-
omitBy(
50-
{
51-
GAE_SERVICE: envData.gaeServiceName,
52-
GAE_VERSION: envData.gaeServiceVersion,
53-
GAE_MODULE_NAME: envData.gaeModuleName,
54-
GAE_MODULE_VERSION: envData.gaeModuleVersion,
55-
FUNCTION_NAME: envData.functionName,
56-
K_SERVICE: envData.kService,
57-
K_REVISION: envData.kRevision,
58-
},
59-
val => {
60-
return typeof val !== 'string';
61-
}
62-
)
48+
envData.gaeServiceName && {GAE_SERVICE: envData.gaeServiceName},
49+
envData.gaeServiceVersion && {GAE_VERSION: envData.gaeServiceVersion},
50+
envData.gaeModuleName && {GAE_MODULE_NAME: envData.gaeModuleName},
51+
envData.gaeModuleVersion && {GAE_MODULE_VERSION: envData.gaeModuleVersion},
52+
envData.functionName && {FUNCTION_NAME: envData.functionName},
53+
envData.kService && {K_SERVICE: envData.kService},
54+
envData.kRevision && {K_REVISION: envData.kRevision}
6355
);
6456
}
6557
function restoreServiceConfigEnv() {

0 commit comments

Comments
 (0)