From b4943cdcbf9b993203cd8d9385e3db2f2a0aea03 Mon Sep 17 00:00:00 2001
From: Suhail-n <20075736+suhail-n@users.noreply.github.com>
Date: Sun, 20 Mar 2022 14:45:54 -0400
Subject: [PATCH] =?UTF-8?q?chore:=20:lock:=20amqplib=20will=20use=20the=20?=
 =?UTF-8?q?security=20patched=20version=20of=20urlpar=E2=80=A6=20(#675)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test.yml | 39 +++++++++++++++++++-------------------
 package-lock.json          | 14 +++++++-------
 package.json               |  5 ++---
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3e02c0b7..717d5bb3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,14 +5,18 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    services:
+      rabbitmq:
+        image: rabbitmq
+        ports:
+          - 5672:5672
 
     strategy:
       matrix:
@@ -20,20 +24,15 @@ jobs:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-
-    # Install all prerequisites
-    - run: npm ci
-
-    # Need RabbitMQ to test against
-    - name: Install rabbitmq
-      run: |
-        sudo apt-get install rabbitmq-server -y --fix-missing
-
-    # Run the tests
-    - run: make test
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "npm"
+
+      # Install all prerequisites
+      - run: npm ci
+
+      # Run the tests
+      - run: make test
diff --git a/package-lock.json b/package-lock.json
index 480a870f..ecf991ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "bluebird": "^3.7.2",
         "buffer-more-ints": "~1.0.0",
         "readable-stream": "1.x >=1.1.9",
-        "url-parse": "~1.5.3"
+        "url-parse": "~1.5.10"
       },
       "devDependencies": {
         "claire": "0.4.1",
@@ -731,9 +731,9 @@
       "optional": true
     },
     "node_modules/url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -1280,9 +1280,9 @@
       "optional": true
     },
     "url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
diff --git a/package.json b/package.json
index 92607b54..41d517b9 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,3 @@
-
 {
   "name": "amqplib",
   "homepage": "http://squaremo.github.io/amqp.node/",
@@ -17,7 +16,7 @@
     "bluebird": "^3.7.2",
     "buffer-more-ints": "~1.0.0",
     "readable-stream": "1.x >=1.1.9",
-    "url-parse": "~1.5.3"
+    "url-parse": "~1.5.10"
   },
   "devDependencies": {
     "claire": "0.4.1",
@@ -36,4 +35,4 @@
   ],
   "author": "Michael Bridgen <mikeb@squaremobius.net>",
   "license": "MIT"
-}
+}
\ No newline at end of file