Skip to content

Commit 982276c

Browse files
sumitsutharsumitsuthar
authored
chore: Updated versioned tests due to update in @newrelic/security-agent V1.3.0 (#2239)
1 parent 354bcb2 commit 982276c

File tree

6 files changed

+31
-37
lines changed

6 files changed

+31
-37
lines changed

‎THIRD_PARTY_NOTICES.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ SOFTWARE.
539539

540540
### @newrelic/security-agent
541541

542-
This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.2.0](https://github.com/newrelic/csec-node-agent/tree/v1.2.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.2.0/LICENSE):
542+
This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.3.0](https://github.com/newrelic/csec-node-agent/tree/v1.3.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.3.0/LICENSE):
543543

544544
```
545545
## New Relic Software License v1.0
@@ -886,7 +886,7 @@ SOFTWARE.
886886

887887
### @aws-sdk/client-s3
888888

889-
This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.582.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.582.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.582.0/LICENSE):
889+
This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.587.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.587.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.587.0/LICENSE):
890890

891891
```
892892
Apache License
@@ -1095,7 +1095,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co
10951095

10961096
### @aws-sdk/s3-request-presigner
10971097

1098-
This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.582.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.582.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.582.0/LICENSE):
1098+
This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.587.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.587.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.587.0/LICENSE):
10991099

11001100
```
11011101
Apache License
@@ -2493,7 +2493,7 @@ THE SOFTWARE.
24932493

24942494
### aws-sdk
24952495

2496-
This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1626.0](https://github.com/aws/aws-sdk-js/tree/v2.1626.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1626.0/LICENSE.txt):
2496+
This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1631.0](https://github.com/aws/aws-sdk-js/tree/v2.1631.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1631.0/LICENSE.txt):
24972497

24982498
```
24992499
@@ -2892,7 +2892,7 @@ THE SOFTWARE.
28922892

28932893
### eslint-plugin-jsdoc
28942894

2895-
This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.2.5](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.2.5)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.2.5/LICENSE):
2895+
This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.2.7](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.2.7)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.2.7/LICENSE):
28962896

