Merge pull request newrelic#188 from bizob2828/fix-v2

fix: Updated the mock AWS server to handle both XML and JSON.

merged/aws-sdk/.eslintrc.js

@@ -1,4 +1,8 @@
 'use strict'
 module.exports = {
-  extends: '@newrelic'
+  extends: '@newrelic',
+  parserOptions: {
+    ecmaVersion: '2020'
+  },
+
 }

merged/aws-sdk/THIRD_PARTY_NOTICES.md

@@ -1089,7 +1089,7 @@ This product includes source derived from [@newrelic/test-utilities](https://git
 
 ### aws-sdk
 
-This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1354.0](https://github.com/aws/aws-sdk-js/tree/v2.1354.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1354.0/LICENSE.txt):
+This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1372.0](https://github.com/aws/aws-sdk-js/tree/v2.1372.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1372.0/LICENSE.txt):
 
 ```
 

merged/aws-sdk/lib/v2/core.js

@@ -46,7 +46,7 @@ function wrapMakeRequest(shim, fn, name, request) {
   }
 
   const service = getServiceName(this)
-  const region = this.config && this.config.region
+  const region = this?.config?.region
   request.on('complete', function onAwsRequestComplete() {
     const httpRequest = request.httpRequest && request.httpRequest.stream
     const segment = shim.getSegment(httpRequest)
@@ -55,8 +55,8 @@ function wrapMakeRequest(shim, fn, name, request) {
       return
     }
 
-    const requestRegion = request.httpRequest.region
-    const requestId = request.response && request.response.requestId
+    const requestRegion = request?.httpRequest?.region
+    const requestId = request?.response?.requestId
 
     segment.addAttribute('aws.operation', request.operation || UNKNOWN)
     segment.addAttribute('aws.requestId', requestId || UNKNOWN)

merged/aws-sdk/package.json

@@ -32,7 +32,7 @@
     "@newrelic/eslint-config": "^0.0.2",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/test-utilities": "^7.3.0",
-    "aws-sdk": "^2.403.0",
+    "aws-sdk": "^2.1372.0",
     "c8": "^7.12.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",

merged/aws-sdk/tests/versioned/aws-server-stubs/response-server/common.js

@@ -8,16 +8,22 @@ const common = module.exports
 const path = require('path')
 const fs = require('fs')
 
-common.parseBody = function parseBody(body) {
-  const parsed = Object.create(null)
+common.parseBody = function parseBody(body, headers) {
+  try {
+    const parsed = JSON.parse(body)
+    parsed.Action = headers['x-amz-target'].split('.')[1]
+    return parsed
+  } catch {
+    const parsed = Object.create(null)
 
-  const items = body.split('&')
-  items.forEach((item) => {
-    const [key, value] = item.split('=')
-    parsed[key] = value
-  })
+    const items = body.split('&')
+    items.forEach((item) => {
+      const [key, value] = item.split('=')
+      parsed[key] = value
+    })
 
-  return parsed
+    return parsed
+  }
 }
 
 common.readFromXml = function readFromXml(filePath, callback) {

merged/aws-sdk/tests/versioned/aws-server-stubs/response-server/index.js

@@ -43,10 +43,11 @@ function handlePost(req, res) {
   })
 
   req.on('end', () => {
+    const isJson = !!req.headers['x-amz-target']
     const endpoint = `http://localhost:${req.connection.localPort}`
-    const parsed = parseBody(body)
+    const parsed = parseBody(body, req.headers)
 
-    const getDataFunction = createGetDataFromAction(endpoint, parsed)
+    const getDataFunction = createGetDataFromAction(endpoint, parsed, isJson)
 
     getDataFunction((err, data) => {
       if (err) {
@@ -55,25 +56,29 @@ function handlePost(req, res) {
         console.log(err)
       }
 
+      if (isJson) {
+        res.setHeader('x-amz-request-id', data.ResponseMetadata.RequestId)
+        data = JSON.stringify(data)
+      }
       res.end(data)
     })
   })
 }
 
