test: Resolve issue with testing in main repo (newrelic#234)

bizob2828 · Dec 22, 2023 · e5294ed · e5294ed
1 parent e4b504c
commit e5294ed
Show file tree

Hide file tree

Showing 10 changed files with 146 additions and 564 deletions.
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
diff --git a/package.json b/package.json
@@ -25,9 +25,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.342.0",
-    "@aws-sdk/eventstream-codec": "^3.374.0",
     "@aws-sdk/s3-request-presigner": "^3.342.0",
-    "@aws-sdk/util-utf8": "^3.374.0",
     "@newrelic/eslint-config": "^0.0.2",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/test-utilities": "^8.1.0",

diff --git a/tests/versioned/aws-server-stubs/ai-server/index.js b/tests/versioned/aws-server-stubs/ai-server/index.js
@@ -9,8 +9,8 @@ module.exports = createAiResponseServer
 
 const http = require('http')
 const { Readable } = require('stream')
-const { EventStreamCodec } = require('@aws-sdk/eventstream-codec')
-const { toUtf8, fromUtf8 } = require('@aws-sdk/util-utf8')
+const { EventStreamCodec } = require('@smithy/eventstream-codec')
+const { toUtf8, fromUtf8 } = require('@smithy/util-utf8')
 const { patchDestroy } = require('../common')
 const responses = require('./responses')
 

diff --git a/tests/versioned/aws-server-stubs/index.js b/tests/versioned/aws-server-stubs/index.js
@@ -7,7 +7,6 @@
 
 const createEmptyResponseServer = require('./empty-response-server')
 const createResponseServer = require('./response-server')
-const createAiResponseServer = require('./ai-server')
 
 // Specific values are unimportant because we'll be hitting our
 // custom servers. But they need to be populated.
@@ -19,6 +18,5 @@ const FAKE_CREDENTIALS = {
 module.exports = {
   createEmptyResponseServer,
   createResponseServer,
-  createAiResponseServer,
   FAKE_CREDENTIALS
 }
diff --git a/tests/versioned/v3/bedrock-ai21.tap.js b/tests/versioned/v3/bedrock-ai21.tap.js
@@ -8,7 +8,8 @@
 const tap = require('tap')
 const utils = require('@newrelic/test-utilities')
 const common = require('../common')
-const { createAiResponseServer, FAKE_CREDENTIALS } = require('../aws-server-stubs')
+const createAiResponseServer = require('../aws-server-stubs/ai-server')
+const { FAKE_CREDENTIALS } = require('../aws-server-stubs')
 const bedrockPath = require.resolve('@aws-sdk/client-bedrock-runtime')
 
 tap.beforeEach(async (t) => {

diff --git a/tests/versioned/v3/bedrock-amazon.tap.js b/tests/versioned/v3/bedrock-amazon.tap.js
@@ -8,7 +8,8 @@
 const tap = require('tap')
 const utils = require('@newrelic/test-utilities')
 const common = require('../common')
-const { createAiResponseServer, FAKE_CREDENTIALS } = require('../aws-server-stubs')
+const createAiResponseServer = require('../aws-server-stubs/ai-server')
+const { FAKE_CREDENTIALS } = require('../aws-server-stubs')
 const bedrockPath = require.resolve('@aws-sdk/client-bedrock-runtime')
 
 tap.beforeEach(async (t) => {

diff --git a/tests/versioned/v3/bedrock-claude.tap.js b/tests/versioned/v3/bedrock-claude.tap.js
@@ -8,7 +8,8 @@
 const tap = require('tap')
 const utils = require('@newrelic/test-utilities')
 const common = require('../common')
-const { createAiResponseServer, FAKE_CREDENTIALS } = require('../aws-server-stubs')
+const createAiResponseServer = require('../aws-server-stubs/ai-server')
+const { FAKE_CREDENTIALS } = require('../aws-server-stubs')
 const bedrockPath = require.resolve('@aws-sdk/client-bedrock-runtime')
 
 tap.beforeEach(async (t) => {

diff --git a/tests/versioned/v3/bedrock-cohere.tap.js b/tests/versioned/v3/bedrock-cohere.tap.js
@@ -8,7 +8,8 @@
 const tap = require('tap')
 const utils = require('@newrelic/test-utilities')
 const common = require('../common')
-const { createAiResponseServer, FAKE_CREDENTIALS } = require('../aws-server-stubs')
+const createAiResponseServer = require('../aws-server-stubs/ai-server')
+const { FAKE_CREDENTIALS } = require('../aws-server-stubs')
 const bedrockPath = require.resolve('@aws-sdk/client-bedrock-runtime')
 
 tap.beforeEach(async (t) => {

diff --git a/tests/versioned/v3/package.json b/tests/versioned/v3/package.json
@@ -195,7 +195,9 @@
         "node": ">=16.0"
       },
       "dependencies": {
-        "@aws-sdk/client-bedrock-runtime": "^3.474.0"
+        "@aws-sdk/client-bedrock-runtime": "^3.474.0",
+        "@smithy/eventstream-codec": "^2.0.15",
+        "@smithy/util-utf8": "^2.0.2"
       },
       "files": [
         "bedrock-ai21.tap.js",

diff --git a/third_party_manifest.json b/third_party_manifest.json
@@ -1,59 +1,33 @@
 {
-  "lastUpdated": "Thu Dec 21 2023 15:43:56 GMT-0500 (Eastern Standard Time)",
+  "lastUpdated": "Fri Dec 22 2023 08:32:23 GMT-0500 (Eastern Standard Time)",
   "projectName": "New Relic AWS-SDK Instrumentation",
   "projectUrl": "https://github.com/newrelic/node-newrelic-aws-sdk",
   "includeOptDeps": false,
   "includeDev": true,
   "dependencies": {},
   "devDependencies": {
-    "@aws-sdk/client-s3@3.400.0": {
+    "@aws-sdk/client-s3@3.478.0": {
       "name": "@aws-sdk/client-s3",
-      "version": "3.400.0",
+      "version": "3.478.0",
       "range": "^3.342.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/aws/aws-sdk-js-v3",
-      "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.400.0",
+      "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.478.0",
       "licenseFile": "node_modules/@aws-sdk/client-s3/LICENSE",
-      "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.400.0/LICENSE",
+      "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.478.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "AWS SDK for JavaScript Team",
       "url": "https://aws.amazon.com/javascript/"
     },
-    "@aws-sdk/eventstream-codec@3.342.0": {
-      "name": "@aws-sdk/eventstream-codec",
-      "version": "3.342.0",
-      "range": "^3.374.0",
-      "licenses": "Apache-2.0",
-      "repoUrl": "https://github.com/aws/aws-sdk-js-v3",
-      "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.342.0",
-      "licenseFile": "node_modules/@aws-sdk/eventstream-codec/LICENSE",
-      "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.342.0/LICENSE",
-      "licenseTextSource": "file",
-      "publisher": "AWS SDK for JavaScript Team",
-      "url": "https://aws.amazon.com/javascript/"
-    },
-    "@aws-sdk/s3-request-presigner@3.342.0": {
+    "@aws-sdk/s3-request-presigner@3.478.0": {
       "name": "@aws-sdk/s3-request-presigner",
-      "version": "3.342.0",
+      "version": "3.478.0",
       "range": "^3.342.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/aws/aws-sdk-js-v3",
-      "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.342.0",
+      "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.478.0",
       "licenseFile": "node_modules/@aws-sdk/s3-request-presigner/LICENSE",
-      "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.342.0/LICENSE",
-      "licenseTextSource": "file",
-      "publisher": "AWS SDK for JavaScript Team",
-      "url": "https://aws.amazon.com/javascript/"
-    },
-    "@aws-sdk/util-utf8@3.310.0": {
-      "name": "@aws-sdk/util-utf8",
-      "version": "3.310.0",
-      "range": "^3.374.0",
-      "licenses": "Apache-2.0",
-      "repoUrl": "https://github.com/aws/aws-sdk-js-v3",
-      "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.310.0",
-      "licenseFile": "node_modules/@aws-sdk/util-utf8/LICENSE",
-      "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.310.0/LICENSE",
+      "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.478.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "AWS SDK for JavaScript Team",
       "url": "https://aws.amazon.com/javascript/"
@@ -96,41 +70,41 @@
       "publisher": "New Relic Node.js agent team",
       "email": "nodejs@newrelic.com"
     },
-    "aws-sdk@2.1372.0": {
+    "aws-sdk@2.1524.0": {
       "name": "aws-sdk",
-      "version": "2.1372.0",
+      "version": "2.1524.0",
       "range": "^2.1372.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/aws/aws-sdk-js",
-      "versionedRepoUrl": "https://github.com/aws/aws-sdk-js/tree/v2.1372.0",
+      "versionedRepoUrl": "https://github.com/aws/aws-sdk-js/tree/v2.1524.0",
       "licenseFile": "node_modules/aws-sdk/LICENSE.txt",
-      "licenseUrl": "https://github.com/aws/aws-sdk-js/blob/v2.1372.0/LICENSE.txt",
+      "licenseUrl": "https://github.com/aws/aws-sdk-js/blob/v2.1524.0/LICENSE.txt",
       "licenseTextSource": "file",
       "publisher": "Amazon Web Services",
       "url": "https://aws.amazon.com/"
     },
-    "c8@7.12.0": {
+    "c8@7.14.0": {
       "name": "c8",
-      "version": "7.12.0",
+      "version": "7.14.0",
       "range": "^7.12.0",
       "licenses": "ISC",
       "repoUrl": "https://github.com/bcoe/c8",
-      "versionedRepoUrl": "https://github.com/bcoe/c8/tree/v7.12.0",
+      "versionedRepoUrl": "https://github.com/bcoe/c8/tree/v7.14.0",
       "licenseFile": "node_modules/c8/LICENSE.txt",
-      "licenseUrl": "https://github.com/bcoe/c8/blob/v7.12.0/LICENSE.txt",
+      "licenseUrl": "https://github.com/bcoe/c8/blob/v7.14.0/LICENSE.txt",
       "licenseTextSource": "file",
       "publisher": "Ben Coe",
       "email": "ben@npmjs.com"
     },
-    "eslint-config-prettier@8.5.0": {
+    "eslint-config-prettier@8.10.0": {
       "name": "eslint-config-prettier",
-      "version": "8.5.0",
+      "version": "8.10.0",
       "range": "^8.3.0",
       "licenses": "MIT",
       "repoUrl": "https://github.com/prettier/eslint-config-prettier",
-      "versionedRepoUrl": "https://github.com/prettier/eslint-config-prettier/tree/v8.5.0",
+      "versionedRepoUrl": "https://github.com/prettier/eslint-config-prettier/tree/v8.10.0",
       "licenseFile": "node_modules/eslint-config-prettier/LICENSE",
-      "licenseUrl": "https://github.com/prettier/eslint-config-prettier/blob/v8.5.0/LICENSE",
+      "licenseUrl": "https://github.com/prettier/eslint-config-prettier/blob/v8.10.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Simon Lydell"
     },
@@ -209,42 +183,42 @@
       "publisher": "Andrey Okonetchnikov",
       "email": "andrey@okonet.ru"
     },
-    "lockfile-lint@4.9.6": {
+    "lockfile-lint@4.12.1": {
       "name": "lockfile-lint",
-      "version": "4.9.6",
+      "version": "4.12.1",
       "range": "^4.9.6",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/lirantal/lockfile-lint",
-      "versionedRepoUrl": "https://github.com/lirantal/lockfile-lint/tree/v4.9.6",
+      "versionedRepoUrl": "https://github.com/lirantal/lockfile-lint/tree/v4.12.1",
       "licenseFile": "node_modules/lockfile-lint/LICENSE",
-      "licenseUrl": "https://github.com/lirantal/lockfile-lint/blob/v4.9.6/LICENSE",
+      "licenseUrl": "https://github.com/lirantal/lockfile-lint/blob/v4.12.1/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Liran Tal",
       "email": "liran.tal@gmail.com",
       "url": "https://github.com/lirantal"
     },
-    "newrelic@11.0.0": {
+    "newrelic@11.7.0": {
       "name": "newrelic",
-      "version": "11.0.0",
+      "version": "11.7.0",
       "range": "^11.0.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/newrelic/node-newrelic",
-      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic/tree/v11.0.0",
+      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic/tree/v11.7.0",
       "licenseFile": "node_modules/newrelic/LICENSE",
-      "licenseUrl": "https://github.com/newrelic/node-newrelic/blob/v11.0.0/LICENSE",
+      "licenseUrl": "https://github.com/newrelic/node-newrelic/blob/v11.7.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "New Relic Node.js agent team",
       "email": "nodejs@newrelic.com"
     },
-    "prettier@2.8.1": {
+    "prettier@2.8.8": {
       "name": "prettier",
-      "version": "2.8.1",
+      "version": "2.8.8",
       "range": "^2.3.2",
       "licenses": "MIT",
       "repoUrl": "https://github.com/prettier/prettier",
-      "versionedRepoUrl": "https://github.com/prettier/prettier/tree/v2.8.1",
+      "versionedRepoUrl": "https://github.com/prettier/prettier/tree/v2.8.8",
       "licenseFile": "node_modules/prettier/LICENSE",
-      "licenseUrl": "https://github.com/prettier/prettier/blob/v2.8.1/LICENSE",
+      "licenseUrl": "https://github.com/prettier/prettier/blob/v2.8.8/LICENSE",
       "licenseTextSource": "file",
       "publisher": "James Long"
     },
@@ -260,15 +234,15 @@
       "licenseTextSource": "file",
       "publisher": "Christian Johansen"
     },
-    "tap@16.3.2": {
+    "tap@16.3.10": {
       "name": "tap",
-      "version": "16.3.2",
+      "version": "16.3.10",
       "range": "^16.0.1",
       "licenses": "ISC",
       "repoUrl": "https://github.com/tapjs/node-tap",
-      "versionedRepoUrl": "https://github.com/tapjs/node-tap/tree/v16.3.2",
+      "versionedRepoUrl": "https://github.com/tapjs/node-tap/tree/v16.3.10",
       "licenseFile": "node_modules/tap/LICENSE",
-      "licenseUrl": "https://github.com/tapjs/node-tap/blob/v16.3.2/LICENSE",
+      "licenseUrl": "https://github.com/tapjs/node-tap/blob/v16.3.10/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Isaac Z. Schlueter",
       "email": "i@izs.me",