28972897
```
28982898
Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
"@grpc/grpc-js": "^1.9.4",
196196
"@grpc/proto-loader": "^0.7.5",
197197
"@newrelic/ritm": "^7.2.0",
198-
"@newrelic/security-agent": "^1.1.1",
198+
"@newrelic/security-agent": "^1.3.0",
199199
"@tyriar/fibonacci-heap": "^2.0.7",
200200
"concat-stream": "^2.0.0",
201201
"https-proxy-agent": "^7.0.1",

‎test/versioned/express/ignoring.tap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ test('ignoring an Express route', function (t) {
3838

3939
const metrics = agent.metrics._metrics.unscoped
4040
// loading k2 adds instrumentation metrics for things it loads
41-
const expectedMetrics = helper.isSecurityAgentEnabled(agent) ? 9 : 3
41+
const expectedMetrics = helper.isSecurityAgentEnabled(agent) ? 11 : 3
4242
t.equal(
4343
Object.keys(metrics).length,
4444
expectedMetrics,

‎test/versioned/hapi/ignoring.tap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ test('ignoring a Hapi route', function (t) {
2929

3030
const metrics = agent.metrics._metrics.unscoped
3131
// loading k2 adds instrumentation metrics for packages it instruments
32-
const expectedMetrics = helper.isSecurityAgentEnabled(agent) ? 10 : 3
32+
const expectedMetrics = helper.isSecurityAgentEnabled(agent) ? 11 : 3
3333
t.equal(
3434
Object.keys(metrics).length,
3535
expectedMetrics,

‎test/versioned/restify/pre-7/ignoring.tap.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88
const test = require('tap').test
99
const helper = require('../../../lib/agent_helper')
1010
const API = require('../../../../api')
11-
const semver = require('semver')
1211

1312
test('Restify router introspection', function (t) {
1413
t.plan(7)
1514

1615
const agent = helper.instrumentMockedAgent()
1716
const api = new API(agent)
18-
const { version: pkgVersion } = require('restify/package')
1917
const server = require('restify').createServer()
2018

2119
t.teardown(function () {
@@ -39,11 +37,7 @@ test('Restify router introspection', function (t) {
3937
// loading k2 adds instrumentation metrics for things it registers
4038
// this also differs between major versions of restify. 6+ also loads
4139
// k2 child_process instrumentation, fun fun fun
42-
const expectedMetrics = helper.isSecurityAgentEnabled(agent)
43-
? semver.lt(pkgVersion, 'v6.0.0')
44-
? 14
45-
: 15
46-
: 7
40+
const expectedMetrics = helper.isSecurityAgentEnabled(agent) ? 15 : 7
4741
t.equal(
4842
Object.keys(metrics).length,
4943
expectedMetrics,

‎third_party_manifest.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"lastUpdated": "Wed May 29 2024 17:25:34 GMT-0400 (Eastern Daylight Time)",
2+
"lastUpdated": "Mon Jun 03 2024 11:14:52 GMT+0530 (India Standard Time)",
33
"projectName": "New Relic Node Agent",
44
"projectUrl": "https://github.com/newrelic/node-newrelic",
55
"includeOptDeps": true,
@@ -82,15 +82,15 @@
8282
"email": "[email protected]",
8383
"url": "https://twitter.com/wa7son"
8484
},
85-
"@newrelic/security-agent@1.2.0": {
85+
"@newrelic/security-agent@1.3.0": {
8686
"name": "@newrelic/security-agent",
87-
"version": "1.2.0",
88-
"range": "^1.1.1",
87+
"version": "1.3.0",
88+
"range": "^1.3.0",
8989
"licenses": "UNKNOWN",
9090
"repoUrl": "https://github.com/newrelic/csec-node-agent",
91-
"versionedRepoUrl": "https://github.com/newrelic/csec-node-agent/tree/v1.2.0",
91+
"versionedRepoUrl": "https://github.com/newrelic/csec-node-agent/tree/v1.3.0",
9292
"licenseFile": "node_modules/@newrelic/security-agent/LICENSE",
93-
"licenseUrl": "https://github.com/newrelic/csec-node-agent/blob/v1.2.0/LICENSE",
93+
"licenseUrl": "https://github.com/newrelic/csec-node-agent/blob/v1.3.0/LICENSE",
9494
"licenseTextSource": "file",
9595
"publisher": "newrelic"
9696
},
@@ -226,28 +226,28 @@
226226
}
227227
},
228228
"devDependencies": {
229-
"@aws-sdk/client-s3@3.582.0": {
229+
"@aws-sdk/client-s3@3.587.0": {
230230
"name": "@aws-sdk/client-s3",
231-
"version": "3.582.0",
231+
"version": "3.587.0",
232232
"range": "^3.556.0",
233233
"licenses": "Apache-2.0",
234234
"repoUrl": "https://github.com/aws/aws-sdk-js-v3",
235-
"versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.582.0",
235+
"versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.587.0",
236236
"licenseFile": "node_modules/@aws-sdk/client-s3/LICENSE",
237-
"licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.582.0/LICENSE",
237+
"licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.587.0/LICENSE",
238238
"licenseTextSource": "file",
239239
"publisher": "AWS SDK for JavaScript Team",
240240
"url": "https://aws.amazon.com/javascript/"
241241
},
242-
"@aws-sdk/s3-request-presigner@3.582.0": {
242+
"@aws-sdk/s3-request-presigner@3.587.0": {
243243
"name": "@aws-sdk/s3-request-presigner",
244-
"version": "3.582.0",
244+
"version": "3.587.0",
245245
"range": "^3.556.0",
246246
"licenses": "Apache-2.0",
247247
"repoUrl": "https://github.com/aws/aws-sdk-js-v3",
248-
"versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.582.0",
248+
"versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.587.0",
249249
"licenseFile": "node_modules/@aws-sdk/s3-request-presigner/LICENSE",
250-
"licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.582.0/LICENSE",
250+
"licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.587.0/LICENSE",
251251
"licenseTextSource": "file",
252252
"publisher": "AWS SDK for JavaScript Team",
253253
"url": "https://aws.amazon.com/javascript/"
@@ -376,15 +376,15 @@
376376
"licenseTextSource": "file",
377377
"publisher": "Caolan McMahon"
378378
},
379-
"aws-sdk@2.1626.0": {
379+
"aws-sdk@2.1631.0": {
380380
"name": "aws-sdk",
381-
"version": "2.1626.0",
381+
"version": "2.1631.0",
382382
"range": "^2.1604.0",
383383
"licenses": "Apache-2.0",
384384
"repoUrl": "https://github.com/aws/aws-sdk-js",
385-
"versionedRepoUrl": "https://github.com/aws/aws-sdk-js/tree/v2.1626.0",
385+
"versionedRepoUrl": "https://github.com/aws/aws-sdk-js/tree/v2.1631.0",
386386
"licenseFile": "node_modules/aws-sdk/LICENSE.txt",
387-
"licenseUrl": "https://github.com/aws/aws-sdk-js/blob/v2.1626.0/LICENSE.txt",
387+
"licenseUrl": "https://github.com/aws/aws-sdk-js/blob/v2.1631.0/LICENSE.txt",
388388
"licenseTextSource": "file",
389389
"publisher": "Amazon Web Services",
390390
"url": "https://aws.amazon.com/"
@@ -480,15 +480,15 @@
480480
"publisher": "Michael Radionov",
481481
"url": "https://github.com/mradionov"
482482
},
483-
"[email protected].5": {
483+
"[email protected].7": {
484484
"name": "eslint-plugin-jsdoc",
485-
"version": "48.2.5",
485+
"version": "48.2.7",
486486
"range": "^48.0.5",
487487
"licenses": "BSD-3-Clause",
488488
"repoUrl": "https://github.com/gajus/eslint-plugin-jsdoc",
489-
"versionedRepoUrl": "https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.2.5",
489+
"versionedRepoUrl": "https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.2.7",
490490
"licenseFile": "node_modules/eslint-plugin-jsdoc/LICENSE",
491-
"licenseUrl": "https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.2.5/LICENSE",
491+
"licenseUrl": "https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.2.7/LICENSE",
492492
"licenseTextSource": "file",
493493
"publisher": "Gajus Kuizinas",
494494
"email": "[email protected]",

0 commit comments

Comments
 (0)