-function createGetDataFromAction(endpoint, body) {
+function createGetDataFromAction(endpoint, body, isJson) {
   switch (body.Action) {
     case 'Publish':
       return getPublishResponse.bind(null)
     case 'ListTopics':
       return getListTopicsResponse.bind(null)
     case 'CreateQueue':
-      return getCreateQueueResponse.bind(null, endpoint, body.QueueName)
+      return getCreateQueueResponse.bind(null, endpoint, body.QueueName, isJson)
     case 'SendMessage':
-      return getSendMessageResponse.bind(null)
+      return getSendMessageResponse.bind(null, isJson)
     case 'SendMessageBatch':
-      return getSendMessageBatchResponse.bind(null)
+      return getSendMessageBatchResponse.bind(null, isJson)
     case 'ReceiveMessage':
-      return getReceiveMessageResponse.bind(null)
+      return getReceiveMessageResponse.bind(null, isJson)
     case 'SendEmail':
       return getSendEmailResponse.bind(null)
     case 'AcceptReservedNodeExchange':

merged/aws-sdk/tests/versioned/aws-server-stubs/response-server/sqs/index.js

@@ -5,97 +5,36 @@
 
 'use strict'
 const helpers = module.exports
-const { readFromXml } = require('../common')
 
-let createQueueResponse = null
-helpers.getCreateQueueResponse = function getCreateQueueResponse(endpoint, queueName, callback) {
-  if (createQueueResponse) {
-    const modifiedResponse = replaceQueueUrl(createQueueResponse, endpoint, queueName)
-
-    setImmediate(() => {
-      callback(null, modifiedResponse)
-    })
-    return
-  }
-
-  readFromXml('./sqs/responses/create-queue-response.xml', (err, data) => {
-    if (err) {
-      callback(err)
-      return
-    }
-
-    createQueueResponse = data
-    const modifiedResponse = replaceQueueUrl(createQueueResponse, endpoint, queueName)
-
-    callback(null, modifiedResponse)
-  })
-}
-
-function replaceQueueUrl(xml, endpoint, queueName) {
-  const modifiedResponse = xml.replace(
-    '<QueueUrl></QueueUrl>',
-    `<QueueUrl>${endpoint}/queue/${queueName}</QueueUrl>`
+helpers.getCreateQueueResponse = function getCreateQueueResponse(
+  endpoint,
+  queueName,
+  isJson,
+  callback
+) {
+  const createQueueResponse = require('./responses/create-queue-response')(
+    endpoint,
+    queueName,
+    isJson
   )
-
-  return modifiedResponse
+  callback(null, createQueueResponse)
 }
 
-let sendMessageResponse = null
-helpers.getSendMessageResponse = function getSendMessageResponse(callback) {
-  if (sendMessageResponse) {
-    setImmediate(() => {
-      callback(null, sendMessageResponse)
-    })
-    return
-  }
-
-  readFromXml('./sqs/responses/send-message-response.xml', (err, data) => {
-    if (err) {
-      callback(err)
-      return
-    }
-
-    sendMessageResponse = data
-    callback(null, sendMessageResponse)
-  })
+helpers.formatUrl = function formatUrl(endpoint, queueName) {
+  return `${endpoint}/queue/${queueName}`
 }
 
-let sendMessageBatchResponse = null
-helpers.getSendMessageBatchResponse = function getSendMessageBatchResponse(callback) {
-  if (sendMessageBatchResponse) {
-    setImmediate(() => {
-      callback(null, sendMessageBatchResponse)
-    })
-    return
-  }
-
-  readFromXml('./sqs/responses/send-message-batch-response.xml', (err, data) => {
-    if (err) {
-      callback(err)
-      return
-    }
-
-    sendMessageBatchResponse = data
-    callback(null, sendMessageBatchResponse)
-  })
+helpers.getSendMessageResponse = function getSendMessageResponse(isJson, callback) {
+  const sendMessageResponse = require('./responses/send-message-response')(isJson)
+  callback(null, sendMessageResponse)
 }
 
-let receiveMessageResponse = null
-helpers.getReceiveMessageResponse = function getReceiveMessageResponse(callback) {
-  if (receiveMessageResponse) {
-    setImmediate(() => {
-      callback(null, receiveMessageResponse)
-    })
-    return
-  }
-
-  readFromXml('./sqs/responses/receive-message-response.xml', (err, data) => {
-    if (err) {
-      callback(err)
-      return
-    }
+helpers.getSendMessageBatchResponse = function getSendMessageBatchResponse(isJson, callback) {
+  const sendMessageBatchResponse = require('./responses/send-message-batch-response')(isJson)
+  callback(null, sendMessageBatchResponse)
+}
 
-    receiveMessageResponse = data
-    callback(null, receiveMessageResponse)
-  })
+helpers.getReceiveMessageResponse = function getReceiveMessageResponse(isJson, callback) {
+  const receiveMessageResponse = require('./responses/receive-message-response')(isJson)
+  callback(null, receiveMessageResponse)
 }

merged/aws-sdk/tests/versioned/aws-server-stubs/response-server/sqs/responses/create-queue-response.js

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2023 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const { formatUrl } = require('../index')
+
+module.exports = (endpoint, queueName, isJson) => {
+  if (isJson) {
+    return {
+      QueueUrl: formatUrl(endpoint, queueName),
+      ResponseMetadata: {
+        RequestId: 'cb919c0a-9bce-4afe-9b48-9bdf2412bb67'
+      }
+    }
+  }
+  return `
+<CreateQueueResponse>
+  <CreateQueueResult>
+      <QueueUrl>${formatUrl(endpoint, queueName)}</QueueUrl>
+  </CreateQueueResult>
+  <ResponseMetadata>
+      <RequestId>cb919c0a-9bce-4afe-9b48-9bdf2412bb67</RequestId>
+  </ResponseMetadata>
+</CreateQueueResponse>`
+}

merged/aws-sdk/tests/versioned/aws-server-stubs/response-server/sqs/responses/receive-message-response.xml → merged/aws-sdk/tests/versioned/aws-server-stubs/response-server/sqs/responses/receive-message-response.js

@@ -1,3 +1,34 @@
+/*
+ * Copyright 2023 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+module.exports = (isJson) => {
+  if (isJson) {
+    return {
+      Messages: [
+        {
+          MessageId: '5fea7756-0ea4-451a-a703-a558b933e274',
+          ReceiptHandle:
+            'MbZj6wDWliJvwwJaBV3dcjk2YW2vA3STFFljTM8tJJg6HRG6PYSasuWXPJBCwLj1FjgXUv1uSj1gUPAWV66FU/WeR4mq2OKpEGYWbnLmpRCJVAyeMjeU5ZBdtcQQEauMZc8ZRv37sIW2iJKq3M9MFx1YvV11A2x/KSbkJ0=',
+          MD5OfBody: 'fafb00f5732ab283681e124bf8747ed1',
+          Body: 'This is a test message',
+          Attributes: {
+            SenderId: '195004372649',
+            SentTimestamp: '1238099229000',
+            ApproximateReceiveCount: '2',
+            ApproximateFirstReceiveTimestamp: '1595887234772'
+          }
+        }
+      ],
+      ResponseMetadata: {
+        RequestId: 'b6633655-283d-45b4-aee4-4e84e0ae6afa'
+      }
+    }
+  }
+  return `
 <ReceiveMessageResponse>
   <ReceiveMessageResult>
     <Message>
@@ -30,4 +61,5 @@
   <ResponseMetadata>
     <RequestId>b6633655-283d-45b4-aee4-4e84e0ae6afa</RequestId>
   </ResponseMetadata>
-</ReceiveMessageResponse>
+</ReceiveMessageResponse>`
+}