From 147d7e8b02015d471b6d2a62b2d5e5bedbd8d271 Mon Sep 17 00:00:00 2001 From: stas-fomenko <36419533+stas-fomenko@users.noreply.github.com> Date: Fri, 8 Jan 2021 13:53:47 +0200 Subject: [PATCH 1/7] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6ab804..2c4a671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -## 1.1.7 (November 6, 2020) -* Update sailor version to 2.6.18 +## 1.1.7 (January 15, 2021) +* Update sailor version to 2.6.23 ## 1.1.6 (October 20, 2020) * Update sailor version to 2.6.17 From 7854a6ada3e97ab30a2fcba020b62ddc6d05551b Mon Sep 17 00:00:00 2001 From: stas-fomenko Date: Fri, 8 Jan 2021 14:03:26 +0200 Subject: [PATCH 2/7] sailor 2623 --- .circleci/config.yml | 8 +++- package-lock.json | 89 +++++++++++++++++++++++++++++++++----------- package.json | 2 +- 3 files changed, 75 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df4bbe0..bfb6607 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,13 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-dependencies- - - run: npm install + - run: + name: Installing Dependencies + command: npm install + + - run: + name: Audit Dependencies + command: npm audit --audit-level=critical - save_cache: paths: diff --git a/package-lock.json b/package-lock.json index 7ff780f..22acf1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -323,14 +323,23 @@ } }, "amqplib": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.1.tgz", - "integrity": "sha1-fMz+ur5WwumE6noiQ/fO/m+/xs8=", - "requires": { - "bitsyntax": "~0.0.4", - "bluebird": "^3.4.6", - "buffer-more-ints": "0.0.2", - "readable-stream": "1.x >=1.1.9" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.6.0.tgz", + "integrity": "sha512-zXCh4jQ77TBZe1YtvZ1n7sUxnTjnNagpy8MVi2yc1ive239pS3iLwm4e4d5o4XZGx1BdTKQ/U0ZmaDU3c8MxYQ==", + "requires": { + "bitsyntax": "~0.1.0", + "bluebird": "^3.5.2", + "buffer-more-ints": "~1.0.0", + "readable-stream": "1.x >=1.1.9", + "safe-buffer": "~5.1.2", + "url-parse": "~1.4.3" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "ansi-colors": { @@ -484,11 +493,28 @@ "dev": true }, "bitsyntax": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz", - "integrity": "sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz", + "integrity": "sha512-ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q==", "requires": { - "buffer-more-ints": "0.0.2" + "buffer-more-ints": "~1.0.0", + "debug": "~2.6.9", + "safe-buffer": "~5.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "bluebird": { @@ -526,9 +552,9 @@ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, "buffer-more-ints": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz", - "integrity": "sha1-JrOIXRD6E9t/wBquOquHAZngEkw=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz", + "integrity": "sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==" }, "bunyan": { "version": "1.8.12", @@ -943,12 +969,12 @@ } }, "elasticio-sailor-nodejs": { - "version": "2.6.18", - "resolved": "https://registry.npmjs.org/elasticio-sailor-nodejs/-/elasticio-sailor-nodejs-2.6.18.tgz", - "integrity": "sha512-ZtGI3p/jzmpRz4A9GWhj6yocXRJq4ixz2j4a898XKVUynJxL68tAeqWdcui3UxD6O9gvTDOdxkrVg289UxjZkw==", + "version": "2.6.23", + "resolved": "https://registry.npmjs.org/elasticio-sailor-nodejs/-/elasticio-sailor-nodejs-2.6.23.tgz", + "integrity": "sha512-plraqzOuakl5tHhKop4zgzsrLdNV0xWNrP/dpCMdI4GoWp5s8URHHpJN+MoyiI/cCwbWYO9ICeHTEnRhcDoplA==", "requires": { "@elastic.io/object-storage-client": "0.0.2-dev", - "amqplib": "0.5.1", + "amqplib": "0.6.0", "bunyan": "1.8.10", "co": "4.6.0", "debug": "3.1.0", @@ -1952,9 +1978,9 @@ }, "dependencies": { "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "semver": { "version": "5.7.1", @@ -2610,6 +2636,11 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -2750,6 +2781,11 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + }, "resolve": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", @@ -3126,6 +3162,15 @@ "punycode": "^2.1.0" } }, + "url-parse": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", + "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "uuid": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", diff --git a/package.json b/package.json index c6a96e4..8fd591f 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "@elastic.io/component-commons-library": "1.1.4", "elasticio-node": "0.0.9", - "elasticio-sailor-nodejs": "2.6.18", + "elasticio-sailor-nodejs": "2.6.23", "lodash": "4.17.19" }, "devDependencies": { From bfcb3cfdba313bf83172f5186057d621f2d890fe Mon Sep 17 00:00:00 2001 From: stas-fomenko Date: Fri, 8 Jan 2021 14:12:57 +0200 Subject: [PATCH 3/7] minor upd --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c4a671..59a02a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,27 +31,22 @@ * Fixed bug when emitting to much data ## 1.0.4 (February 03, 2020) - * Fixed bug with incorrect await while emitting data ## 1.0.3 (December 24, 2019) - * Update sailor version to 2.5.4 * New Sailor logger * Improved few logs ## 1.0.2 (September 18, 2019) - * Initial release * Add "Split on JSONata Expression" action * Deprecate "Split Message By Array" action * Format repository according to Airbnb styling ## 1.0.1 (December 07, 2019) - * Update sailor version to 2.5.1 * Change build type to docker ## 1.0.0 (March 24, 2017) - * Initial release From b126c25c4b373f590a6ca03388f72d7df6987ad9 Mon Sep 17 00:00:00 2001 From: stas-fomenko Date: Fri, 8 Jan 2021 14:14:47 +0200 Subject: [PATCH 4/7] upd --- CHANGELOG.md | 5 ++++- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59a02a0..6191be3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ -## 1.1.7 (January 15, 2021) +## 1.1.8 (January 15, 2021) * Update sailor version to 2.6.23 +## 1.1.7 (November 6, 2020) +* Update sailor version to 2.6.18 + ## 1.1.6 (October 20, 2020) * Update sailor version to 2.6.17 diff --git a/package-lock.json b/package-lock.json index 22acf1f..0e62433 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@elasticio/splitter", - "version": "1.1.7", + "version": "1.1.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8fd591f..3e42fa2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@elasticio/splitter", - "version": "1.1.7", + "version": "1.1.8", "description": "elastic.io component for splitting incoming messages", "scripts": { "pretest": "eslint split.js lib spec --fix", From 16694a9c53596fcef4c8f30ab252a294a3297100 Mon Sep 17 00:00:00 2001 From: stas-fomenko Date: Fri, 8 Jan 2021 14:17:04 +0200 Subject: [PATCH 5/7] upd2 --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bfb6607..a4abe48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,9 +26,7 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-dependencies- - - run: - name: Installing Dependencies - command: npm install + - run: npm install - run: name: Audit Dependencies From d39a63ab25e43bcf96968a8b856ac140b5e7b794 Mon Sep 17 00:00:00 2001 From: stas-fomenko Date: Fri, 8 Jan 2021 14:18:52 +0200 Subject: [PATCH 6/7] upd3 --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a4abe48..69b559b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,9 +28,7 @@ jobs: - run: npm install - - run: - name: Audit Dependencies - command: npm audit --audit-level=critical + - run: npm audit --audit-level=high - save_cache: paths: From 2c11a79ed45ccd2e2757a864ed7b296b77578d07 Mon Sep 17 00:00:00 2001 From: stas-fomenko Date: Fri, 8 Jan 2021 14:21:01 +0200 Subject: [PATCH 7/7] upd circle --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69b559b..df4bbe0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,8 +28,6 @@ jobs: - run: npm install - - run: npm audit --audit-level=high - - save_cache: paths: - node_modules