From 52d81bc1fff0b1d7c3d7665b2ef453e77a4996de Mon Sep 17 00:00:00 2001 From: Isomer Admin <60170571+isomeradmin@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:40:59 +0800 Subject: [PATCH 1/7] fix: package.json & package-lock.json to reduce vulnerabilities (#1414) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-WS-7266574 Co-authored-by: snyk-bot --- package-lock.json | 261 ++++++++++++++++++++++++++++++++++++++-------- package.json | 2 +- 2 files changed, 220 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0b754690..cc4191857 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "isomorphic-git": "^1.25.10", "joi": "^17.13.1", "js-base64": "^3.7.7", - "jsdom": "^16.7.0", + "jsdom": "^17.0.0", "jsonwebtoken": "^9.0.0", "lodash": "^4.17.21", "marked": "^12.0.2", @@ -6591,7 +6591,8 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", - "deprecated": "Use your platform's native atob() and btoa() methods instead" + "deprecated": "Use your platform's native atob() and btoa() methods instead", + "license": "BSD-3-Clause" }, "node_modules/abbrev": { "version": "1.1.1", @@ -9200,9 +9201,10 @@ "integrity": "sha512-/RC5F4l1SCqD/jazwUF6+t34Cd8zTSAGZ7rvvZu1whZUhD2a5MOGKjSGowoGcpj/cbVZk1ZODIooJEQQq3nNAA==" }, "node_modules/cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", + "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", + "license": "MIT" }, "node_modules/cssstyle": { "version": "2.3.0", @@ -9312,16 +9314,60 @@ } }, "node_modules/data-urls": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", - "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", + "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", + "license": "MIT", "dependencies": { - "abab": "^2.0.3", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0" + "abab": "^2.0.6", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0" }, "engines": { - "node": ">=10" + "node": ">=12" + } + }, + "node_modules/data-urls/node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "license": "MIT", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/data-urls/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + } + }, + "node_modules/data-urls/node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "license": "MIT", + "engines": { + "node": ">=12" + } + }, + "node_modules/data-urls/node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "license": "MIT", + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" } }, "node_modules/data-view-buffer": { @@ -13348,6 +13394,125 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-environment-jsdom/node_modules/acorn": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", + "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/jest-environment-jsdom/node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-environment-jsdom/node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-environment-jsdom/node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-environment-jsdom/node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dev": true, + "license": "MIT", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jest-environment-jsdom/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/jest-environment-jsdom/node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/jest-environment-node": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz", @@ -15124,20 +15289,21 @@ } }, "node_modules/jsdom": { - "version": "16.7.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", - "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-17.0.0.tgz", + "integrity": "sha512-MUq4XdqwtNurZDVeKScENMPHnkgmdIvMzZ1r1NSwHkDuaqI6BouPjr+17COo4/19oLNnmdpFDPOHVpgIZmZ+VA==", + "license": "MIT", "dependencies": { "abab": "^2.0.5", - "acorn": "^8.2.4", + "acorn": "^8.4.1", "acorn-globals": "^6.0.0", - "cssom": "^0.4.4", + "cssom": "^0.5.0", "cssstyle": "^2.3.0", - "data-urls": "^2.0.0", - "decimal.js": "^10.2.1", + "data-urls": "^3.0.0", + "decimal.js": "^10.3.1", "domexception": "^2.0.1", "escodegen": "^2.0.0", - "form-data": "^3.0.0", + "form-data": "^4.0.0", "html-encoding-sniffer": "^2.0.1", "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", @@ -15152,12 +15318,12 @@ "webidl-conversions": "^6.1.0", "whatwg-encoding": "^1.0.5", "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.5.0", - "ws": "^7.4.6", + "whatwg-url": "^9.0.0", + "ws": "^8.0.0", "xml-name-validator": "^3.0.0" }, "engines": { - "node": ">=10" + "node": ">=12" }, "peerDependencies": { "canvas": "^2.5.0" @@ -15179,24 +15345,32 @@ "node": ">=0.4.0" } }, - "node_modules/jsdom/node_modules/form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/jsdom/node_modules/parse5": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" }, + "node_modules/jsdom/node_modules/ws": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -19789,6 +19963,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "license": "MIT", "dependencies": { "punycode": "^2.1.1" }, @@ -20594,6 +20769,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "license": "BSD-2-Clause", "engines": { "node": ">=10.4" } @@ -20609,19 +20785,20 @@ "node_modules/whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", - "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "license": "MIT" }, "node_modules/whatwg-url": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", - "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-9.1.0.tgz", + "integrity": "sha512-CQ0UcrPHyomtlOCot1TL77WyMIm/bCwrJ2D6AOKGwEczU9EpyoqAokfqrf/MioU9kHcMsmJZcg1egXix2KYEsA==", + "license": "MIT", "dependencies": { - "lodash": "^4.7.0", "tr46": "^2.1.0", "webidl-conversions": "^6.1.0" }, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/which": { diff --git a/package.json b/package.json index 58648b9b8..e94e27499 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "isomorphic-git": "^1.25.10", "joi": "^17.13.1", "js-base64": "^3.7.7", - "jsdom": "^16.7.0", + "jsdom": "^17.0.0", "jsonwebtoken": "^9.0.0", "lodash": "^4.17.21", "marked": "^12.0.2", From b37c3db213a26e4470083fd547b74cd3b9c8aad0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 07:46:47 +0000 Subject: [PATCH 2/7] chore(deps): bump braces from 3.0.2 to 3.0.3 (#1413) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index cc4191857..c24445a96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7409,11 +7409,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -11114,9 +11114,9 @@ "devOptional": true }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, From e2a085873027c3a50b2318f3405530ac1f8b7b6c Mon Sep 17 00:00:00 2001 From: Harish Date: Wed, 26 Jun 2024 16:45:04 +0800 Subject: [PATCH 3/7] chore: update slack-bolt (#1415) Co-authored-by: Alexander Lee --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c24445a96..d8dcd7f06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@octokit/rest": "^18.12.0", "@opengovsg/formsg-sdk": "^0.11.0", "@opengovsg/sgid-client": "^2.0.0", - "@slack/bolt": "^3.18.0", + "@slack/bolt": "^3.19.0", "auto-bind": "^4.0.0", "aws-lambda": "^1.0.7", "aws-sdk": "^2.1619.0", @@ -5028,9 +5028,9 @@ } }, "node_modules/@slack/bolt": { - "version": "3.18.0", - "resolved": "https://registry.npmjs.org/@slack/bolt/-/bolt-3.18.0.tgz", - "integrity": "sha512-A7bDi5kY50fS6/nsmURkQdO3iMxD8aX/rA+m1UXEM2ue2z4KijeQtx2sOZ4YkJQ/h7BsgTQM0CYh3qqmo+m5sQ==", + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/@slack/bolt/-/bolt-3.19.0.tgz", + "integrity": "sha512-P5Yup/PbO8sE5xsuqkBkpSPkxEkfWZ6yo5ZlmBGxRhhoU1usUSU2w0bgZoiDX4WFm7ZX+3x2Dyf4VMa9kzfmVQ==", "dependencies": { "@slack/logger": "^4.0.0", "@slack/oauth": "^2.6.2", diff --git a/package.json b/package.json index e94e27499..c655eae21 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@octokit/rest": "^18.12.0", "@opengovsg/formsg-sdk": "^0.11.0", "@opengovsg/sgid-client": "^2.0.0", - "@slack/bolt": "^3.18.0", + "@slack/bolt": "^3.19.0", "auto-bind": "^4.0.0", "aws-lambda": "^1.0.7", "aws-sdk": "^2.1619.0", From 8c47822f4fd33dd32c2c17ff515b3a0bda16b504 Mon Sep 17 00:00:00 2001 From: Kishore <42832651+kishore03109@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:08:52 +0800 Subject: [PATCH 4/7] feat(monitoring): add dns reporter (#1376) ## Problem This is a first pr that is up to add some level of sane reporting. While scheduling is part of this feature, it is not within the scope of this pr. This pr only adds (currently dead code) logic to grab the domains that we own in isomer, and do a dns dig. This is meant to be verbose, and in the future alarms can be added based on the results of this. This is not meant to replace monitoring, it is just meant to fine tune some blind spots that uptime robot currently has + some sane checker during incident response to show history of dns records for a site that we manage. I am opting to log it directly in our backend to keep things simple. will add alarms + the scheduler in subsequent prs. ## Solution grab ALL domains from keycdn + amplify + redirection records + log dns records on them. **Breaking Changes** - [ ] Yes - this PR contains breaking changes - Details ... - [X] No - this PR is backwards compatible with ALL of the following feature flags in this [doc](https://www.notion.so/opengov/Existing-feature-flags-518ad2cdc325420893a105e88c432be5) ## Tests in server.ts add: `monitoringService.driver()` should see this in the logs: ![Screenshot 2024-05-15 at 5.48.05 PM.png](https://graphite-user-uploaded-assets-prod.s3.amazonaws.com/4JosFH65rhzwIvkZw2J6/2bf61e7f-0ec4-466f-87b7-ec7e1d84993e.png) ## Deploy Notes **New environment variables**: - `KEYCDN_API_KEY` : to get all the zones that we own in keycdn - `S3_BUCKET_NAME`: bucket name - [ ] HAVE NOT added env var to 1PW + SSM script (`fetch_ssm_parameters.sh`) **New scripts**: - `script` : script details **New dependencies**: - `dependency` : dependency details **New dev dependencies**: - `dependency` : dependency details --- .aws/deploy/support-task-definition.prod.json | 1 + .../support-task-definition.staging.json | 1 + .env.test | 2 + common/index.ts | 5 + package-lock.json | 181 +++++-------- package.json | 2 +- src/config/config.ts | 9 + src/errors/MonitoringError.ts | 11 + src/monitoring/index.ts | 244 ++++++++++++++++++ src/server.ts | 1 + src/services/identity/LaunchesService.ts | 6 + src/services/identity/ReposService.ts | 2 +- src/utils/papa-parse.ts | 19 ++ support/index.ts | 10 +- 14 files changed, 377 insertions(+), 117 deletions(-) create mode 100644 src/errors/MonitoringError.ts create mode 100644 src/monitoring/index.ts create mode 100644 src/utils/papa-parse.ts diff --git a/.aws/deploy/support-task-definition.prod.json b/.aws/deploy/support-task-definition.prod.json index 97ed65ab2..7db06bc19 100644 --- a/.aws/deploy/support-task-definition.prod.json +++ b/.aws/deploy/support-task-definition.prod.json @@ -98,6 +98,7 @@ "valueFrom": "PROD_ISOMERPAGES_REPO_PAGE_COUNT" }, { "name": "JWT_SECRET", "valueFrom": "PROD_JWT_SECRET" }, + { "name": "KEYCDN_API_KEY", "valueFrom": "PROD_KEYCDN_API_KEY" }, { "name": "MAX_NUM_OTP_ATTEMPTS", "valueFrom": "PROD_MAX_NUM_OTP_ATTEMPTS" diff --git a/.aws/deploy/support-task-definition.staging.json b/.aws/deploy/support-task-definition.staging.json index dc77dbed4..c77efa8fc 100644 --- a/.aws/deploy/support-task-definition.staging.json +++ b/.aws/deploy/support-task-definition.staging.json @@ -107,6 +107,7 @@ "valueFrom": "STAGING_ISOMERPAGES_REPO_PAGE_COUNT" }, { "name": "JWT_SECRET", "valueFrom": "STAGING_JWT_SECRET" }, + { "name": "KEYCDN_API_KEY", "valueFrom": "STAGING_KEYCDN_API_KEY" }, { "name": "MAX_NUM_OTP_ATTEMPTS", "valueFrom": "STAGING_MAX_NUM_OTP_ATTEMPTS" diff --git a/.env.test b/.env.test index 16075fe12..5d4a4ec13 100644 --- a/.env.test +++ b/.env.test @@ -85,3 +85,5 @@ export SGID_REDIRECT_URI="http://localhost:8081/v2/auth/sgid/auth-redirect" # GrowthBook export GROWTHBOOK_CLIENT_KEY="some random key" + +export KEYCDN_API_KEY="secret" \ No newline at end of file diff --git a/common/index.ts b/common/index.ts index 21f22bbc1..d0e7e976c 100644 --- a/common/index.ts +++ b/common/index.ts @@ -27,6 +27,7 @@ import { Reviewer, ReviewRequestView, } from "@database/models" +import MonitoringService from "@root/monitoring" import AuditLogsService from "@root/services/admin/AuditLogsService" import RepoManagementService from "@root/services/admin/RepoManagementService" import GitFileCommitService from "@root/services/db/GitFileCommitService" @@ -248,3 +249,7 @@ export const auditLogsService = new AuditLogsService({ sitesService, usersService, }) + +export const monitoringService = new MonitoringService({ + launchesService, +}) diff --git a/package-lock.json b/package-lock.json index d8dcd7f06..cce7c7ed4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@aws-sdk/lib-dynamodb": "^3.577.0", "@growthbook/growthbook": "^0.36.0", "@octokit/plugin-retry": "^6.0.0", - "@octokit/rest": "^18.12.0", + "@octokit/rest": "^20.1.1", "@opengovsg/formsg-sdk": "^0.11.0", "@opengovsg/sgid-client": "^2.0.0", "@slack/bolt": "^3.19.0", @@ -4519,7 +4519,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz", "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==", - "peer": true, "engines": { "node": ">= 18" } @@ -4528,7 +4527,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.1.0.tgz", "integrity": "sha512-BDa2VAMLSh3otEiaMJ/3Y36GU4qf6GI+VivQ/P41NC6GHcdxpKlqV0ikSZ5gdQsmS3ojXeRx5vasgNTinF0Q4g==", - "peer": true, "dependencies": { "@octokit/auth-token": "^4.0.0", "@octokit/graphql": "^7.0.0", @@ -4545,14 +4543,12 @@ "node_modules/@octokit/core/node_modules/@octokit/openapi-types": { "version": "19.1.0", "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz", - "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==", - "peer": true + "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==" }, "node_modules/@octokit/core/node_modules/@octokit/types": { "version": "12.4.0", "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz", "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==", - "peer": true, "dependencies": { "@octokit/openapi-types": "^19.1.0" } @@ -4561,7 +4557,6 @@ "version": "9.0.4", "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.4.tgz", "integrity": "sha512-DWPLtr1Kz3tv8L0UvXTDP1fNwM0S+z6EJpRcvH66orY6Eld4XBMCSYsaWp4xIm61jTWxK68BrR7ibO+vSDnZqw==", - "peer": true, "dependencies": { "@octokit/types": "^12.0.0", "universal-user-agent": "^6.0.0" @@ -4573,14 +4568,12 @@ "node_modules/@octokit/endpoint/node_modules/@octokit/openapi-types": { "version": "19.1.0", "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz", - "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==", - "peer": true + "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==" }, "node_modules/@octokit/endpoint/node_modules/@octokit/types": { "version": "12.4.0", "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz", "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==", - "peer": true, "dependencies": { "@octokit/openapi-types": "^19.1.0" } @@ -4589,7 +4582,6 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.0.2.tgz", "integrity": "sha512-OJ2iGMtj5Tg3s6RaXH22cJcxXRi7Y3EBqbHTBRq+PQAqfaS8f/236fUrWhfSn8P4jovyzqucxme7/vWSSZBX2Q==", - "peer": true, "dependencies": { "@octokit/request": "^8.0.1", "@octokit/types": "^12.0.0", @@ -4602,14 +4594,12 @@ "node_modules/@octokit/graphql/node_modules/@octokit/openapi-types": { "version": "19.1.0", "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz", - "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==", - "peer": true + "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==" }, "node_modules/@octokit/graphql/node_modules/@octokit/types": { "version": "12.4.0", "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz", "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==", - "peer": true, "dependencies": { "@octokit/openapi-types": "^19.1.0" } @@ -4617,37 +4607,72 @@ "node_modules/@octokit/openapi-types": { "version": "12.11.0", "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz", - "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==" + "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==", + "dev": true }, "node_modules/@octokit/plugin-paginate-rest": { - "version": "2.21.3", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz", - "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==", + "version": "11.3.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.1.tgz", + "integrity": "sha512-ryqobs26cLtM1kQxqeZui4v8FeznirUsksiA+RYemMPJ7Micju0WSkv50dBksTuZks9O5cg4wp+t8fZ/cLY56g==", "dependencies": { - "@octokit/types": "^6.40.0" + "@octokit/types": "^13.5.0" + }, + "engines": { + "node": ">= 18" }, "peerDependencies": { - "@octokit/core": ">=2" + "@octokit/core": "5" + } + }, + "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": { + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", + "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==" + }, + "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": { + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", + "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", + "dependencies": { + "@octokit/openapi-types": "^22.2.0" } }, "node_modules/@octokit/plugin-request-log": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", - "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-4.0.1.tgz", + "integrity": "sha512-GihNqNpGHorUrO7Qa9JbAl0dbLnqJVrV8OXe2Zm5/Y4wFkZQDfTreBzVmiRfJVfE4mClXdihHnbpyyO9FSX4HA==", + "engines": { + "node": ">= 18" + }, "peerDependencies": { - "@octokit/core": ">=3" + "@octokit/core": "5" } }, "node_modules/@octokit/plugin-rest-endpoint-methods": { - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz", - "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.2.2.tgz", + "integrity": "sha512-EI7kXWidkt3Xlok5uN43suK99VWqc8OaIMktY9d9+RNKl69juoTyxmLoWPIZgJYzi41qj/9zU7G/ljnNOJ5AFA==", "dependencies": { - "@octokit/types": "^6.39.0", - "deprecation": "^2.3.1" + "@octokit/types": "^13.5.0" + }, + "engines": { + "node": ">= 18" }, "peerDependencies": { - "@octokit/core": ">=3" + "@octokit/core": "^5" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": { + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", + "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==" + }, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", + "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", + "dependencies": { + "@octokit/openapi-types": "^22.2.0" } }, "node_modules/@octokit/plugin-retry": { @@ -4683,7 +4708,6 @@ "version": "8.1.6", "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.6.tgz", "integrity": "sha512-YhPaGml3ncZC1NfXpP3WZ7iliL1ap6tLkAp6MvbK2fTTPytzVUyUesBBogcdMm86uRYO5rHaM1xIWxigWZ17MQ==", - "peer": true, "dependencies": { "@octokit/endpoint": "^9.0.0", "@octokit/request-error": "^5.0.0", @@ -4723,98 +4747,35 @@ "node_modules/@octokit/request/node_modules/@octokit/openapi-types": { "version": "19.1.0", "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz", - "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==", - "peer": true + "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==" }, "node_modules/@octokit/request/node_modules/@octokit/types": { "version": "12.4.0", "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz", "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==", - "peer": true, "dependencies": { "@octokit/openapi-types": "^19.1.0" } }, "node_modules/@octokit/rest": { - "version": "18.12.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz", - "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==", - "dependencies": { - "@octokit/core": "^3.5.1", - "@octokit/plugin-paginate-rest": "^2.16.8", - "@octokit/plugin-request-log": "^1.0.4", - "@octokit/plugin-rest-endpoint-methods": "^5.12.0" - } - }, - "node_modules/@octokit/rest/node_modules/@octokit/auth-token": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz", - "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==", - "dependencies": { - "@octokit/types": "^6.0.3" - } - }, - "node_modules/@octokit/rest/node_modules/@octokit/core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz", - "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==", - "dependencies": { - "@octokit/auth-token": "^2.4.4", - "@octokit/graphql": "^4.5.8", - "@octokit/request": "^5.6.3", - "@octokit/request-error": "^2.0.5", - "@octokit/types": "^6.0.3", - "before-after-hook": "^2.2.0", - "universal-user-agent": "^6.0.0" - } - }, - "node_modules/@octokit/rest/node_modules/@octokit/endpoint": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz", - "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==", - "dependencies": { - "@octokit/types": "^6.0.3", - "is-plain-object": "^5.0.0", - "universal-user-agent": "^6.0.0" - } - }, - "node_modules/@octokit/rest/node_modules/@octokit/graphql": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz", - "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==", - "dependencies": { - "@octokit/request": "^5.6.0", - "@octokit/types": "^6.0.3", - "universal-user-agent": "^6.0.0" - } - }, - "node_modules/@octokit/rest/node_modules/@octokit/request": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz", - "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==", - "dependencies": { - "@octokit/endpoint": "^6.0.1", - "@octokit/request-error": "^2.1.0", - "@octokit/types": "^6.16.1", - "is-plain-object": "^5.0.0", - "node-fetch": "^2.6.7", - "universal-user-agent": "^6.0.0" - } - }, - "node_modules/@octokit/rest/node_modules/@octokit/request-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz", - "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.1.1.tgz", + "integrity": "sha512-MB4AYDsM5jhIHro/dq4ix1iWTLGToIGk6cWF5L6vanFaMble5jTX/UBQyiv05HsWnwUtY8JrfHy2LWfKwihqMw==", "dependencies": { - "@octokit/types": "^6.0.3", - "deprecation": "^2.0.0", - "once": "^1.4.0" + "@octokit/core": "^5.0.2", + "@octokit/plugin-paginate-rest": "11.3.1", + "@octokit/plugin-request-log": "^4.0.0", + "@octokit/plugin-rest-endpoint-methods": "13.2.2" + }, + "engines": { + "node": ">= 18" } }, "node_modules/@octokit/types": { "version": "6.41.0", "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz", "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==", + "dev": true, "dependencies": { "@octokit/openapi-types": "^12.11.0" } @@ -12508,14 +12469,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-potential-custom-element-name": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", diff --git a/package.json b/package.json index c655eae21..e90cc5838 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@aws-sdk/lib-dynamodb": "^3.577.0", "@growthbook/growthbook": "^0.36.0", "@octokit/plugin-retry": "^6.0.0", - "@octokit/rest": "^18.12.0", + "@octokit/rest": "^20.1.1", "@opengovsg/formsg-sdk": "^0.11.0", "@opengovsg/sgid-client": "^2.0.0", "@slack/bolt": "^3.19.0", diff --git a/src/config/config.ts b/src/config/config.ts index 5cf91ce63..4b4d60888 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -195,6 +195,7 @@ const config = convict({ }, }, }, + github: { orgName: { doc: "GitHub organization that owns all site repositories", @@ -472,6 +473,14 @@ const config = convict({ default: "", }, }, + keyCdn: { + apiKey: { + doc: "KeyCDN API key", + env: "KEYCDN_API_KEY", + format: "required-string", + default: "", + }, + }, }) // Perform validation diff --git a/src/errors/MonitoringError.ts b/src/errors/MonitoringError.ts new file mode 100644 index 000000000..431aa5479 --- /dev/null +++ b/src/errors/MonitoringError.ts @@ -0,0 +1,11 @@ +import { BaseIsomerError } from "./BaseError" + +export default class MonitoringError extends BaseIsomerError { + constructor(message: string) { + super({ + status: 500, + code: "MonitoringError", + message, + }) + } +} diff --git a/src/monitoring/index.ts b/src/monitoring/index.ts new file mode 100644 index 000000000..de6e43ec0 --- /dev/null +++ b/src/monitoring/index.ts @@ -0,0 +1,244 @@ +import dns from "dns/promises" + +import { retry } from "@octokit/plugin-retry" +import { Octokit } from "@octokit/rest" +import autoBind from "auto-bind" +import axios from "axios" +import _ from "lodash" +import { errAsync, okAsync, ResultAsync } from "neverthrow" + +import parentLogger from "@logger/logger" + +import config from "@root/config/config" +import MonitoringError from "@root/errors/MonitoringError" +import LaunchesService from "@root/services/identity/LaunchesService" +import promisifyPapaParse from "@root/utils/papa-parse" + +interface MonitoringServiceProps { + launchesService: LaunchesService +} + +const IsomerHostedDomainType = { + REDIRECTION: "redirection", + INDIRECTION: "indirection", + KEYCDN: "keycdn", + AMPLIFY: "amplify", +} as const + +interface IsomerHostedDomain { + domain: string + type: typeof IsomerHostedDomainType[keyof typeof IsomerHostedDomainType] +} + +type KeyCdnZoneAlias = { + name: string +} + +interface RedirectionDomain { + source: string + target: string +} + +interface ReportCard { + domain: string + type: typeof IsomerHostedDomainType[keyof typeof IsomerHostedDomainType] + aRecord: string[] + quadArecord: string[] + cNameRecord: string[] + caaRecord: string[] +} + +function isKeyCdnZoneAlias(object: unknown): object is KeyCdnZoneAlias { + return "name" in (object as KeyCdnZoneAlias) +} + +function isKeyCdnResponse(object: unknown): object is KeyCdnZoneAlias[] { + if (!object) return false + if (Array.isArray(object)) return object.every(isKeyCdnZoneAlias) + return false +} + +export default class MonitoringService { + private readonly launchesService: MonitoringServiceProps["launchesService"] + + private readonly monitoringServiceLogger = parentLogger.child({ + module: "monitoringService", + }) + + constructor({ launchesService }: MonitoringServiceProps) { + autoBind(this) + this.launchesService = launchesService + } + + getKeyCdnDomains() { + const keyCdnApiKey = config.get("keyCdn.apiKey") + + return ResultAsync.fromPromise( + axios.get(`https://api.keycdn.com/zonealiases.json`, { + headers: { + Authorization: `Basic ${btoa(`${keyCdnApiKey}:`)}`, + }, + }), + (error) => + new MonitoringError(`Failed to fetch zones from KeyCDN: ${error}`) + ) + .map((response) => response.data.data.zonealiases) + .andThen((data) => { + if (!isKeyCdnResponse(data)) { + return errAsync( + new MonitoringError("Failed to parse response from KeyCDN") + ) + } + + const domains = data + .map((zone) => zone.name) + .map((domain) => ({ + domain, + type: IsomerHostedDomainType.KEYCDN, + })) + return okAsync(domains) + }) + } + + getAmplifyDeployments() { + return this.launchesService.getAllDomains().map((domains) => + domains.map((domain) => ({ + domain, + type: IsomerHostedDomainType.AMPLIFY, + })) + ) + } + + /** + * While most of our redirections are in our DB, we do have ad-hoc redirections. + * @returns List of redirection domains that are listed in the isomer-redirection repository + */ + getRedirectionDomains() { + const SYSTEM_GITHUB_TOKEN = config.get("github.systemToken") + const OctokitRetry = Octokit.plugin(retry) + const octokitWithRetry: Octokit = new OctokitRetry({ + auth: SYSTEM_GITHUB_TOKEN, + request: { retries: 5 }, + }) + + return ResultAsync.fromPromise( + octokitWithRetry.request( + "GET /repos/opengovsg/isomer-redirection/contents/src/certbot-websites.csv" + ), + (error) => + new MonitoringError(`Failed to fetch redirection domains: ${error}`) + ) + .andThen((response) => { + const content = Buffer.from(response.data.content, "base64").toString( + "utf-8" + ) + + return ResultAsync.fromPromise( + promisifyPapaParse(content), + (error) => new MonitoringError(`Failed to parse csv: ${error}`) + ) + }) + .map((redirectionDomains) => + redirectionDomains + .map((domain) => domain.source) + .map((domain) => ({ + domain, + type: IsomerHostedDomainType.REDIRECTION, + })) + ) + } + + /** + * This is in charge of fetching all the domains that are are under Isomer, inclusive + * of any subdomains and redirects. + */ + getAllDomains() { + this.monitoringServiceLogger.info("Fetching all domains") + return ResultAsync.combine([ + this.getAmplifyDeployments().mapErr( + (error) => new MonitoringError(error.message) + ), + this.getRedirectionDomains(), + this.getKeyCdnDomains(), + ]).andThen(([amplifyDeployments, redirectionDomains, keyCdnDomains]) => { + this.monitoringServiceLogger.info("Fetched all domains") + return okAsync( + _.sortBy( + [...amplifyDeployments, ...redirectionDomains, ...keyCdnDomains], + (val) => (val.domain.startsWith("www.") ? val.domain.slice(4) : val) + ) + ) + }) + } + + // todo: once /siteup logic is merged into dev, we can add that as to alert isomer team + generateReportCard(domains: IsomerHostedDomain[]) { + const reportCard: ReportCard[] = [] + + const domainResolvers = domains.map(({ domain, type }) => { + const aRecord = ResultAsync.fromPromise( + dns.resolve(domain, "A"), + (e) => e + ).orElse(() => okAsync([])) + const quadArecord = ResultAsync.fromPromise( + dns.resolve(domain, "AAAA"), + (e) => e + ).orElse(() => okAsync([])) + + const cNameRecord = ResultAsync.fromPromise( + dns.resolve(domain, "CNAME"), + (e) => e + ).orElse(() => okAsync([])) + + const caaRecord = ResultAsync.fromPromise( + dns.resolve(domain, "CAA"), + (e) => e + ) + .orElse(() => okAsync([])) + .map((records) => records.map((record) => record.toString())) + + return ResultAsync.combineWithAllErrors([ + aRecord, + quadArecord, + cNameRecord, + caaRecord, + ]) + .andThen((resolvedDns) => + okAsync({ + domain, + type, + aRecord: resolvedDns[0], + quadArecord: resolvedDns[1], + cNameRecord: resolvedDns[2], + caaRecord: resolvedDns[3], + }) + ) + .map((value) => + reportCard.push({ + ...value, + }) + ) + .andThen(() => okAsync(reportCard)) + }) + + return ResultAsync.combineWithAllErrors(domainResolvers).map( + () => reportCard + ) + } + + driver() { + this.monitoringServiceLogger.info("Monitoring service started") + return this.getAllDomains() + .andThen(this.generateReportCard) + .andThen((reportCard) => { + this.monitoringServiceLogger.info({ + message: "Report card generated", + meta: { + reportCard, + date: new Date(), + }, + }) + return okAsync(reportCard) + }) + } +} diff --git a/src/server.ts b/src/server.ts index 204637a20..4c1614333 100644 --- a/src/server.ts +++ b/src/server.ts @@ -80,6 +80,7 @@ import { mailer } from "@services/utilServices/MailClient" import { apiLogger } from "./middleware/apiLogger" import { NotificationOnEditHandler } from "./middleware/notificationOnEditHandler" +import MonitoringService from "./monitoring" import getAuthenticatedSubrouter from "./routes/v2/authenticated" import { ReviewsRouter } from "./routes/v2/authenticated/review" import getAuthenticatedSitesSubrouter from "./routes/v2/authenticatedSites" diff --git a/src/services/identity/LaunchesService.ts b/src/services/identity/LaunchesService.ts index 1f6c30715..4e713d648 100644 --- a/src/services/identity/LaunchesService.ts +++ b/src/services/identity/LaunchesService.ts @@ -353,6 +353,12 @@ export class LaunchesService { new SiteLaunchError(`Failed to update site status for ${siteName}`) ) }) + + getAllDomains = () => + ResultAsync.fromPromise( + this.launchesRepository.findAll(), + () => new SiteLaunchError("Failed to fetch launches") + ).map((launch) => launch.map((l) => l.primaryDomainSource)) } export default LaunchesService diff --git a/src/services/identity/ReposService.ts b/src/services/identity/ReposService.ts index 7175b5648..ac07c2213 100644 --- a/src/services/identity/ReposService.ts +++ b/src/services/identity/ReposService.ts @@ -25,7 +25,7 @@ import { doesDirectoryExist } from "@root/utils/fs-utils" const SYSTEM_GITHUB_TOKEN = config.get("github.systemToken") const octokit = new Octokit({ auth: SYSTEM_GITHUB_TOKEN }) -const OctokitRetry = Octokit.plugin(retry as any) +const OctokitRetry = Octokit.plugin(retry) const octokitWithRetry = new OctokitRetry({ auth: SYSTEM_GITHUB_TOKEN, request: { retries: 5 }, diff --git a/src/utils/papa-parse.ts b/src/utils/papa-parse.ts new file mode 100644 index 000000000..e40723e20 --- /dev/null +++ b/src/utils/papa-parse.ts @@ -0,0 +1,19 @@ +import Papa from "papaparse" + +export default function promisifyPapaParse(content: string) { + return new Promise((resolve, reject) => { + Papa.parse(content, { + header: true, + complete(results) { + // validate the csv + if (!results.data) { + reject(new Error("Failed to parse csv")) + } + resolve(results.data as T) + }, + error(error: unknown) { + reject(error) + }, + }) + }) +} diff --git a/support/index.ts b/support/index.ts index ee0dffcd9..3c8e454d5 100644 --- a/support/index.ts +++ b/support/index.ts @@ -2,10 +2,16 @@ import "module-alias/register" import express from "express" -import { infraService, sequelize } from "@common/index" +import { + infraService, + launchesService, + monitoringService, + sequelize, +} from "@common/index" import { useSharedMiddleware } from "@common/middleware" import { config } from "@root/config/config" import logger from "@root/logger/logger" +import MonitoringService from "@root/monitoring" import { ROUTE_VERSION } from "./constants" import { v2Router } from "./routes" @@ -18,6 +24,8 @@ const app = express() // poller site launch updates infraService.pollMessages() +monitoringService.driver() + const ROUTE_PREFIX_ISOBOT = `/${ROUTE_VERSION}/isobot` app.use(ROUTE_PREFIX_ISOBOT, isobotRouter) From b565d582ffdfcb7cca48d38094f19ec9ad2b5c38 Mon Sep 17 00:00:00 2001 From: Kishore <42832651+kishore03109@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:14:39 +0800 Subject: [PATCH 5/7] feat(monitoring): add scheduler functionality (#1383) ## Problem This is the second part of the monitoring feature that we want to build. This PR only cares about adding a scheduler + the related infra needed for this to function. this will make the monitor run once every 5 mins, for oncalls to pick any related alarms from this. Adding the alarms is done in the downstream PR . ## Solution Using bullmq to conveniently create a queue, a worker and a repeatable job over multiple instances. We do some level of exponential backoff retries since it is a nice to have and easy to implement. The original `/site-up` code has since been refactored to return an `err` or a `ok`, depending on whether the configuration is ideal. Unfortunately, this caused quite a number of edge cases to pop up. Due to the nature of this, a more loose check of whether the isomer logo is present is being used to determine if a site is up. Even with this loose check, we have a `workplacelearning.gov.sg` who have modified their site to not have the Isomer logo. Have used gb to code white list this weird site. Potentially, if tomorrow we have an alarm of a site going down, but this is expected to prolong, we can go to growthbook and change the config for this to be whitelisted. **Breaking Changes** - [ ] Yes - this PR contains breaking changes - Details ... - [X] No - this PR is backwards compatible with ALL of the following feature flags in this [doc](https://www.notion.so/opengov/Existing-feature-flags-518ad2cdc325420893a105e88c432be5) ## Tests Screenshot 2024-05-21 at 11 20 59 AM on deployment, assert that you see these logs. it is ok for there to be multiple instances of this log (it directly corresponds to the number of instances that we have) since bullmq is smart enough to only create one queue, and one repeatable job over multiple instances. ## Deploy Notes corresponding infra pr should be deployed to production and only then should the redis host value be populated into the 1pw for production. Additionally, post approval of this pr, add two alarms, one for `Error running monitoring service` and another for `Monitoring service has failed`. These are errors when the job has failed to be initalised, and when there is a new error. **New environment variables**: - `REDIS_HOST` : Redis host - [ ] added env var to 1PW + SSM script (`fetch_ssm_parameters.sh`) **New dependencies**: - `bullmq` : scheduler of choice --- .aws/deploy/support-task-definition.prod.json | 5 + .../support-task-definition.staging.json | 5 + .env.test | 4 +- common/index.ts | 5 - docker-compose.dev.yml | 9 + package-lock.json | 257 ++++++++++++++ package.json | 1 + src/config/config.ts | 18 +- src/constants/constants.ts | 1 + src/constants/featureFlags.ts | 1 + src/monitoring/MonitoringService.ts | 116 ++++++ .../{index.ts => MonitoringWorker.ts} | 156 ++++----- src/server.ts | 2 +- src/types/featureFlags.ts | 6 + src/utils/dns-utils.ts | 329 ++++++++++++++++++ src/utils/growthbook-utils.ts | 20 +- support/index.ts | 19 +- support/routes/v2/isobot/ops/botService.ts | 310 +---------------- 18 files changed, 859 insertions(+), 405 deletions(-) create mode 100644 src/monitoring/MonitoringService.ts rename src/monitoring/{index.ts => MonitoringWorker.ts} (61%) create mode 100644 src/utils/dns-utils.ts diff --git a/.aws/deploy/support-task-definition.prod.json b/.aws/deploy/support-task-definition.prod.json index 7db06bc19..f5b5b5863 100644 --- a/.aws/deploy/support-task-definition.prod.json +++ b/.aws/deploy/support-task-definition.prod.json @@ -128,6 +128,11 @@ "name": "REDIRECT_URI", "valueFrom": "PROD_REDIRECT_URI" }, + { + "name": "REDIRECTION_REPO_GITHUB_TOKEN", + "valueFrom": "PROD_REDIRECTION_REPO_GITHUB_TOKEN" + }, + { "name": "REDIS_HOST", "valueFrom": "PROD_REDIS_HOST" }, { "name": "SESSION_SECRET", "valueFrom": "PROD_SESSION_SECRET" diff --git a/.aws/deploy/support-task-definition.staging.json b/.aws/deploy/support-task-definition.staging.json index c77efa8fc..e8e21b0ab 100644 --- a/.aws/deploy/support-task-definition.staging.json +++ b/.aws/deploy/support-task-definition.staging.json @@ -137,6 +137,11 @@ "name": "REDIRECT_URI", "valueFrom": "STAGING_REDIRECT_URI" }, + { + "name": "REDIRECTION_REPO_GITHUB_TOKEN", + "valueFrom": "STAGING_REDIRECTION_REPO_GITHUB_TOKEN" + }, + { "name": "REDIS_HOST", "valueFrom": "STAGING_REDIS_HOST" }, { "name": "SESSION_SECRET", "valueFrom": "STAGING_SESSION_SECRET" diff --git a/.env.test b/.env.test index 5d4a4ec13..1228238d9 100644 --- a/.env.test +++ b/.env.test @@ -86,4 +86,6 @@ export SGID_REDIRECT_URI="http://localhost:8081/v2/auth/sgid/auth-redirect" # GrowthBook export GROWTHBOOK_CLIENT_KEY="some random key" -export KEYCDN_API_KEY="secret" \ No newline at end of file +export KEYCDN_API_KEY="secret" + +export REDIS_HOST="redis" diff --git a/common/index.ts b/common/index.ts index d0e7e976c..21f22bbc1 100644 --- a/common/index.ts +++ b/common/index.ts @@ -27,7 +27,6 @@ import { Reviewer, ReviewRequestView, } from "@database/models" -import MonitoringService from "@root/monitoring" import AuditLogsService from "@root/services/admin/AuditLogsService" import RepoManagementService from "@root/services/admin/RepoManagementService" import GitFileCommitService from "@root/services/db/GitFileCommitService" @@ -249,7 +248,3 @@ export const auditLogsService = new AuditLogsService({ sitesService, usersService, }) - -export const monitoringService = new MonitoringService({ - launchesService, -}) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 046c0eae1..31896b87f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,10 +1,18 @@ version: "3" services: + redis: + image: redis + container_name: isomercms-redis + ports: + - 6379:6379 support: build: dockerfile: ./support/Dockerfile ports: - "8082:8082" + depends_on: + - postgres + - redis env_file: - .env volumes: @@ -18,6 +26,7 @@ services: dockerfile: Dockerfile depends_on: - postgres + - redis ports: - "8081:8081" env_file: diff --git a/package-lock.json b/package-lock.json index cce7c7ed4..b17ae63e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "bcryptjs": "^2.4.3", "bluebird": "^3.7.2", "body-parser": "^1.19.2", + "bullmq": "^5.7.15", "cache-parser": "^1.2.4", "cloudmersive-virus-api-client": "^1.2.7", "connect-session-sequelize": "^7.1.5", @@ -3312,6 +3313,11 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@ioredis/commands": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", + "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -4457,6 +4463,78 @@ "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz", "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==" }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz", + "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz", + "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz", + "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz", + "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz", + "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz", + "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -7459,6 +7537,32 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "node_modules/bullmq": { + "version": "5.7.15", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.7.15.tgz", + "integrity": "sha512-XR5sTA8BPUY67sS37sMKGCDvSLaVpMq7aaQG8FGSKOUnPoJMRf17n1TibVWP3+yK0xKLdK5Y7PY9D874Fpeqpg==", + "dependencies": { + "cron-parser": "^4.6.0", + "ioredis": "^5.4.1", + "msgpackr": "^1.10.1", + "node-abort-controller": "^3.1.1", + "semver": "^7.5.4", + "tslib": "^2.0.0", + "uuid": "^9.0.0" + } + }, + "node_modules/bullmq/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -7804,6 +7908,14 @@ "superagent": "3.7.0" } }, + "node_modules/cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -9130,6 +9242,17 @@ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" }, + "node_modules/cron-parser": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", + "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==", + "dependencies": { + "luxon": "^3.2.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", @@ -9590,6 +9713,14 @@ "dev": true, "optional": true }, + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "engines": { + "node": ">=0.10" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -12191,6 +12322,50 @@ "node": ">= 0.4" } }, + "node_modules/ioredis": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.4.1.tgz", + "integrity": "sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==", + "dependencies": { + "@ioredis/commands": "^1.1.1", + "cluster-key-slot": "^1.1.0", + "debug": "^4.3.4", + "denque": "^2.1.0", + "lodash.defaults": "^4.2.0", + "lodash.isarguments": "^3.1.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0", + "standard-as-callback": "^2.1.0" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/ioredis" + } + }, + "node_modules/ioredis/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/ioredis/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/ip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", @@ -15675,6 +15850,11 @@ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" + }, "node_modules/lodash.find": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz", @@ -15685,6 +15865,11 @@ "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" }, + "node_modules/lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==" + }, "node_modules/lodash.isboolean": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", @@ -15876,6 +16061,14 @@ "node": ">=12" } }, + "node_modules/luxon": { + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", + "engines": { + "node": ">=12" + } + }, "node_modules/make-dir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", @@ -16379,6 +16572,35 @@ "msgpack": "bin/msgpack" } }, + "node_modules/msgpackr": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.2.tgz", + "integrity": "sha512-L60rsPynBvNE+8BWipKKZ9jHcSGbtyJYIwjRq0VrIvQ08cRjntGXJYW/tmciZ2IHWIY8WEW32Qa2xbh5+SKBZA==", + "optionalDependencies": { + "msgpackr-extract": "^3.0.2" + } + }, + "node_modules/msgpackr-extract": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz", + "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "node-gyp-build-optional-packages": "5.0.7" + }, + "bin": { + "download-msgpackr-prebuilds": "bin/download-prebuilds.js" + }, + "optionalDependencies": { + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2" + } + }, "node_modules/mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", @@ -16531,6 +16753,17 @@ "node-gyp-build-test": "build-test.js" } }, + "node_modules/node-gyp-build-optional-packages": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz", + "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==", + "optional": true, + "bin": { + "node-gyp-build-optional-packages": "bin.js", + "node-gyp-build-optional-packages-optional": "optional.js", + "node-gyp-build-optional-packages-test": "build-test.js" + } + }, "node_modules/node-gyp/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -18123,6 +18356,25 @@ "node": ">= 12.13.0" } }, + "node_modules/redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", + "engines": { + "node": ">=4" + } + }, + "node_modules/redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "dependencies": { + "redis-errors": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/reflect-metadata": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", @@ -19181,6 +19433,11 @@ "node": ">=8" } }, + "node_modules/standard-as-callback": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" + }, "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", diff --git a/package.json b/package.json index e90cc5838..c47a856f0 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "bcryptjs": "^2.4.3", "bluebird": "^3.7.2", "body-parser": "^1.19.2", + "bullmq": "^5.7.15", "cache-parser": "^1.2.4", "cloudmersive-virus-api-client": "^1.2.7", "connect-session-sequelize": "^7.1.5", diff --git a/src/config/config.ts b/src/config/config.ts index 4b4d60888..ee6ace999 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -195,7 +195,14 @@ const config = convict({ }, }, }, - + bullmq: { + redisHostname: { + doc: "Redis host name for bullmq", + env: "REDIS_HOST", + format: String, + default: "isomerpages", + }, + }, github: { orgName: { doc: "GitHub organization that owns all site repositories", @@ -247,6 +254,13 @@ const config = convict({ format: "required-string", default: "", }, + redirectionRepoGithubToken: { + doc: "Github access to read opengovsg/isomer-redirection", + env: "REDIRECTION_REPO_GITHUB_TOKEN", + sensitive: true, + format: String, + default: "", + }, }, dataDog: { env: { @@ -477,7 +491,7 @@ const config = convict({ apiKey: { doc: "KeyCDN API key", env: "KEYCDN_API_KEY", - format: "required-string", + format: String, default: "", }, }, diff --git a/src/constants/constants.ts b/src/constants/constants.ts index c3fc8743a..c3307fc42 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -78,6 +78,7 @@ export const REDIRECTION_SERVER_IPS = [ ] export const ALLOWED_DNS_ERROR_CODES = ["ENOTFOUND", "ENODATA"] +export const BUILT_WITH_ISOMER_LOGO = `

+ + private readonly monitoringWorker: MonitoringServiceInterface["monitoringWorker"] + + constructor({ monitoringWorker }: MonitoringServiceInterface) { + this.monitoringWorker = monitoringWorker + autoBind(this) + const jobName = "dnsMonitoring" + + const FIVE_MINUTE_CRON = "*/5 * * * *" + + const jobData = { + name: "monitoring sites", + } + + ResultAsync.fromPromise( + this.queue.add(jobName, jobData, { + repeat: { + pattern: FIVE_MINUTE_CRON, + }, + }), + (e) => e + ) + .map((okRes) => { + this.monitoringServiceLogger.info( + `Monitoring job scheduled at interval ${FIVE_MINUTE_CRON}` + ) + return okRes + }) + .mapErr((errRes) => { + this.monitoringServiceLogger.error(`Failed to schedule job: ${errRes}`) + }) + + this.worker = new Worker( + this.queue.name, + async (job: Job) => { + this.monitoringServiceLogger.info(`Monitoring Worker ${job.id}`) + if (job.name === jobName) { + // The retry's work on a thrown error, so we need to convert the neverthrow to a promise + const res = await convertNeverThrowToPromise( + this.monitoringWorker.driver() + ) + return res + } + throw new MonitoringError("Invalid job name") + }, + { + connection: { + ...this.REDIS_CONNECTION, + }, + lockDuration: ONE_MINUTE, // since this is a relatively expensive operation + } + ) + + this.worker.on("error", (error: Error) => { + logger.error({ + message: "Monitoring service has errored", + error, + }) + }) + this.worker.on("failed", (job: Job | undefined, error: Error) => { + logger.error({ + message: "Monitoring service has errored", + error, + meta: { + ...job?.data, + }, + }) + }) + } +} diff --git a/src/monitoring/index.ts b/src/monitoring/MonitoringWorker.ts similarity index 61% rename from src/monitoring/index.ts rename to src/monitoring/MonitoringWorker.ts index de6e43ec0..998bec64b 100644 --- a/src/monitoring/index.ts +++ b/src/monitoring/MonitoringWorker.ts @@ -1,23 +1,22 @@ -import dns from "dns/promises" - import { retry } from "@octokit/plugin-retry" import { Octokit } from "@octokit/rest" import autoBind from "auto-bind" import axios from "axios" import _ from "lodash" -import { errAsync, okAsync, ResultAsync } from "neverthrow" +import { ResultAsync, errAsync, okAsync } from "neverthrow" import parentLogger from "@logger/logger" import config from "@root/config/config" import MonitoringError from "@root/errors/MonitoringError" import LaunchesService from "@root/services/identity/LaunchesService" +import { dnsMonitor } from "@root/utils/dns-utils" +import { + getMonitoringConfig, + getNewGrowthbookInstance, +} from "@root/utils/growthbook-utils" import promisifyPapaParse from "@root/utils/papa-parse" -interface MonitoringServiceProps { - launchesService: LaunchesService -} - const IsomerHostedDomainType = { REDIRECTION: "redirection", INDIRECTION: "indirection", @@ -39,15 +38,6 @@ interface RedirectionDomain { target: string } -interface ReportCard { - domain: string - type: typeof IsomerHostedDomainType[keyof typeof IsomerHostedDomainType] - aRecord: string[] - quadArecord: string[] - cNameRecord: string[] - caaRecord: string[] -} - function isKeyCdnZoneAlias(object: unknown): object is KeyCdnZoneAlias { return "name" in (object as KeyCdnZoneAlias) } @@ -58,16 +48,20 @@ function isKeyCdnResponse(object: unknown): object is KeyCdnZoneAlias[] { return false } -export default class MonitoringService { - private readonly launchesService: MonitoringServiceProps["launchesService"] +interface MonitoringWorkerInterface { + launchesService: LaunchesService +} - private readonly monitoringServiceLogger = parentLogger.child({ - module: "monitoringService", +export default class MonitoringWorker { + private readonly monitoringWorkerLogger = parentLogger.child({ + module: "monitoringWorker", }) - constructor({ launchesService }: MonitoringServiceProps) { - autoBind(this) + private readonly launchesService: MonitoringWorkerInterface["launchesService"] + + constructor({ launchesService }: MonitoringWorkerInterface) { this.launchesService = launchesService + autoBind(this) } getKeyCdnDomains() { @@ -114,10 +108,13 @@ export default class MonitoringService { * @returns List of redirection domains that are listed in the isomer-redirection repository */ getRedirectionDomains() { - const SYSTEM_GITHUB_TOKEN = config.get("github.systemToken") + const REDIRECTION_REPO_GITHUB_TOKEN = config.get( + "github.redirectionRepoGithubToken" + ) + const OctokitRetry = Octokit.plugin(retry) const octokitWithRetry: Octokit = new OctokitRetry({ - auth: SYSTEM_GITHUB_TOKEN, + auth: REDIRECTION_REPO_GITHUB_TOKEN, request: { retries: 5 }, }) @@ -125,8 +122,8 @@ export default class MonitoringService { octokitWithRetry.request( "GET /repos/opengovsg/isomer-redirection/contents/src/certbot-websites.csv" ), - (error) => - new MonitoringError(`Failed to fetch redirection domains: ${error}`) + (err) => + new MonitoringError(`Failed to fetch redirection domains: ${err}`) ) .andThen((response) => { const content = Buffer.from(response.data.content, "base64").toString( @@ -135,7 +132,7 @@ export default class MonitoringService { return ResultAsync.fromPromise( promisifyPapaParse(content), - (error) => new MonitoringError(`Failed to parse csv: ${error}`) + (err) => new MonitoringError(`Failed to parse csv: ${err}`) ) }) .map((redirectionDomains) => @@ -153,15 +150,15 @@ export default class MonitoringService { * of any subdomains and redirects. */ getAllDomains() { - this.monitoringServiceLogger.info("Fetching all domains") + this.monitoringWorkerLogger.info("Fetching all domains") return ResultAsync.combine([ this.getAmplifyDeployments().mapErr( - (error) => new MonitoringError(error.message) + (err) => new MonitoringError(err.message) ), this.getRedirectionDomains(), this.getKeyCdnDomains(), ]).andThen(([amplifyDeployments, redirectionDomains, keyCdnDomains]) => { - this.monitoringServiceLogger.info("Fetched all domains") + this.monitoringWorkerLogger.info("Fetched all domains") return okAsync( _.sortBy( [...amplifyDeployments, ...redirectionDomains, ...keyCdnDomains], @@ -171,74 +168,59 @@ export default class MonitoringService { }) } - // todo: once /siteup logic is merged into dev, we can add that as to alert isomer team generateReportCard(domains: IsomerHostedDomain[]) { - const reportCard: ReportCard[] = [] - - const domainResolvers = domains.map(({ domain, type }) => { - const aRecord = ResultAsync.fromPromise( - dns.resolve(domain, "A"), - (e) => e - ).orElse(() => okAsync([])) - const quadArecord = ResultAsync.fromPromise( - dns.resolve(domain, "AAAA"), - (e) => e - ).orElse(() => okAsync([])) - - const cNameRecord = ResultAsync.fromPromise( - dns.resolve(domain, "CNAME"), - (e) => e - ).orElse(() => okAsync([])) - - const caaRecord = ResultAsync.fromPromise( - dns.resolve(domain, "CAA"), - (e) => e - ) - .orElse(() => okAsync([])) - .map((records) => records.map((record) => record.toString())) - - return ResultAsync.combineWithAllErrors([ - aRecord, - quadArecord, - cNameRecord, - caaRecord, - ]) - .andThen((resolvedDns) => - okAsync({ - domain, - type, - aRecord: resolvedDns[0], - quadArecord: resolvedDns[1], - cNameRecord: resolvedDns[2], - caaRecord: resolvedDns[3], - }) - ) - .map((value) => - reportCard.push({ - ...value, - }) - ) - .andThen(() => okAsync(reportCard)) - }) + const dnsPromises: ResultAsync[] = [] - return ResultAsync.combineWithAllErrors(domainResolvers).map( - () => reportCard - ) + domains.forEach((domain) => dnsPromises.push(dnsMonitor(domain.domain))) + return ResultAsync.combineWithAllErrors(dnsPromises) } driver() { - this.monitoringServiceLogger.info("Monitoring service started") + const gb = getNewGrowthbookInstance({ + clientKey: config.get("growthbook.clientKey"), + subscribeToChanges: false, + }) + const monitoringConfig = getMonitoringConfig(gb) + if (!monitoringConfig.isEnabled) { + this.monitoringWorkerLogger.info("Monitoring Service disabled") + return okAsync("Monitoring Service disabled") + } + const start = Date.now() + this.monitoringWorkerLogger.info("Monitoring service started") + return this.getAllDomains() .andThen(this.generateReportCard) - .andThen((reportCard) => { - this.monitoringServiceLogger.info({ - message: "Report card generated", + .mapErr((reportCardErr: MonitoringError | string[]) => { + if (reportCardErr instanceof MonitoringError) { + this.monitoringWorkerLogger.error({ + error: reportCardErr, + message: "Error running monitoring service", + }) + return + } + this.monitoringWorkerLogger.error({ + message: "Error running monitoring service", meta: { - reportCard, + dnsCheckerResult: reportCardErr, date: new Date(), }, }) - return okAsync(reportCard) + reportCardErr.map((err) => + this.monitoringWorkerLogger.error({ + message: "Error running monitoring service", + meta: { + dnsCheckerResult: err, + date: new Date(), + }, + }) + ) + }) + .orElse(() => okAsync([])) + .andThen(() => { + this.monitoringWorkerLogger.info( + `Monitoring service completed in ${Date.now() - start}ms` + ) + return okAsync("Monitoring service completed") }) } } diff --git a/src/server.ts b/src/server.ts index 4c1614333..0b17a9324 100644 --- a/src/server.ts +++ b/src/server.ts @@ -3,6 +3,7 @@ import "./utils/tracer" import "module-alias/register" import { SgidClient } from "@opengovsg/sgid-client" +import { Queue } from "bullmq" import SequelizeStoreFactory from "connect-session-sequelize" import cors from "cors" import express from "express" @@ -80,7 +81,6 @@ import { mailer } from "@services/utilServices/MailClient" import { apiLogger } from "./middleware/apiLogger" import { NotificationOnEditHandler } from "./middleware/notificationOnEditHandler" -import MonitoringService from "./monitoring" import getAuthenticatedSubrouter from "./routes/v2/authenticated" import { ReviewsRouter } from "./routes/v2/authenticated/review" import getAuthenticatedSitesSubrouter from "./routes/v2/authenticatedSites" diff --git a/src/types/featureFlags.ts b/src/types/featureFlags.ts index 0fecdd8ca..4130e65fe 100644 --- a/src/types/featureFlags.ts +++ b/src/types/featureFlags.ts @@ -7,12 +7,18 @@ export interface CloudmersiveConfigType { timeout: number } +export interface MonitoringConfig { + isEnabled: boolean + whitelistedRepos: string[] +} + export interface FeatureFlags { is_build_times_reduction_enabled: boolean is_ggs_enabled: boolean is_show_staging_build_status_enabled: boolean is_cloudmersive_enabled: CloudmersiveConfigType is_local_diff_enabled: boolean + is_monitoring_enabled: MonitoringConfig } // List of attributes we set in GrowthBook Instance in auth middleware diff --git a/src/utils/dns-utils.ts b/src/utils/dns-utils.ts new file mode 100644 index 000000000..926226194 --- /dev/null +++ b/src/utils/dns-utils.ts @@ -0,0 +1,329 @@ +import dns from "node:dns/promises" + +import { err, errAsync, ok, okAsync, Result, ResultAsync } from "neverthrow" + +import config from "@root/config/config" +import { + BUILT_WITH_ISOMER_LOGO, + DNS_CNAME_SUFFIXES, + DNS_INDIRECTION_DOMAIN, + DNS_KEYCDN_SUFFIX, + REDIRECTION_SERVER_IPS, +} from "@root/constants" +import MonitoringError from "@root/errors/MonitoringError" +import logger from "@root/logger/logger" + +import { + getMonitoringConfig, + getNewGrowthbookInstance, +} from "./growthbook-utils" + +export function checkCname(domain: string) { + return ResultAsync.fromPromise(dns.resolveCname(domain), () => { + logger.info({ + message: "Error resolving CNAME", + meta: { domain, method: "checkCname" }, + }) + return new Error() + }) + .andThen((cname) => { + if (!cname || cname.length === 0) { + return okAsync(null) + } + + return okAsync(cname[0]) + }) + .orElse(() => okAsync(null)) +} + +export function checkA(domain: string) { + return ResultAsync.fromPromise(dns.resolve4(domain), () => { + logger.info({ + message: "Error resolving A record", + meta: { domain, method: "checkA" }, + }) + return new Error() + }) + .andThen((a) => { + if (!a || a.length === 0) { + return okAsync(null) + } + + return okAsync(a) + }) + .orElse(() => okAsync(null)) +} + +export default function getDnsCheckerMessage( + domain: string, + cnameDomain: string | null, + redirectionDomain: string, + cnameRecord: string | null, + indirectionDomain: string, + intermediateRecords: string[] | null, + redirectionRecords: string[] | null +): Result { + // Domain has a CNAME pointing to one of our known suffixes + const isDomainCnameCorrect = + !!cnameRecord && + (cnameRecord.endsWith(`.${DNS_INDIRECTION_DOMAIN}`) || + DNS_CNAME_SUFFIXES.some((suffix) => cnameRecord.endsWith(`.${suffix}`))) + + // Domain is directly pointing to our indirection layer + const isDomainOnIndirection = + cnameRecord && cnameRecord.endsWith(`.${DNS_INDIRECTION_DOMAIN}`) + + // The intermediate layer (indirection or CNAME) is resolving to valid IPs + // If on KeyCDN, then there should only be 1 IP, otherwise there should be 4 + const isIntermediateValid = + intermediateRecords && + ((cnameRecord && + cnameRecord.endsWith(`.${DNS_KEYCDN_SUFFIX}`) && + intermediateRecords.length === 1) || + (intermediateRecords.length === 4 && + (isDomainCnameCorrect || + indirectionDomain.endsWith(`.${DNS_INDIRECTION_DOMAIN}`)))) + + // The redirection domain has records that are all resolving to our known IPs + const isRedirectionValid = + redirectionRecords && + redirectionRecords.every((ip) => REDIRECTION_SERVER_IPS.includes(ip)) + + if (isDomainCnameCorrect && cnameDomain && !cnameDomain.startsWith("www.")) { + // Domain is a CNAME domain and does not have www in it -> No redirection domain to check + if (isDomainOnIndirection) { + if (isIntermediateValid) { + return ok(`The domain ${domain} is *all valid*!`) + } + return err( + `Jialat, the domain \`${domain}\` is correctly pointing to our indirection layer, but the indirection layer does not seem to be configured correctly.\nThis is *OUR* fault` + ) + } + return err( + `Hmm, the domain ${domain} is *valid*, but it points to ${cnameRecord} which is not something that I recognise. Probably not an Isomer site?\n- A records checker: https://dnschecker.org/#A/${domain}\n- CNAME records checker: https://dnschecker.org/#CNAME/${domain}` + ) + } + if (isDomainCnameCorrect && cnameDomain && cnameDomain.startsWith("www.")) { + // Domain is a CNAME domain and also starts with www -> Check the apex domain as well + if (isDomainOnIndirection) { + if (isIntermediateValid && isRedirectionValid) { + return ok( + `The domain ${domain} is *all valid*! The apex domain \`${redirectionDomain}\` is also correctly configured to our redirection service.` + ) + } + if (isIntermediateValid && !isRedirectionValid) { + return err( + `Weird eh, the domain \`${domain}\` is correctly pointing to our indirection layer but the apex domain is not configured correctly.\nThis is *AGENCY fault*!` + ) + } + if (!isIntermediateValid && isRedirectionValid) { + return err( + `Jialat, the domain \`${domain}\` is correctly pointing to our indirection layer and the apex domain is correctly configured, but the indirection layer does not seem to be configured correctly.\nThis is *OUR fault*!` + ) + } + return err( + `Wah, the domain \`${domain}\` is correctly pointing to our indirection layer, but both the indirection layer and the apex domain does not seem to be configured correctly.\nThis is *both OUR and AGENCY fault*!` + ) + } + if (isIntermediateValid && isRedirectionValid) { + return ok( + `The domain ${domain} is *all valid*! Although it is directly pointing to our CDN hosting provider and not the indirection layer. The apex domain \`${redirectionDomain}\` is also correctly configured to our redirection service.` + ) + } + if (isIntermediateValid && !isRedirectionValid) { + return err( + `Weird eh, the domain \`${domain}\` is correctly pointing to our CDN hosting provider (not indirection layer) but the apex domain is not configured correctly.\nThis is *AGENCY fault*!` + ) + } + if (!isIntermediateValid && isRedirectionValid) { + return err( + `Jialat, the domain \`${domain}\` is correctly pointing to our CDN hosting provider (not indirection layer) and the apex domain is correctly configured, but the CDN hosting provider does not seem to be configured correctly.\nThis is *OUR fault*!` + ) + } + return err( + `Wah, the domain \`${domain}\` is correctly pointing to our CDN hosting provider (not indirection layer), but both the CDN hosting provider and the apex domain does not seem to be configured correctly.\nThis is *both OUR and AGENCY fault*!` + ) + } + if (isIntermediateValid) { + // Domain is likely gone or points directly to A records, but our indirection layer is still correct + return err( + `Oh no, the domain \`${domain}\` seems to be gone, but okay lah our indirection layer is correctly configured.\nThis is *AGENCY fault*!` + ) + } + if (!cnameRecord && !intermediateRecords && !redirectionRecords) { + // Everything is gone + return err( + `Jialat, the DNS for \`${domain}\` seems to be gone, and our indirection layer does not seem to be configured correctly.\nIf this site is supposed to be live, then this is *both OUR and AGENCY fault*!` + ) + } + // Some weird configuration + + let responseMeta = `Wah, I don't know how to handle \`${domain}\` sia, might need to manually check.\n- A records checker: https://dnschecker.org/#A/${domain}\n- CNAME records checker: https://dnschecker.org/#CNAME/${domain}\n- \`${domain}\` points to ${ + cnameRecord ? `\`${cnameRecord}\`` : "no CNAME records" + }` + + if (cnameRecord || indirectionDomain) { + responseMeta += `- \`${cnameRecord || indirectionDomain}\` points to ${ + intermediateRecords ? `\`${intermediateRecords.join(", ")}\`` : "nothing" + }` + } + + if (redirectionDomain !== cnameDomain) { + responseMeta += `- \`${redirectionDomain}\` points to ${ + redirectionRecords + ? `\`${redirectionRecords.join(", ")}\`` + : "no A records" + }` + } + + return err(responseMeta) +} + +export function dnsMonitor(domain: string): ResultAsync { + console.log("dnsMonitor", domain) + if (!domain) { + return okAsync("Empty domain provided") + } + return checkCname(domain) + .andThen((cname) => { + if (cname) { + return ResultAsync.combine([okAsync(domain), okAsync(cname)]) + } + // Original domain does not have a CNAME record, check if the www + // version has a valid CNAME record + if (!cname && !domain.startsWith("www.")) { + const cnameDomain = `www.${domain}` + return checkCname(cnameDomain).andThen((cnameDomainRes) => { + if (cnameDomainRes) { + return ResultAsync.combine([ + okAsync(cnameDomain), + okAsync(cnameDomainRes), + ]) + } + // this might be a redirection only domain + return ResultAsync.combine([okAsync(domain), okAsync(null)]) + }) + } + // might be a redirection only domain + return ResultAsync.combine([okAsync(domain), okAsync(null)]) + }) + .andThen(([cnameDomain, cnameRecord]) => { + // Original and www version of the domain do not have a CNAME record, + // check if our indirection domain is still correct + if (!cnameRecord) { + const indirectionDomain = domain.startsWith("www.") + ? `${domain.slice(4).replaceAll(".", "-")}.${DNS_INDIRECTION_DOMAIN}` + : `${domain.replaceAll(".", "-")}.${DNS_INDIRECTION_DOMAIN}` + + return ResultAsync.combine([ + okAsync({ + cnameDomain: null, + cnameRecord, + indirectionDomain, + }), + checkA(indirectionDomain), + ]) + } + + // Either the original or www version of the domain has a CNAME record, + // check if the CNAME record is valid + return ResultAsync.combine([ + okAsync({ + cnameDomain, + cnameRecord, + indirectionDomain: cnameRecord, + }), + checkA(cnameRecord), + ]) + }) + .andThen( + ([ + { cnameDomain, cnameRecord, indirectionDomain }, + indirectionRecords, + ]) => { + const redirectionDomain = domain.startsWith("www.") + ? domain.slice(4) + : domain + + return ResultAsync.combine([ + okAsync({ + cnameDomain, + cnameRecord, + indirectionDomain, + indirectionRecords, + redirectionDomain, + }), + checkA(redirectionDomain), + ]) + } + ) + .andThen( + ([ + { + cnameDomain, + cnameRecord, + indirectionDomain, + indirectionRecords, + redirectionDomain, + }, + redirection, + ]) => { + const dnsCheckerMessage = getDnsCheckerMessage( + domain, + cnameDomain, + redirectionDomain, + cnameRecord, + indirectionDomain, + indirectionRecords, + redirection + ) + + const domainCheckerRes = dnsCheckerMessage.isOk() + ? dnsCheckerMessage.value + : dnsCheckerMessage.error + + return ResultAsync.fromPromise( + // using fetch as it has a convenient redirect option + + fetch(`https://${domain}`), + () => new MonitoringError(`Failed to fetch site: ${domain}`) + ) + .andThen((res) => + ResultAsync.fromPromise( + res.text(), + () => new MonitoringError(`Failed to get text from response`) + ) + ) + .andThen((res) => { + const isStillHostingIsomerSite = res.includes( + BUILT_WITH_ISOMER_LOGO + ) + + if (isStillHostingIsomerSite) { + return okAsync( + `${domainCheckerRes}\nThe site is still being hosted with Isomer logo, and is likely still viewable by MOP` + ) + } + const gb = getNewGrowthbookInstance({ + clientKey: config.get("growthbook.clientKey"), + subscribeToChanges: true, + }) + const monitoringConfig = getMonitoringConfig(gb) + + const isWeirdDomain = monitoringConfig.whitelistedRepos.includes( + domain + ) + if (isWeirdDomain) { + return okAsync( + `${domainCheckerRes}\nThe site is not being hosted with Isomer logo, and is known to be an edge case.` + ) + } + return errAsync(false) + }) + .mapErr( + () => + `${domainCheckerRes}\nThe site is **NOT** being hosted with Isomer logo, and is likely **NOT** viewable by MOP` + ) + } + ) +} diff --git a/src/utils/growthbook-utils.ts b/src/utils/growthbook-utils.ts index a6cdee8c3..4b6f3c484 100644 --- a/src/utils/growthbook-utils.ts +++ b/src/utils/growthbook-utils.ts @@ -2,7 +2,11 @@ import { GrowthBook, setPolyfills } from "@growthbook/growthbook" import { config } from "@root/config/config" import { FEATURE_FLAGS } from "@root/constants/featureFlags" -import { FeatureFlags, CloudmersiveConfigType } from "@root/types/featureFlags" +import { + FeatureFlags, + CloudmersiveConfigType, + MonitoringConfig, +} from "@root/types/featureFlags" const GROWTHBOOK_API_HOST = "https://cdn.growthbook.io" @@ -67,3 +71,17 @@ export const isCloudmersiveEnabled = ( defaultConfig ) } + +export const getMonitoringConfig = ( + growthbook: GrowthBook | undefined +): MonitoringConfig => { + const defaultConfig = { + isEnabled: true, + whitelistedRepos: [], + } + if (!growthbook) return defaultConfig + return growthbook.getFeatureValue( + FEATURE_FLAGS.IS_MONITORING_ENABLED, + defaultConfig + ) +} diff --git a/support/index.ts b/support/index.ts index 3c8e454d5..393bd9ccc 100644 --- a/support/index.ts +++ b/support/index.ts @@ -2,16 +2,12 @@ import "module-alias/register" import express from "express" -import { - infraService, - launchesService, - monitoringService, - sequelize, -} from "@common/index" +import { infraService, launchesService, sequelize } from "@common/index" import { useSharedMiddleware } from "@common/middleware" import { config } from "@root/config/config" import logger from "@root/logger/logger" -import MonitoringService from "@root/monitoring" +import MonitoringService from "@root/monitoring/MonitoringService" +import MonitoringWorker from "@root/monitoring/MonitoringWorker" import { ROUTE_VERSION } from "./constants" import { v2Router } from "./routes" @@ -24,7 +20,14 @@ const app = express() // poller site launch updates infraService.pollMessages() -monitoringService.driver() +// only needed for support container +export const monitoringWorker = new MonitoringWorker({ + launchesService, +}) + +export const monitoringService = new MonitoringService({ + monitoringWorker, +}) const ROUTE_PREFIX_ISOBOT = `/${ROUTE_VERSION}/isobot` app.use(ROUTE_PREFIX_ISOBOT, isobotRouter) diff --git a/support/routes/v2/isobot/ops/botService.ts b/support/routes/v2/isobot/ops/botService.ts index ea5b79c6c..5ad3098e2 100644 --- a/support/routes/v2/isobot/ops/botService.ts +++ b/support/routes/v2/isobot/ops/botService.ts @@ -1,17 +1,10 @@ -import dns from "node:dns/promises" - import { SlashCommand } from "@slack/bolt" -import { ResultAsync, okAsync } from "neverthrow" +import { ok } from "neverthrow" -import { - DNS_CNAME_SUFFIXES, - DNS_INDIRECTION_DOMAIN, - DNS_KEYCDN_SUFFIX, - REDIRECTION_SERVER_IPS, -} from "@root/constants" import logger from "@root/logger/logger" import WhitelistService from "@root/services/identity/WhitelistService" import { DnsCheckerResponse } from "@root/types/dnsChecker" +import { dnsMonitor } from "@root/utils/dns-utils" class BotService { whitelistService: WhitelistService @@ -20,42 +13,6 @@ class BotService { this.whitelistService = whitelistService } - private checkCname(domain: string) { - return ResultAsync.fromPromise(dns.resolveCname(domain), () => { - logger.error({ - message: "Error resolving CNAME", - meta: { domain, method: "checkCname" }, - }) - return new Error() - }) - .andThen((cname) => { - if (!cname || cname.length === 0) { - return okAsync(null) - } - - return okAsync(cname[0]) - }) - .orElse(() => okAsync(null)) - } - - private checkA(domain: string) { - return ResultAsync.fromPromise(dns.resolve4(domain), () => { - logger.error({ - message: "Error resolving A record", - meta: { domain, method: "checkA" }, - }) - return new Error() - }) - .andThen((a) => { - if (!a || a.length === 0) { - return okAsync(null) - } - - return okAsync(a) - }) - .orElse(() => okAsync(null)) - } - private getSlackMessage(message: string | string[]): DnsCheckerResponse { return { response_type: "in_channel", @@ -110,172 +67,6 @@ class BotService { return domain } - getDnsCheckerMessage( - domain: string, - cnameDomain: string | null, - redirectionDomain: string, - cnameRecord: string | null, - indirectionDomain: string, - intermediateRecords: string[] | null, - redirectionRecords: string[] | null - ) { - // Domain has a CNAME pointing to one of our known suffixes - const isDomainCnameCorrect = - !!cnameRecord && - (cnameRecord.endsWith(`.${DNS_INDIRECTION_DOMAIN}`) || - DNS_CNAME_SUFFIXES.some((suffix) => cnameRecord.endsWith(`.${suffix}`))) - - // Domain is directly pointing to our indirection layer - const isDomainOnIndirection = - cnameRecord && cnameRecord.endsWith(`.${DNS_INDIRECTION_DOMAIN}`) - - // The intermediate layer (indirection or CNAME) is resolving to valid IPs - // If on KeyCDN, then there should only be 1 IP, otherwise there should be 4 - const isIntermediateValid = - intermediateRecords && - ((cnameRecord && - cnameRecord.endsWith(`.${DNS_KEYCDN_SUFFIX}`) && - intermediateRecords.length === 1) || - (intermediateRecords.length === 4 && - (isDomainCnameCorrect || - indirectionDomain.endsWith(`.${DNS_INDIRECTION_DOMAIN}`)))) - - // The redirection domain has records that are all resolving to our known IPs - const isRedirectionValid = - redirectionRecords && - redirectionRecords.every((ip) => REDIRECTION_SERVER_IPS.includes(ip)) - - const response = [] - - if ( - isDomainCnameCorrect && - cnameDomain && - !cnameDomain.startsWith("www.") - ) { - // Domain is a CNAME domain and does not have www in it -> No redirection domain to check - if (isDomainOnIndirection) { - if (isIntermediateValid) { - response.push(`The domain ${domain} is *all valid*!`) - } else { - response.push( - `Jialat, the domain \`${domain}\` is correctly pointing to our indirection layer, but the indirection layer does not seem to be configured correctly.` - ) - response.push("This is *OUR* fault!") - } - } else { - response.push( - `Hmm, the domain ${domain} is *valid*, but it points to ${cnameRecord} which is not something that I recognise. Probably not an Isomer site?` - ) - response.push( - `- A records checker: https://dnschecker.org/#A/${domain}` - ) - response.push( - `- CNAME records checker: https://dnschecker.org/#CNAME/${domain}` - ) - } - } else if ( - isDomainCnameCorrect && - cnameDomain && - cnameDomain.startsWith("www.") - ) { - // Domain is a CNAME domain and also starts with www -> Check the apex domain as well - if (isDomainOnIndirection) { - if (isIntermediateValid && isRedirectionValid) { - response.push( - `The domain ${domain} is *all valid*! The apex domain \`${redirectionDomain}\` is also correctly configured to our redirection service.` - ) - } else if (isIntermediateValid && !isRedirectionValid) { - response.push( - `Weird eh, the domain \`${domain}\` is correctly pointing to our indirection layer but the apex domain is not configured correctly.` - ) - response.push("This is *AGENCY fault*!") - } else if (!isIntermediateValid && isRedirectionValid) { - response.push( - `Jialat, the domain \`${domain}\` is correctly pointing to our indirection layer and the apex domain is correctly configured, but the indirection layer does not seem to be configured correctly.` - ) - response.push("This is *OUR fault*!") - } else { - response.push( - `Wah, the domain \`${domain}\` is correctly pointing to our indirection layer, but both the indirection layer and the apex domain does not seem to be configured correctly.` - ) - response.push("This is *both OUR and AGENCY fault*!") - } - } else if (isIntermediateValid && isRedirectionValid) { - response.push( - `The domain ${domain} is *all valid*! Although it is directly pointing to our CDN hosting provider and not the indirection layer. The apex domain \`${redirectionDomain}\` is also correctly configured to our redirection service.` - ) - } else if (isIntermediateValid && !isRedirectionValid) { - response.push( - `Weird eh, the domain \`${domain}\` is correctly pointing to our CDN hosting provider (not indirection layer) but the apex domain is not configured correctly.` - ) - response.push("This is *AGENCY fault*!") - } else if (!isIntermediateValid && isRedirectionValid) { - response.push( - `Jialat, the domain \`${domain}\` is correctly pointing to our CDN hosting provider (not indirection layer) and the apex domain is correctly configured, but the CDN hosting provider does not seem to be configured correctly.` - ) - response.push("This is *OUR fault*!") - } else { - response.push( - `Wah, the domain \`${domain}\` is correctly pointing to our CDN hosting provider (not indirection layer), but both the CDN hosting provider and the apex domain does not seem to be configured correctly.` - ) - response.push("This is *both OUR and AGENCY fault*!") - } - } else if (isIntermediateValid) { - // Domain is likely gone or points directly to A records, but our indirection layer is still correct - response.push( - `Oh no, the domain \`${domain}\` seems to be gone, but okay lah our indirection layer is correctly configured.` - ) - response.push("This is *AGENCY fault*!") - } else if (!cnameRecord && !intermediateRecords && !redirectionRecords) { - // Everything is gone - response.push( - `Jialat, the DNS for \`${domain}\` seems to be gone, and our indirection layer does not seem to be configured correctly.` - ) - response.push( - "If this site is supposed to be live, then this is *both OUR and AGENCY fault*!" - ) - } else { - // Some weird configuration - response.push( - `Wah, I don't know how to handle \`${domain}\` sia, might need to manually check.` - ) - response.push( - `- A records checker: https://dnschecker.org/#A/${domain}` - ) - response.push( - `- CNAME records checker: https://dnschecker.org/#CNAME/${domain}` - ) - } - - response.push( - `- \`${domain}\` points to ${ - cnameRecord ? `\`${cnameRecord}\`` : "no CNAME records" - }` - ) - - if (cnameRecord || indirectionDomain) { - response.push( - `- \`${cnameRecord || indirectionDomain}\` points to ${ - intermediateRecords - ? `\`${intermediateRecords.join(", ")}\`` - : "nothing" - }` - ) - } - - if (redirectionDomain !== cnameDomain) { - response.push( - `- \`${redirectionDomain}\` points to ${ - redirectionRecords - ? `\`${redirectionRecords.join(", ")}\`` - : "no A records" - }` - ) - } - - return this.getSlackMessage(response) - } - dnsChecker(payload: SlashCommand) { // Step 1: Get the domain name provided by the user const { user_name: user, channel_name: channel, text: domain } = payload @@ -289,95 +80,14 @@ class BotService { }, }) - return this.checkCname(domain) - .andThen((cname) => { - // Original domain does not have a CNAME record, check if the www - // version has a valid CNAME record - if (!cname && !domain.startsWith("www.")) { - const cnameDomain = `www.${domain}` - return ResultAsync.combine([ - okAsync(cnameDomain), - this.checkCname(cnameDomain), - ]) - } - - return ResultAsync.combine([okAsync(domain), okAsync(cname)]) - }) - .andThen(([cnameDomain, cnameRecord]) => { - // Original and www version of the domain do not have a CNAME record, - // check if our indirection domain is still correct - if (!cnameRecord) { - const indirectionDomain = domain.startsWith("www.") - ? `${domain - .slice(4) - .replaceAll(".", "-")}.${DNS_INDIRECTION_DOMAIN}` - : `${domain.replaceAll(".", "-")}.${DNS_INDIRECTION_DOMAIN}` - - return ResultAsync.combine([ - okAsync({ - cnameDomain: null, - cnameRecord, - indirectionDomain, - }), - this.checkA(indirectionDomain), - ]) - } - - // Either the original or www version of the domain has a CNAME record, - // check if the CNAME record is valid - return ResultAsync.combine([ - okAsync({ - cnameDomain, - cnameRecord, - indirectionDomain: cnameRecord, - }), - this.checkA(cnameRecord), - ]) - }) - .andThen( - ([ - { cnameDomain, cnameRecord, indirectionDomain }, - indirectionRecords, - ]) => { - const redirectionDomain = domain.startsWith("www.") - ? domain.slice(4) - : domain - - return ResultAsync.combine([ - okAsync({ - cnameDomain, - cnameRecord, - indirectionDomain, - indirectionRecords, - redirectionDomain, - }), - this.checkA(redirectionDomain), - ]) - } - ) - .andThen( - ([ - { - cnameDomain, - cnameRecord, - indirectionDomain, - indirectionRecords, - redirectionDomain, - }, - redirection, - ]) => - okAsync( - this.getDnsCheckerMessage( - domain, - cnameDomain, - redirectionDomain, - cnameRecord, - indirectionDomain, - indirectionRecords, - redirection - ) - ) - ) + return ( + dnsMonitor(domain) + // when running the slack bot command, the slack bot + // does not need to know what is the error state, it just needs the + // string to show isomer admins of what the state is + .orElse((res) => ok(res)) + .map((res) => this.getSlackMessage(res)) + ) } } From e13ac7cacf9c4bccdbb42dc3ba51566efe4ff545 Mon Sep 17 00:00:00 2001 From: Kishore <42832651+kishore03109@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:21:52 +0800 Subject: [PATCH 6/7] chore(deps): minor upgrade aws (#1416) --- package-lock.json | 1482 +++++++-------------------------------------- package.json | 10 +- 2 files changed, 240 insertions(+), 1252 deletions(-) diff --git a/package-lock.json b/package-lock.json index b17ae63e2..d2c2d64b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,10 +9,10 @@ "version": "0.89.0", "hasInstallScript": true, "dependencies": { - "@aws-sdk/client-amplify": "^3.575.0", - "@aws-sdk/client-cloudwatch-logs": "^3.575.0", - "@aws-sdk/client-dynamodb": "^3.575.0", - "@aws-sdk/client-secrets-manager": "^3.578.0", + "@aws-sdk/client-amplify": "^3.577.0", + "@aws-sdk/client-cloudwatch-logs": "^3.577.0", + "@aws-sdk/client-dynamodb": "^3.577.0", + "@aws-sdk/client-secrets-manager": "^3.577.0", "@aws-sdk/lib-dynamodb": "^3.577.0", "@growthbook/growthbook": "^0.36.0", "@octokit/plugin-retry": "^6.0.0", @@ -22,7 +22,7 @@ "@slack/bolt": "^3.19.0", "auto-bind": "^4.0.0", "aws-lambda": "^1.0.7", - "aws-sdk": "^2.1619.0", + "aws-sdk": "^2.1623.0", "axios": "^1.6.8", "base-64": "^1.0.0", "bcryptjs": "^2.4.3", @@ -259,25 +259,25 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-amplify": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-amplify/-/client-amplify-3.575.0.tgz", - "integrity": "sha512-OUaC2rb84HnE7wV4EZoTNm2/Fg50zLj9+lw++mMewMhhXPB0O+QQ8zzovfgP6x8xrcPO1UtwgvCrBM6S303+7w==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-amplify/-/client-amplify-3.577.0.tgz", + "integrity": "sha512-Shc5I0IioyXHy7cx386PQa5DdrI7XqYz5R+8/csmsPeFujpLNX3xl8+pxOqh7nKKWW2wCJA4+SC52oPvkyR0VA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.575.0", - "@aws-sdk/client-sts": "3.575.0", - "@aws-sdk/core": "3.575.0", - "@aws-sdk/credential-provider-node": "3.575.0", - "@aws-sdk/middleware-host-header": "3.575.0", - "@aws-sdk/middleware-logger": "3.575.0", - "@aws-sdk/middleware-recursion-detection": "3.575.0", - "@aws-sdk/middleware-user-agent": "3.575.0", - "@aws-sdk/region-config-resolver": "3.575.0", - "@aws-sdk/types": "3.575.0", - "@aws-sdk/util-endpoints": "3.575.0", - "@aws-sdk/util-user-agent-browser": "3.575.0", - "@aws-sdk/util-user-agent-node": "3.575.0", + "@aws-sdk/client-sso-oidc": "3.577.0", + "@aws-sdk/client-sts": "3.577.0", + "@aws-sdk/core": "3.576.0", + "@aws-sdk/credential-provider-node": "3.577.0", + "@aws-sdk/middleware-host-header": "3.577.0", + "@aws-sdk/middleware-logger": "3.577.0", + "@aws-sdk/middleware-recursion-detection": "3.577.0", + "@aws-sdk/middleware-user-agent": "3.577.0", + "@aws-sdk/region-config-resolver": "3.577.0", + "@aws-sdk/types": "3.577.0", + "@aws-sdk/util-endpoints": "3.577.0", + "@aws-sdk/util-user-agent-browser": "3.577.0", + "@aws-sdk/util-user-agent-node": "3.577.0", "@smithy/config-resolver": "^3.0.0", "@smithy/core": "^2.0.0", "@smithy/fetch-http-handler": "^3.0.0", @@ -310,25 +310,25 @@ } }, "node_modules/@aws-sdk/client-cloudwatch-logs": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.575.0.tgz", - "integrity": "sha512-p/tcLqEiDE3JI8iMUyAPgb0TUB96z2ysrwZUYxio7MKHC0l4Qb63fBW2tgZJjBBK/xOoQrl0kYE5MFAjFKvAoQ==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.577.0.tgz", + "integrity": "sha512-boUa2GIE4JHzVH6bx1GZuddk9y+QWe8lhX7vydlduAkTgSjaoxUluC3kLi1P0m5qKP2oTQA2/K26OOnZ9Hv74Q==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.575.0", - "@aws-sdk/client-sts": "3.575.0", - "@aws-sdk/core": "3.575.0", - "@aws-sdk/credential-provider-node": "3.575.0", - "@aws-sdk/middleware-host-header": "3.575.0", - "@aws-sdk/middleware-logger": "3.575.0", - "@aws-sdk/middleware-recursion-detection": "3.575.0", - "@aws-sdk/middleware-user-agent": "3.575.0", - "@aws-sdk/region-config-resolver": "3.575.0", - "@aws-sdk/types": "3.575.0", - "@aws-sdk/util-endpoints": "3.575.0", - "@aws-sdk/util-user-agent-browser": "3.575.0", - "@aws-sdk/util-user-agent-node": "3.575.0", + "@aws-sdk/client-sso-oidc": "3.577.0", + "@aws-sdk/client-sts": "3.577.0", + "@aws-sdk/core": "3.576.0", + "@aws-sdk/credential-provider-node": "3.577.0", + "@aws-sdk/middleware-host-header": "3.577.0", + "@aws-sdk/middleware-logger": "3.577.0", + "@aws-sdk/middleware-recursion-detection": "3.577.0", + "@aws-sdk/middleware-user-agent": "3.577.0", + "@aws-sdk/region-config-resolver": "3.577.0", + "@aws-sdk/types": "3.577.0", + "@aws-sdk/util-endpoints": "3.577.0", + "@aws-sdk/util-user-agent-browser": "3.577.0", + "@aws-sdk/util-user-agent-node": "3.577.0", "@smithy/config-resolver": "^3.0.0", "@smithy/core": "^2.0.0", "@smithy/eventstream-serde-browser": "^3.0.0", @@ -377,49 +377,48 @@ } }, "node_modules/@aws-sdk/client-dynamodb": { - "version": "3.590.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-dynamodb/-/client-dynamodb-3.590.0.tgz", - "integrity": "sha512-gJ0gtJoEMfftd8+kt0vE685seE1BbgLEr33nJ7CL1qorczZIihRMa0OqM6G4wuxwSlEBio5xJMwkCOPEqo0+0Q==", - "license": "Apache-2.0", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-dynamodb/-/client-dynamodb-3.577.0.tgz", + "integrity": "sha512-jR+rhYz25aPcMQgQy9tyQS9bsZ2bUKf7gaJ89jvhrrt61dcvw2iXzoO++2SCJWTx8WE1nsT6Vcw70RYpc5y71g==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.590.0", - "@aws-sdk/client-sts": "3.590.0", - "@aws-sdk/core": "3.588.0", - "@aws-sdk/credential-provider-node": "3.590.0", - "@aws-sdk/middleware-endpoint-discovery": "3.587.0", + "@aws-sdk/client-sso-oidc": "3.577.0", + "@aws-sdk/client-sts": "3.577.0", + "@aws-sdk/core": "3.576.0", + "@aws-sdk/credential-provider-node": "3.577.0", + "@aws-sdk/middleware-endpoint-discovery": "3.577.0", "@aws-sdk/middleware-host-header": "3.577.0", "@aws-sdk/middleware-logger": "3.577.0", "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.587.0", - "@aws-sdk/region-config-resolver": "3.587.0", + "@aws-sdk/middleware-user-agent": "3.577.0", + "@aws-sdk/region-config-resolver": "3.577.0", "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.587.0", + "@aws-sdk/util-endpoints": "3.577.0", "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.587.0", - "@smithy/config-resolver": "^3.0.1", - "@smithy/core": "^2.1.1", - "@smithy/fetch-http-handler": "^3.0.1", + "@aws-sdk/util-user-agent-node": "3.577.0", + "@smithy/config-resolver": "^3.0.0", + "@smithy/core": "^2.0.0", + "@smithy/fetch-http-handler": "^3.0.0", "@smithy/hash-node": "^3.0.0", "@smithy/invalid-dependency": "^3.0.0", "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.1", - "@smithy/middleware-retry": "^3.0.3", + "@smithy/middleware-endpoint": "^3.0.0", + "@smithy/middleware-retry": "^3.0.0", "@smithy/middleware-serde": "^3.0.0", "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.1.0", + "@smithy/node-config-provider": "^3.0.0", "@smithy/node-http-handler": "^3.0.0", "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.1.1", + "@smithy/smithy-client": "^3.0.0", "@smithy/types": "^3.0.0", "@smithy/url-parser": "^3.0.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.3", - "@smithy/util-defaults-mode-node": "^3.0.3", - "@smithy/util-endpoints": "^2.0.1", + "@smithy/util-defaults-mode-browser": "^3.0.0", + "@smithy/util-defaults-mode-node": "^3.0.0", + "@smithy/util-endpoints": "^2.0.0", "@smithy/util-middleware": "^3.0.0", "@smithy/util-retry": "^3.0.0", "@smithy/util-utf8": "^3.0.0", @@ -431,943 +430,68 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/client-sso": { - "version": "3.590.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.590.0.tgz", - "integrity": "sha512-6xbC6oQVJKBRTyXyR3C15ksUsPOyW4p+uCj7dlKYWGJvh4vGTV8KhZKS53oPG8t4f1+OMJWjr5wKuXRoaFsmhQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.588.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.587.0", - "@aws-sdk/region-config-resolver": "3.587.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.587.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.587.0", - "@smithy/config-resolver": "^3.0.1", - "@smithy/core": "^2.1.1", - "@smithy/fetch-http-handler": "^3.0.1", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.1", - "@smithy/middleware-retry": "^3.0.3", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.1.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.1.1", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.3", - "@smithy/util-defaults-mode-node": "^3.0.3", - "@smithy/util-endpoints": "^2.0.1", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.590.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.590.0.tgz", - "integrity": "sha512-3yCLPjq6WFfDpdUJKk/gSz4eAPDTjVknXaveMPi2QoVBCshneOnJsV16uNKlpVF1frTHrrDRfKYmbaVh6nFBvQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.590.0", - "@aws-sdk/core": "3.588.0", - "@aws-sdk/credential-provider-node": "3.590.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.587.0", - "@aws-sdk/region-config-resolver": "3.587.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.587.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.587.0", - "@smithy/config-resolver": "^3.0.1", - "@smithy/core": "^2.1.1", - "@smithy/fetch-http-handler": "^3.0.1", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.1", - "@smithy/middleware-retry": "^3.0.3", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.1.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.1.1", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.3", - "@smithy/util-defaults-mode-node": "^3.0.3", - "@smithy/util-endpoints": "^2.0.1", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" + "node_modules/@aws-sdk/client-dynamodb/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" } }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/client-sts": { - "version": "3.590.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.590.0.tgz", - "integrity": "sha512-f4R1v1LSn4uLYZ5qj4DyL6gp7PXXzJeJsm2seheiJX+53LSF5L7XSDnQVtX1p9Tevv0hp2YUWUTg6QYwIVSuGg==", - "license": "Apache-2.0", + "node_modules/@aws-sdk/client-secrets-manager": { + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.577.0.tgz", + "integrity": "sha512-9OVz1jkQbJ2tpSPpkT5LX7gnO1/MQl0XcKHIdtOFx5M4qS+1YC+ONm3H7r7X8nQf8UZpEWF1/iYXteLcIAYluw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.590.0", - "@aws-sdk/core": "3.588.0", - "@aws-sdk/credential-provider-node": "3.590.0", + "@aws-sdk/client-sso-oidc": "3.577.0", + "@aws-sdk/client-sts": "3.577.0", + "@aws-sdk/core": "3.576.0", + "@aws-sdk/credential-provider-node": "3.577.0", "@aws-sdk/middleware-host-header": "3.577.0", "@aws-sdk/middleware-logger": "3.577.0", "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.587.0", - "@aws-sdk/region-config-resolver": "3.587.0", + "@aws-sdk/middleware-user-agent": "3.577.0", + "@aws-sdk/region-config-resolver": "3.577.0", "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.587.0", + "@aws-sdk/util-endpoints": "3.577.0", "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.587.0", - "@smithy/config-resolver": "^3.0.1", - "@smithy/core": "^2.1.1", - "@smithy/fetch-http-handler": "^3.0.1", + "@aws-sdk/util-user-agent-node": "3.577.0", + "@smithy/config-resolver": "^3.0.0", + "@smithy/core": "^2.0.0", + "@smithy/fetch-http-handler": "^3.0.0", "@smithy/hash-node": "^3.0.0", "@smithy/invalid-dependency": "^3.0.0", "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.1", - "@smithy/middleware-retry": "^3.0.3", + "@smithy/middleware-endpoint": "^3.0.0", + "@smithy/middleware-retry": "^3.0.0", "@smithy/middleware-serde": "^3.0.0", "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.1.0", + "@smithy/node-config-provider": "^3.0.0", "@smithy/node-http-handler": "^3.0.0", "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.1.1", + "@smithy/smithy-client": "^3.0.0", "@smithy/types": "^3.0.0", "@smithy/url-parser": "^3.0.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.3", - "@smithy/util-defaults-mode-node": "^3.0.3", - "@smithy/util-endpoints": "^2.0.1", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/core": { - "version": "3.588.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.588.0.tgz", - "integrity": "sha512-O1c2+9ce46Z+iiid+W3iC1IvPbfIo5ev9CBi54GdNB9SaI8/3+f8MJcux0D6c9toCF0ArMersN/gp8ek57e9uQ==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/core": "^2.1.1", - "@smithy/protocol-http": "^4.0.0", - "@smithy/signature-v4": "^3.0.0", - "@smithy/smithy-client": "^3.1.1", - "@smithy/types": "^3.0.0", - "fast-xml-parser": "4.2.5", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.590.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.590.0.tgz", - "integrity": "sha512-Y5cFciAK38VIvRgZeND7HvFNR32thGtQb8Xop6cMn33FC78uwcRIu9Hc9699XTclCZqz4+Xl1WU+dZ+rnFn2AA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.587.0", - "@aws-sdk/credential-provider-http": "3.587.0", - "@aws-sdk/credential-provider-process": "3.587.0", - "@aws-sdk/credential-provider-sso": "3.590.0", - "@aws-sdk/credential-provider-web-identity": "3.587.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.1.0", - "@smithy/property-provider": "^3.1.0", - "@smithy/shared-ini-file-loader": "^3.1.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.590.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/credential-provider-node": { - "version": "3.590.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.590.0.tgz", - "integrity": "sha512-Ky38mNFoXobGrDQ11P3dU1e+q1nRJ7eZl8l15KUpvZCe/hOudbxQi/epQrCazD/gRYV2fTyczdLlZzB5ZZ8DhQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.587.0", - "@aws-sdk/credential-provider-http": "3.587.0", - "@aws-sdk/credential-provider-ini": "3.590.0", - "@aws-sdk/credential-provider-process": "3.587.0", - "@aws-sdk/credential-provider-sso": "3.590.0", - "@aws-sdk/credential-provider-web-identity": "3.587.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.1.0", - "@smithy/property-provider": "^3.1.0", - "@smithy/shared-ini-file-loader": "^3.1.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.590.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.590.0.tgz", - "integrity": "sha512-v+0j/I+je9okfwXsgmLppmwIE+TuMp5WqLz7r7PHz9KjzLyKaKTDvfllFD+8oPpBqnmOWiJ9qTGPkrfhB7a/fQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/client-sso": "3.590.0", - "@aws-sdk/token-providers": "3.587.0", - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.1.0", - "@smithy/shared-ini-file-loader": "^3.1.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.587.0.tgz", - "integrity": "sha512-XqIx/I2PG7kyuw3WjAP9wKlxy8IvFJwB8asOFT1xPFoVfZYKIogjG9oLP5YiRtfvDkWIztHmg5MlVv3HdJDGRw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.1.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.587.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/middleware-host-header": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.577.0.tgz", - "integrity": "sha512-9ca5MJz455CODIVXs0/sWmJm7t3QO4EUa1zf8pE8grLpzf0J94bz/skDWm37Pli13T3WaAQBHCTiH2gUVfCsWg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/middleware-logger": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.577.0.tgz", - "integrity": "sha512-aPFGpGjTZcJYk+24bg7jT4XdIp42mFXSuPt49lw5KygefLyJM/sB0bKKqPYYivW0rcuZ9brQ58eZUNthrzYAvg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.577.0.tgz", - "integrity": "sha512-pn3ZVEd2iobKJlR3H+bDilHjgRnNrQ6HMmK9ZzZw89Ckn3Dcbv48xOv4RJvu0aU8SDLl/SNCxppKjeLDTPGBNA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.587.0.tgz", - "integrity": "sha512-SyDomN+IOrygLucziG7/nOHkjUXES5oH5T7p8AboO8oakMQJdnudNXiYWTicQWO52R51U6CR27rcMPTGeMedYA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.587.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/region-config-resolver": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.587.0.tgz", - "integrity": "sha512-93I7IPZtulZQoRK+O20IJ4a1syWwYPzoO2gc3v+/GNZflZPV3QJXuVbIm0pxBsu0n/mzKGUKqSOLPIaN098HcQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.1.0", - "@smithy/types": "^3.0.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/token-providers": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.587.0.tgz", - "integrity": "sha512-ULqhbnLy1hmJNRcukANBWJmum3BbjXnurLPSFXoGdV0llXYlG55SzIla2VYqdveQEEjmsBuTZdFvXAtNpmS5Zg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.1.0", - "@smithy/shared-ini-file-loader": "^3.1.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.587.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/types": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.577.0.tgz", - "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/util-endpoints": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.587.0.tgz", - "integrity": "sha512-8I1HG6Em8wQWqKcRW6m358mqebRVNpL8XrrEoT4In7xqkKkmYtHRNVYP6lcmiQh5pZ/c/FXu8dSchuFIWyEtqQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", - "@smithy/util-endpoints": "^2.0.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.577.0.tgz", - "integrity": "sha512-zEAzHgR6HWpZOH7xFgeJLc6/CzMcx4nxeQolZxVZoB5pPaJd3CjyRhZN0xXeZB0XIRCWmb4yJBgyiugXLNMkLA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.587.0.tgz", - "integrity": "sha512-Pnl+DUe/bvnbEEDHP3iVJrOtE3HbFJBPgsD6vJ+ml/+IYk1Eq49jEG+EHZdNTPz3SDG0kbp2+7u41MKYJHR/iQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.1.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "aws-crt": ">=1.0.0" - }, - "peerDependenciesMeta": { - "aws-crt": { - "optional": true - } - } - }, - "node_modules/@aws-sdk/client-dynamodb/node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/@aws-sdk/client-secrets-manager": { - "version": "3.578.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.578.0.tgz", - "integrity": "sha512-DB98uGVKdkfpDAikn2QWMsOkGvWL5W7El/w/piQuIJz4udXaPKR8bcenrWYrLk8GMFIZQh5o8jC4R6ZxaF3k/A==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.577.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.0", + "@smithy/util-defaults-mode-node": "^3.0.0", + "@smithy/util-endpoints": "^2.0.0", "@smithy/util-middleware": "^3.0.0", "@smithy/util-retry": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2", "uuid": "^9.0.1" }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/client-sso": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.577.0.tgz", - "integrity": "sha512-BwujdXrydlk6UEyPmewm5GqG4nkQ6OVyRhS/SyZP/6UKSFv2/sf391Cmz0hN0itUTH1rR4XeLln8XCOtarkrzg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.577.0.tgz", - "integrity": "sha512-njmKSPDWueWWYVFpFcZ2P3fI6/pdQVDa0FgCyYZhOnJLgEHZIcBBg1AsnkVWacBuLopp9XVt2m+7hO6ugY1/1g==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/client-sts": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.577.0.tgz", - "integrity": "sha512-509Kklimva1XVlhGbpTpeX3kOP6ORpm44twJxDHpa9TURbmoaxj7veWlnLCbDorxDTrbsDghvYZshvcLsojVpg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/core": { - "version": "3.576.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.576.0.tgz", - "integrity": "sha512-KDvDlbeipSTIf+ffKtTg1m419TK7s9mZSWC8bvuZ9qx6/sjQFOXIKOVqyuli6DnfxGbvRcwoRuY99OcCH1N/0w==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/core": "^2.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/signature-v4": "^3.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "fast-xml-parser": "4.2.5", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/credential-provider-env": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.577.0.tgz", - "integrity": "sha512-Jxu255j0gToMGEiqufP8ZtKI8HW90lOLjwJ3LrdlD/NLsAY0tOQf1fWc53u28hWmmNGMxmCrL2p66IOgMDhDUw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/credential-provider-http": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.577.0.tgz", - "integrity": "sha512-n++yhCp67b9+ZRGEdY1jhamB5E/O+QsIDOPSuRmdaSGMCOd82oUEKPgIVEU1bkqxDsBxgiEWuvtfhK6sNiDS0A==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/util-stream": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.577.0.tgz", - "integrity": "sha512-q7lHPtv6BjRvChUE3m0tIaEZKxPTaZ1B3lKxGYsFl3VLAu5N8yGCUKwuA1izf4ucT+LyKscVGqK6VDZx1ev3nw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", - "@aws-sdk/credential-provider-web-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.577.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/credential-provider-node": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.577.0.tgz", - "integrity": "sha512-epZ1HOMsrXBNczc0HQpv0VMjqAEpc09DUA7Rg3gUJfn8umhML7A7bXnUyqPA+S54q397UYg1leQKdSn23OiwQQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-http": "3.577.0", - "@aws-sdk/credential-provider-ini": "3.577.0", - "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", - "@aws-sdk/credential-provider-web-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/credential-provider-process": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.577.0.tgz", - "integrity": "sha512-Gin6BWtOiXxIgITrJ3Nwc+Y2P1uVT6huYR4EcbA/DJUPWyO0n9y5UFLewPvVbLkRn15JeEqErBLUrHclkiOKtw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.577.0.tgz", - "integrity": "sha512-iVm5SQvS7EgZTJsRaqUOmDQpBQPPPat42SCbWFvFQOLrl8qewq8OP94hFS5w2mP62zngeYzqhJnDel79HXbxew==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/client-sso": "3.577.0", - "@aws-sdk/token-providers": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.577.0.tgz", - "integrity": "sha512-ZGHGNRaCtJJmszb9UTnC7izNCtRUttdPlLdMkh41KPS32vfdrBDHs1JrpbZijItRj1xKuOXsiYSXLAaHGcLh8Q==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.577.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/middleware-host-header": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.577.0.tgz", - "integrity": "sha512-9ca5MJz455CODIVXs0/sWmJm7t3QO4EUa1zf8pE8grLpzf0J94bz/skDWm37Pli13T3WaAQBHCTiH2gUVfCsWg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/middleware-logger": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.577.0.tgz", - "integrity": "sha512-aPFGpGjTZcJYk+24bg7jT4XdIp42mFXSuPt49lw5KygefLyJM/sB0bKKqPYYivW0rcuZ9brQ58eZUNthrzYAvg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.577.0.tgz", - "integrity": "sha512-pn3ZVEd2iobKJlR3H+bDilHjgRnNrQ6HMmK9ZzZw89Ckn3Dcbv48xOv4RJvu0aU8SDLl/SNCxppKjeLDTPGBNA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.577.0.tgz", - "integrity": "sha512-P55HAXgwmiHHpFx5JEPvOnAbfhN7v6sWv9PBQs+z2tC7QiBcPS0cdJR6PfV7J1n4VPK52/OnrK3l9VxdQ7Ms0g==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/region-config-resolver": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.577.0.tgz", - "integrity": "sha512-4ChCFACNwzqx/xjg3zgFcW8Ali6R9C95cFECKWT/7CUM1D0MGvkclSH2cLarmHCmJgU6onKkJroFtWp0kHhgyg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/token-providers": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.577.0.tgz", - "integrity": "sha512-0CkIZpcC3DNQJQ1hDjm2bdSy/Xjs7Ny5YvSsacasGOkNfk+FdkiQy6N67bZX3Zbc9KIx+Nz4bu3iDeNSNplnnQ==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.577.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/types": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.577.0.tgz", - "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/util-endpoints": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.577.0.tgz", - "integrity": "sha512-FjuUz1Kdy4Zly2q/c58tpdqHd6z7iOdU/caYzoc8jwgAHBDBbIJNQLCU9hXJnPV2M8pWxQDyIZsoVwtmvErPzw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.577.0.tgz", - "integrity": "sha512-zEAzHgR6HWpZOH7xFgeJLc6/CzMcx4nxeQolZxVZoB5pPaJd3CjyRhZN0xXeZB0XIRCWmb4yJBgyiugXLNMkLA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/client-secrets-manager/node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.577.0.tgz", - "integrity": "sha512-XqvtFjbSMtycZTWVwDe8DRWovuoMbA54nhUoZwVU6rW9OSD6NZWGR512BUGHFaWzW0Wg8++Dj10FrKTG2XtqfA==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "aws-crt": ">=1.0.0" - }, - "peerDependenciesMeta": { - "aws-crt": { - "optional": true - } + "engines": { + "node": ">=16.0.0" } }, "node_modules/@aws-sdk/client-secrets-manager/node_modules/uuid": { @@ -1383,22 +507,22 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.575.0.tgz", - "integrity": "sha512-elFWpAtktD3XBy47etG80GKXK9Lh3sNCMXLjcSs0NS0fdRIQJS2zKxC8qK22UQmdFKpXxthND5FKk7fNEqrR+g==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.577.0.tgz", + "integrity": "sha512-BwujdXrydlk6UEyPmewm5GqG4nkQ6OVyRhS/SyZP/6UKSFv2/sf391Cmz0hN0itUTH1rR4XeLln8XCOtarkrzg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.575.0", - "@aws-sdk/middleware-host-header": "3.575.0", - "@aws-sdk/middleware-logger": "3.575.0", - "@aws-sdk/middleware-recursion-detection": "3.575.0", - "@aws-sdk/middleware-user-agent": "3.575.0", - "@aws-sdk/region-config-resolver": "3.575.0", - "@aws-sdk/types": "3.575.0", - "@aws-sdk/util-endpoints": "3.575.0", - "@aws-sdk/util-user-agent-browser": "3.575.0", - "@aws-sdk/util-user-agent-node": "3.575.0", + "@aws-sdk/core": "3.576.0", + "@aws-sdk/middleware-host-header": "3.577.0", + "@aws-sdk/middleware-logger": "3.577.0", + "@aws-sdk/middleware-recursion-detection": "3.577.0", + "@aws-sdk/middleware-user-agent": "3.577.0", + "@aws-sdk/region-config-resolver": "3.577.0", + "@aws-sdk/types": "3.577.0", + "@aws-sdk/util-endpoints": "3.577.0", + "@aws-sdk/util-user-agent-browser": "3.577.0", + "@aws-sdk/util-user-agent-node": "3.577.0", "@smithy/config-resolver": "^3.0.0", "@smithy/core": "^2.0.0", "@smithy/fetch-http-handler": "^3.0.0", @@ -1431,24 +555,24 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.575.0.tgz", - "integrity": "sha512-YCstVaW5tAvXs+v4LR9gNAO+VRhIObjk1/knCdVQ5QQRTevtVQtdJWeNrDZYo4ATo0OHGyqGCj5Z09TWMv+e1Q==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.577.0.tgz", + "integrity": "sha512-njmKSPDWueWWYVFpFcZ2P3fI6/pdQVDa0FgCyYZhOnJLgEHZIcBBg1AsnkVWacBuLopp9XVt2m+7hO6ugY1/1g==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.575.0", - "@aws-sdk/core": "3.575.0", - "@aws-sdk/credential-provider-node": "3.575.0", - "@aws-sdk/middleware-host-header": "3.575.0", - "@aws-sdk/middleware-logger": "3.575.0", - "@aws-sdk/middleware-recursion-detection": "3.575.0", - "@aws-sdk/middleware-user-agent": "3.575.0", - "@aws-sdk/region-config-resolver": "3.575.0", - "@aws-sdk/types": "3.575.0", - "@aws-sdk/util-endpoints": "3.575.0", - "@aws-sdk/util-user-agent-browser": "3.575.0", - "@aws-sdk/util-user-agent-node": "3.575.0", + "@aws-sdk/client-sts": "3.577.0", + "@aws-sdk/core": "3.576.0", + "@aws-sdk/credential-provider-node": "3.577.0", + "@aws-sdk/middleware-host-header": "3.577.0", + "@aws-sdk/middleware-logger": "3.577.0", + "@aws-sdk/middleware-recursion-detection": "3.577.0", + "@aws-sdk/middleware-user-agent": "3.577.0", + "@aws-sdk/region-config-resolver": "3.577.0", + "@aws-sdk/types": "3.577.0", + "@aws-sdk/util-endpoints": "3.577.0", + "@aws-sdk/util-user-agent-browser": "3.577.0", + "@aws-sdk/util-user-agent-node": "3.577.0", "@smithy/config-resolver": "^3.0.0", "@smithy/core": "^2.0.0", "@smithy/fetch-http-handler": "^3.0.0", @@ -1481,24 +605,24 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.575.0.tgz", - "integrity": "sha512-8MrT4J2dRiskf0JFMGL5VNBqPvc6igNa218LGBJzHXmLsm1WfGCGnce84R7U2USr8oPOenu0XzSCLvMQyZbGWQ==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.577.0.tgz", + "integrity": "sha512-509Kklimva1XVlhGbpTpeX3kOP6ORpm44twJxDHpa9TURbmoaxj7veWlnLCbDorxDTrbsDghvYZshvcLsojVpg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.575.0", - "@aws-sdk/core": "3.575.0", - "@aws-sdk/credential-provider-node": "3.575.0", - "@aws-sdk/middleware-host-header": "3.575.0", - "@aws-sdk/middleware-logger": "3.575.0", - "@aws-sdk/middleware-recursion-detection": "3.575.0", - "@aws-sdk/middleware-user-agent": "3.575.0", - "@aws-sdk/region-config-resolver": "3.575.0", - "@aws-sdk/types": "3.575.0", - "@aws-sdk/util-endpoints": "3.575.0", - "@aws-sdk/util-user-agent-browser": "3.575.0", - "@aws-sdk/util-user-agent-node": "3.575.0", + "@aws-sdk/client-sso-oidc": "3.577.0", + "@aws-sdk/core": "3.576.0", + "@aws-sdk/credential-provider-node": "3.577.0", + "@aws-sdk/middleware-host-header": "3.577.0", + "@aws-sdk/middleware-logger": "3.577.0", + "@aws-sdk/middleware-recursion-detection": "3.577.0", + "@aws-sdk/middleware-user-agent": "3.577.0", + "@aws-sdk/region-config-resolver": "3.577.0", + "@aws-sdk/types": "3.577.0", + "@aws-sdk/util-endpoints": "3.577.0", + "@aws-sdk/util-user-agent-browser": "3.577.0", + "@aws-sdk/util-user-agent-node": "3.577.0", "@smithy/config-resolver": "^3.0.0", "@smithy/core": "^2.0.0", "@smithy/fetch-http-handler": "^3.0.0", @@ -1531,9 +655,9 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.575.0.tgz", - "integrity": "sha512-117U+kQki2XoKcYQfepmlRcNxn6rELGlOFOBQ8Z2JTBXEYHblW2ke067a0CLmxFwp/zCWuc7IGjd3in3x4Q3rg==", + "version": "3.576.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.576.0.tgz", + "integrity": "sha512-KDvDlbeipSTIf+ffKtTg1m419TK7s9mZSWC8bvuZ9qx6/sjQFOXIKOVqyuli6DnfxGbvRcwoRuY99OcCH1N/0w==", "dependencies": { "@smithy/core": "^2.0.0", "@smithy/protocol-http": "^4.0.0", @@ -1548,26 +672,12 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.587.0.tgz", - "integrity": "sha512-Hyg/5KFECIk2k5o8wnVEiniV86yVkhn5kzITUydmNGCkXdBFHMHRx6hleQ1bqwJHbBskyu8nbYamzcwymmGwmw==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.1.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-env/node_modules/@aws-sdk/types": { "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.577.0.tgz", - "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.577.0.tgz", + "integrity": "sha512-Jxu255j0gToMGEiqufP8ZtKI8HW90lOLjwJ3LrdlD/NLsAY0tOQf1fWc53u28hWmmNGMxmCrL2p66IOgMDhDUw==", "dependencies": { + "@aws-sdk/types": "3.577.0", + "@smithy/property-provider": "^3.0.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" }, @@ -1576,48 +686,34 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.587.0.tgz", - "integrity": "sha512-Su1SRWVRCuR1e32oxX3C1V4c5hpPN20WYcRfdcr2wXwHqSvys5DrnmuCC+JoEnS/zt3adUJhPliTqpfKgSdMrA==", - "license": "Apache-2.0", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.577.0.tgz", + "integrity": "sha512-n++yhCp67b9+ZRGEdY1jhamB5E/O+QsIDOPSuRmdaSGMCOd82oUEKPgIVEU1bkqxDsBxgiEWuvtfhK6sNiDS0A==", "dependencies": { "@aws-sdk/types": "3.577.0", - "@smithy/fetch-http-handler": "^3.0.1", + "@smithy/fetch-http-handler": "^3.0.0", "@smithy/node-http-handler": "^3.0.0", - "@smithy/property-provider": "^3.1.0", + "@smithy/property-provider": "^3.0.0", "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.1.1", + "@smithy/smithy-client": "^3.0.0", "@smithy/types": "^3.0.0", - "@smithy/util-stream": "^3.0.1", + "@smithy/util-stream": "^3.0.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/credential-provider-http/node_modules/@aws-sdk/types": { + "node_modules/@aws-sdk/credential-provider-ini": { "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.577.0.tgz", - "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.577.0.tgz", + "integrity": "sha512-q7lHPtv6BjRvChUE3m0tIaEZKxPTaZ1B3lKxGYsFl3VLAu5N8yGCUKwuA1izf4ucT+LyKscVGqK6VDZx1ev3nw==", "dependencies": { - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.575.0.tgz", - "integrity": "sha512-BdM6a/5VUuNge3c6yRuxvO+4srLoSfqHfkQGfUDfhTdTJpljlpfnc9h3z2Ni1+aueOHPZMNFWIktHDcX5wUGBg==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.575.0", - "@aws-sdk/credential-provider-process": "3.575.0", - "@aws-sdk/credential-provider-sso": "3.575.0", - "@aws-sdk/credential-provider-web-identity": "3.575.0", - "@aws-sdk/types": "3.575.0", + "@aws-sdk/credential-provider-env": "3.577.0", + "@aws-sdk/credential-provider-process": "3.577.0", + "@aws-sdk/credential-provider-sso": "3.577.0", + "@aws-sdk/credential-provider-web-identity": "3.577.0", + "@aws-sdk/types": "3.577.0", "@smithy/credential-provider-imds": "^3.0.0", "@smithy/property-provider": "^3.0.0", "@smithy/shared-ini-file-loader": "^3.0.0", @@ -1628,99 +724,22 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "3.575.0" - } - }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-env": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.575.0.tgz", - "integrity": "sha512-YTgpq3rvYBXzW6OTDB00cE79evQtss/lz2GlJXgqqVXD0m7i77hGA8zb44VevP/WxtDaiSW7SSjuu8VCBGsg4g==", - "dependencies": { - "@aws-sdk/types": "3.575.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-process": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.575.0.tgz", - "integrity": "sha512-2/5NJV7MZysKglqJSQ/O8OELNcwLcH3xknabL9NagtzB7RNB2p1AUXR0UlTey9sSDLL4oCmNa/+unYuglW/Ahg==", - "dependencies": { - "@aws-sdk/types": "3.575.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" + "@aws-sdk/client-sts": "^3.577.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.575.0.tgz", - "integrity": "sha512-rEdNpqW2jEc5kwbf/s9XQywMLQlIkMjuCK6mw9sF2OVRGHGVnh+6eh/1JFx8Kj+eU51ctifQ7KaHe8dGco8HYQ==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.575.0", - "@aws-sdk/credential-provider-http": "3.575.0", - "@aws-sdk/credential-provider-ini": "3.575.0", - "@aws-sdk/credential-provider-process": "3.575.0", - "@aws-sdk/credential-provider-sso": "3.575.0", - "@aws-sdk/credential-provider-web-identity": "3.575.0", - "@aws-sdk/types": "3.575.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-env": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.575.0.tgz", - "integrity": "sha512-YTgpq3rvYBXzW6OTDB00cE79evQtss/lz2GlJXgqqVXD0m7i77hGA8zb44VevP/WxtDaiSW7SSjuu8VCBGsg4g==", - "dependencies": { - "@aws-sdk/types": "3.575.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-http": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.575.0.tgz", - "integrity": "sha512-xQfVmYI+9KqRvhWY8fyElnpcVUBBUgi/Hoji3oU6WLrUjrX98k93He7gKDQSyHf7ykMLUAJYWwsV4AjQ2j6njA==", - "dependencies": { - "@aws-sdk/types": "3.575.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/util-stream": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-process": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.575.0.tgz", - "integrity": "sha512-2/5NJV7MZysKglqJSQ/O8OELNcwLcH3xknabL9NagtzB7RNB2p1AUXR0UlTey9sSDLL4oCmNa/+unYuglW/Ahg==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.577.0.tgz", + "integrity": "sha512-epZ1HOMsrXBNczc0HQpv0VMjqAEpc09DUA7Rg3gUJfn8umhML7A7bXnUyqPA+S54q397UYg1leQKdSn23OiwQQ==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/credential-provider-env": "3.577.0", + "@aws-sdk/credential-provider-http": "3.577.0", + "@aws-sdk/credential-provider-ini": "3.577.0", + "@aws-sdk/credential-provider-process": "3.577.0", + "@aws-sdk/credential-provider-sso": "3.577.0", + "@aws-sdk/credential-provider-web-identity": "3.577.0", + "@aws-sdk/types": "3.577.0", + "@smithy/credential-provider-imds": "^3.0.0", "@smithy/property-provider": "^3.0.0", "@smithy/shared-ini-file-loader": "^3.0.0", "@smithy/types": "^3.0.0", @@ -1731,27 +750,13 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.587.0.tgz", - "integrity": "sha512-V4xT3iCqkF8uL6QC4gqBJg/2asd/damswP1h9HCfqTllmPWzImS+8WD3VjgTLw5b0KbTy+ZdUhKc0wDnyzkzxg==", - "license": "Apache-2.0", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.1.0", - "@smithy/shared-ini-file-loader": "^3.1.0", - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-process/node_modules/@aws-sdk/types": { "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.577.0.tgz", - "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.577.0.tgz", + "integrity": "sha512-Gin6BWtOiXxIgITrJ3Nwc+Y2P1uVT6huYR4EcbA/DJUPWyO0n9y5UFLewPvVbLkRn15JeEqErBLUrHclkiOKtw==", "dependencies": { + "@aws-sdk/types": "3.577.0", + "@smithy/property-provider": "^3.0.0", + "@smithy/shared-ini-file-loader": "^3.0.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" }, @@ -1760,13 +765,13 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.575.0.tgz", - "integrity": "sha512-NtXA9OPIKsqavs2F7hhLT/t2ZDjwJsvQevj31ov1NpmTNYMc7OWFWDptOG7rppsWMsk5KKmfiL2qViQJnezXNA==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.577.0.tgz", + "integrity": "sha512-iVm5SQvS7EgZTJsRaqUOmDQpBQPPPat42SCbWFvFQOLrl8qewq8OP94hFS5w2mP62zngeYzqhJnDel79HXbxew==", "dependencies": { - "@aws-sdk/client-sso": "3.575.0", - "@aws-sdk/token-providers": "3.575.0", - "@aws-sdk/types": "3.575.0", + "@aws-sdk/client-sso": "3.577.0", + "@aws-sdk/token-providers": "3.577.0", + "@aws-sdk/types": "3.577.0", "@smithy/property-provider": "^3.0.0", "@smithy/shared-ini-file-loader": "^3.0.0", "@smithy/types": "^3.0.0", @@ -1777,11 +782,11 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.575.0.tgz", - "integrity": "sha512-QcvVH7wpvpFRXGAGgCBfQeiF/ptD0NJ+Hrc8dDYfPGhFeZ0EoVQBYNphLi25xe7JZ+XbaqCKrURHZtr4fAEOJw==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.577.0.tgz", + "integrity": "sha512-ZGHGNRaCtJJmszb9UTnC7izNCtRUttdPlLdMkh41KPS32vfdrBDHs1JrpbZijItRj1xKuOXsiYSXLAaHGcLh8Q==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/property-provider": "^3.0.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" @@ -1790,14 +795,13 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "3.575.0" + "@aws-sdk/client-sts": "^3.577.0" } }, "node_modules/@aws-sdk/endpoint-cache": { "version": "3.572.0", "resolved": "https://registry.npmjs.org/@aws-sdk/endpoint-cache/-/endpoint-cache-3.572.0.tgz", "integrity": "sha512-CzuRWMj/xtN9p9eP915nlPmlyniTzke732Ow/M60++gGgB3W+RtZyFftw3TEx+NzNhd1tH54dEcGiWdiNaBz3Q==", - "license": "Apache-2.0", "dependencies": { "mnemonist": "0.38.3", "tslib": "^2.6.2" @@ -1825,14 +829,13 @@ } }, "node_modules/@aws-sdk/middleware-endpoint-discovery": { - "version": "3.587.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint-discovery/-/middleware-endpoint-discovery-3.587.0.tgz", - "integrity": "sha512-/FCTOwO2/GtGx31Y0aO149aXw/LbyyYFJp82fQQCR0eff9RilJ5ViQCdCpcf9zf0ZIlvqGy9aXVutBQU83wlGg==", - "license": "Apache-2.0", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint-discovery/-/middleware-endpoint-discovery-3.577.0.tgz", + "integrity": "sha512-duLI1awiBV7xyi+SQQnFy0J2s9Fhk5miHR5LsyEpk4p4M1Zi9hbBMg3wOdoxGCnNGn56PcP70isD79BfrbWwlA==", "dependencies": { "@aws-sdk/endpoint-cache": "3.572.0", "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.1.0", + "@smithy/node-config-provider": "^3.0.0", "@smithy/protocol-http": "^4.0.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" @@ -1841,25 +844,12 @@ "node": ">=16.0.0" } }, - "node_modules/@aws-sdk/middleware-endpoint-discovery/node_modules/@aws-sdk/types": { - "version": "3.577.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.577.0.tgz", - "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", - "license": "Apache-2.0", - "dependencies": { - "@smithy/types": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.575.0.tgz", - "integrity": "sha512-V2WoLBiXNCc4rIWZt6FUcP4TN0Vk02A9PPCBWkTfyOooiqfq+WZmZjRRBpwl1+5UsvARslrKWF0VzheMRXPJLQ==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.577.0.tgz", + "integrity": "sha512-9ca5MJz455CODIVXs0/sWmJm7t3QO4EUa1zf8pE8grLpzf0J94bz/skDWm37Pli13T3WaAQBHCTiH2gUVfCsWg==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/protocol-http": "^4.0.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" @@ -1869,11 +859,11 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.575.0.tgz", - "integrity": "sha512-7DEKx9Z11Maaye7FfhYtC8rjbM/PcFcMO2N4QEAfypcgWCj+w4gseE2OGdfAH9OFDoFc6YvLp53v16vbPjzQSg==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.577.0.tgz", + "integrity": "sha512-aPFGpGjTZcJYk+24bg7jT4XdIp42mFXSuPt49lw5KygefLyJM/sB0bKKqPYYivW0rcuZ9brQ58eZUNthrzYAvg==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" }, @@ -1882,11 +872,11 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.575.0.tgz", - "integrity": "sha512-ri89ldRFos6KZDGaknWPS2XPO9qr+gZ7+mPaoU8YkSM1W4uKqtnUSONyc+O3CFGJrqReuGHhRq0l2Sld0bjwOw==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.577.0.tgz", + "integrity": "sha512-pn3ZVEd2iobKJlR3H+bDilHjgRnNrQ6HMmK9ZzZw89Ckn3Dcbv48xOv4RJvu0aU8SDLl/SNCxppKjeLDTPGBNA==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/protocol-http": "^4.0.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" @@ -1896,12 +886,12 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.575.0.tgz", - "integrity": "sha512-fWlr4RfrUNS2R3PgP+WsoMYORAgv/47Lp0J0fb3dXO1YvdczNWddRbFSUX2MQxM/y9XFfQPLpLgzluhoL3Cjeg==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.577.0.tgz", + "integrity": "sha512-P55HAXgwmiHHpFx5JEPvOnAbfhN7v6sWv9PBQs+z2tC7QiBcPS0cdJR6PfV7J1n4VPK52/OnrK3l9VxdQ7Ms0g==", "dependencies": { - "@aws-sdk/types": "3.575.0", - "@aws-sdk/util-endpoints": "3.575.0", + "@aws-sdk/types": "3.577.0", + "@aws-sdk/util-endpoints": "3.577.0", "@smithy/protocol-http": "^4.0.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" @@ -1911,11 +901,11 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.575.0.tgz", - "integrity": "sha512-sBJKwTWKCWu9y8FzXIijYGwkKr3tDkPXM7BylToe6W+tGkp4OirV4iXrWA9zReNwTTepoxHufofqjGK9BtcI8g==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.577.0.tgz", + "integrity": "sha512-4ChCFACNwzqx/xjg3zgFcW8Ali6R9C95cFECKWT/7CUM1D0MGvkclSH2cLarmHCmJgU6onKkJroFtWp0kHhgyg==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/node-config-provider": "^3.0.0", "@smithy/types": "^3.0.0", "@smithy/util-config-provider": "^3.0.0", @@ -1927,11 +917,11 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.575.0.tgz", - "integrity": "sha512-EPNDPQoQkjKqn4D2t70qVzbfdtlaAy9KBdG58qD1yNWVxq8Rh/lXdwmB+aE2PSahtyfVikZdCRoZiFzxDh5IUA==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.577.0.tgz", + "integrity": "sha512-0CkIZpcC3DNQJQ1hDjm2bdSy/Xjs7Ny5YvSsacasGOkNfk+FdkiQy6N67bZX3Zbc9KIx+Nz4bu3iDeNSNplnnQ==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/property-provider": "^3.0.0", "@smithy/shared-ini-file-loader": "^3.0.0", "@smithy/types": "^3.0.0", @@ -1941,13 +931,13 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sso-oidc": "3.575.0" + "@aws-sdk/client-sso-oidc": "^3.577.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.575.0.tgz", - "integrity": "sha512-XrnolQGs0wXxdgNudirR14OgNOarH7WUif38+2Pd4onZH+L7XoILem0EgA1tRpgFpw2pFHlZCNaAHDNSBEal7g==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.577.0.tgz", + "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", "dependencies": { "@smithy/types": "^3.0.0", "tslib": "^2.6.2" @@ -1972,11 +962,11 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.575.0.tgz", - "integrity": "sha512-wC5x+V6w3kRlR6X6XVINsAPDYG+Tzs3Wthlw+YLtjuPODUNZIQAqsABHahxnekFyAvse+1929Hwo+CaL+BHZGA==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.577.0.tgz", + "integrity": "sha512-FjuUz1Kdy4Zly2q/c58tpdqHd6z7iOdU/caYzoc8jwgAHBDBbIJNQLCU9hXJnPV2M8pWxQDyIZsoVwtmvErPzw==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/types": "^3.0.0", "@smithy/util-endpoints": "^2.0.0", "tslib": "^2.6.2" @@ -1997,22 +987,22 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.575.0.tgz", - "integrity": "sha512-iADonXyaXgwvC4T0qRuDWCdKInz82GX2cyezq/oqVlL8bPY7HD8jwZZruuJdq5tkaJi1EhbO4+f1ksZqOiZKvQ==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.577.0.tgz", + "integrity": "sha512-zEAzHgR6HWpZOH7xFgeJLc6/CzMcx4nxeQolZxVZoB5pPaJd3CjyRhZN0xXeZB0XIRCWmb4yJBgyiugXLNMkLA==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/types": "^3.0.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.575.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.575.0.tgz", - "integrity": "sha512-kwzvBfA0LoILDOFS6BV8uOkksBHrYulP6kNXegB5eZnDSNia5DbBsXqxQ/HknNF5a429SWQw2aaQJEgQvZB1VA==", + "version": "3.577.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.577.0.tgz", + "integrity": "sha512-XqvtFjbSMtycZTWVwDe8DRWovuoMbA54nhUoZwVU6rW9OSD6NZWGR512BUGHFaWzW0Wg8++Dj10FrKTG2XtqfA==", "dependencies": { - "@aws-sdk/types": "3.575.0", + "@aws-sdk/types": "3.577.0", "@smithy/node-config-provider": "^3.0.0", "@smithy/types": "^3.0.0", "tslib": "^2.6.2" @@ -7139,9 +6129,9 @@ "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==" }, "node_modules/aws-sdk": { - "version": "2.1619.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1619.0.tgz", - "integrity": "sha512-7dcmJSmZYO/8fSB4Do1wxHMr85AxvNehAIvkurpWGgD3S+cNL4yW1gpRyo9SUDlHakqatEgAb2+yyaFs2nl6Eg==", + "version": "2.1623.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1623.0.tgz", + "integrity": "sha512-SFPc+QJqoghsE0nn6YSmrDDDPpWc3m4rcDQYg6W3GQek+f1v6kycxM5+N58pMZ2iWhRSOTf9NQRcZj0ZU3PklQ==", "hasInstallScript": true, "dependencies": { "buffer": "4.9.2", @@ -16484,7 +15474,6 @@ "version": "0.38.3", "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.3.tgz", "integrity": "sha512-2K9QYubXx/NAjv4VLq1d1Ly8pWNC5L3BrixtdkyTegXWJIqY+zLNDhhX/A+ZwWt70tB1S8H4BE8FLYEFyNoOBw==", - "license": "MIT", "dependencies": { "obliterator": "^1.6.1" } @@ -16975,8 +15964,7 @@ "node_modules/obliterator": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz", - "integrity": "sha512-9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig==", - "license": "MIT" + "integrity": "sha512-9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig==" }, "node_modules/oidc-token-hash": { "version": "5.0.3", diff --git a/package.json b/package.json index c47a856f0..48f71800a 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,10 @@ "postinstall": "patch-package" }, "dependencies": { - "@aws-sdk/client-amplify": "^3.575.0", - "@aws-sdk/client-cloudwatch-logs": "^3.575.0", - "@aws-sdk/client-dynamodb": "^3.575.0", - "@aws-sdk/client-secrets-manager": "^3.578.0", + "@aws-sdk/client-amplify": "^3.577.0", + "@aws-sdk/client-cloudwatch-logs": "^3.577.0", + "@aws-sdk/client-dynamodb": "^3.577.0", + "@aws-sdk/client-secrets-manager": "^3.577.0", "@aws-sdk/lib-dynamodb": "^3.577.0", "@growthbook/growthbook": "^0.36.0", "@octokit/plugin-retry": "^6.0.0", @@ -43,7 +43,7 @@ "@slack/bolt": "^3.19.0", "auto-bind": "^4.0.0", "aws-lambda": "^1.0.7", - "aws-sdk": "^2.1619.0", + "aws-sdk": "^2.1623.0", "axios": "^1.6.8", "base-64": "^1.0.0", "bcryptjs": "^2.4.3", From 10d7f326f50d1ed9893e66179b9e192c1591e34b Mon Sep 17 00:00:00 2001 From: dcshzj <27919917+dcshzj@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:45:54 +0800 Subject: [PATCH 7/7] chore: bump version to v0.90.0 --- CHANGELOG.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eacc0477..907b1db5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,65 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [v0.90.0](https://github.com/isomerpages/isomercms-backend/compare/v0.89.0...v0.90.0) + +- chore(deps): minor upgrade aws [`#1416`](https://github.com/isomerpages/isomercms-backend/pull/1416) +- feat(monitoring): add scheduler functionality [`#1383`](https://github.com/isomerpages/isomercms-backend/pull/1383) +- feat(monitoring): add dns reporter [`#1376`](https://github.com/isomerpages/isomercms-backend/pull/1376) +- chore: update slack-bolt [`#1415`](https://github.com/isomerpages/isomercms-backend/pull/1415) +- chore(deps): bump braces from 3.0.2 to 3.0.3 [`#1413`](https://github.com/isomerpages/isomercms-backend/pull/1413) +- fix: package.json & package-lock.json to reduce vulnerabilities [`#1414`](https://github.com/isomerpages/isomercms-backend/pull/1414) +- backport v0.89.0 [`#1412`](https://github.com/isomerpages/isomercms-backend/pull/1412) +- release v0.88.0 [`#1395`](https://github.com/isomerpages/isomercms-backend/pull/1395) +- release v0.87.0 [`#1384`](https://github.com/isomerpages/isomercms-backend/pull/1384) +- release v0.86.0 [`#1369`](https://github.com/isomerpages/isomercms-backend/pull/1369) +- release v0.85.0 [`#1362`](https://github.com/isomerpages/isomercms-backend/pull/1362) +- release v0.84.0 [`#1356`](https://github.com/isomerpages/isomercms-backend/pull/1356) +- release v0.83.0 [`#1335`](https://github.com/isomerpages/isomercms-backend/pull/1335) +- release v0.82.0 [`#1329`](https://github.com/isomerpages/isomercms-backend/pull/1329) +- Release/0.81.1 [`#1324`](https://github.com/isomerpages/isomercms-backend/pull/1324) +- release v0.81.0 [`#1321`](https://github.com/isomerpages/isomercms-backend/pull/1321) +- release v0.80.0 [`#1318`](https://github.com/isomerpages/isomercms-backend/pull/1318) +- * fix: off-by-one error for month number (#1294) [`#1309`](https://github.com/isomerpages/isomercms-backend/pull/1309) +- V0.78.1 release [`#1298`](https://github.com/isomerpages/isomercms-backend/pull/1298) +- release v0.78.0 [`#1292`](https://github.com/isomerpages/isomercms-backend/pull/1292) +- release v0.77.0 [`#1276`](https://github.com/isomerpages/isomercms-backend/pull/1276) +- * fix(server): server should die if unable to connect to db (#1265) [`#1273`](https://github.com/isomerpages/isomercms-backend/pull/1273) +- release v0.75.0 [`#1263`](https://github.com/isomerpages/isomercms-backend/pull/1263) +- release v0.74.0 [`#1257`](https://github.com/isomerpages/isomercms-backend/pull/1257) +- * chore(package): use npm (#1237) [`#1248`](https://github.com/isomerpages/isomercms-backend/pull/1248) +- * build(deps): bump @aws-sdk/client-secrets-manager (#1218) [`#1235`](https://github.com/isomerpages/isomercms-backend/pull/1235) +- release v0.71.0 [`#1213`](https://github.com/isomerpages/isomercms-backend/pull/1213) +- * fix(otp): increment instead of update for concurrency (#1186) [`#1202`](https://github.com/isomerpages/isomercms-backend/pull/1202) +- Release/0.69.0 [`#1191`](https://github.com/isomerpages/isomercms-backend/pull/1191) +- Hotfix/0.68.2 [`#1185`](https://github.com/isomerpages/isomercms-backend/pull/1185) +- fix(repoChecker): unintended alarms [`#1176`](https://github.com/isomerpages/isomercms-backend/pull/1176) +- 0.68.0 [`#1174`](https://github.com/isomerpages/isomercms-backend/pull/1174) +- Release/0.67.1 [`#1165`](https://github.com/isomerpages/isomercms-backend/pull/1165) +- Release/0.67.0 (prod) [`#1163`](https://github.com/isomerpages/isomercms-backend/pull/1163) +- release(0.66.4): merge to prod [`#1153`](https://github.com/isomerpages/isomercms-backend/pull/1153) +- release(0.66.3): release to prod [`#1150`](https://github.com/isomerpages/isomercms-backend/pull/1150) +- Release/0.66.2 [`#1145`](https://github.com/isomerpages/isomercms-backend/pull/1145) +- Release/0.66.1 [`#1143`](https://github.com/isomerpages/isomercms-backend/pull/1143) +- Release/0.66.0 [`#1141`](https://github.com/isomerpages/isomercms-backend/pull/1141) +- Release/0.65.0 (prod) [`#1139`](https://github.com/isomerpages/isomercms-backend/pull/1139) +- release(v0.64.0): merge to master [`#1130`](https://github.com/isomerpages/isomercms-backend/pull/1130) +- Release/0.63.0 [`#1124`](https://github.com/isomerpages/isomercms-backend/pull/1124) +- Release/0.62.0 [`#1111`](https://github.com/isomerpages/isomercms-backend/pull/1111) +- Release/0.61.0 [`#1105`](https://github.com/isomerpages/isomercms-backend/pull/1105) +- Release/0.60.0 [`#1074`](https://github.com/isomerpages/isomercms-backend/pull/1074) +- Release/0.59.0 [`#1062`](https://github.com/isomerpages/isomercms-backend/pull/1062) +- Release/0.58.0 [`#1057`](https://github.com/isomerpages/isomercms-backend/pull/1057) +- Release/0.57.0 [`#1053`](https://github.com/isomerpages/isomercms-backend/pull/1053) +- release(v0.56.0): merge to prod [`#1050`](https://github.com/isomerpages/isomercms-backend/pull/1050) +- Release/0.55.0 [`#1038`](https://github.com/isomerpages/isomercms-backend/pull/1038) +- Release/0.54.0 [`#1034`](https://github.com/isomerpages/isomercms-backend/pull/1034) +- 0.53.0 [`#1023`](https://github.com/isomerpages/isomercms-backend/pull/1023) + #### [v0.89.0](https://github.com/isomerpages/isomercms-backend/compare/v0.88.0...v0.89.0) +> 13 June 2024 + - fix: upgrade @aws-sdk/client-secrets-manager from 3.575.0 to 3.578.0 [`#1408`](https://github.com/isomerpages/isomercms-backend/pull/1408) - fix: upgrade @aws-sdk/lib-dynamodb from 3.575.0 to 3.577.0 [`#1404`](https://github.com/isomerpages/isomercms-backend/pull/1404) - ref(bot): use bolt for app [`#1391`](https://github.com/isomerpages/isomercms-backend/pull/1391) @@ -18,6 +75,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix: upgrade validator from 13.11.0 to 13.12.0 [`#1399`](https://github.com/isomerpages/isomercms-backend/pull/1399) - fix: upgrade glob from 10.3.12 to 10.3.14 [`#1398`](https://github.com/isomerpages/isomercms-backend/pull/1398) - backport v0.88.0 [`#1396`](https://github.com/isomerpages/isomercms-backend/pull/1396) +- chore: bump version to v0.89.0 [`ef3ec04`](https://github.com/isomerpages/isomercms-backend/commit/ef3ec04d8d9d486318a981fde584a79021327a3d) #### [v0.88.0](https://github.com/isomerpages/isomercms-backend/compare/v0.87.0...v0.88.0) diff --git a/package-lock.json b/package-lock.json index d2c2d64b3..ed8eb0c58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "isomercms", - "version": "0.89.0", + "version": "0.90.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "isomercms", - "version": "0.89.0", + "version": "0.90.0", "hasInstallScript": true, "dependencies": { "@aws-sdk/client-amplify": "^3.577.0", diff --git a/package.json b/package.json index 48f71800a..5a8ebf5fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "isomercms", - "version": "0.89.0", + "version": "0.90.0", "private": true, "scripts": { "build": "tsc -p tsconfig.build.json",