From a7c0c9ef1823abf333999492dfa43fa0fe9ba8b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 22:33:04 +0000 Subject: [PATCH 01/24] build(deps-dev): bump chromedriver from 87.0.7 to 119.0.1 in /frontend Bumps [chromedriver](https://github.com/giggio/node-chromedriver) from 87.0.7 to 119.0.1. - [Commits](https://github.com/giggio/node-chromedriver/compare/87.0.7...119.0.1) --- updated-dependencies: - dependency-name: chromedriver dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 85 +++++++++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 37 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index d8d84b1f3..da1b4d7e8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -129,7 +129,7 @@ "babel-register": "^6.26.0", "chai": "^4.2.0", "chalk": "^3.0.0", - "chromedriver": "^87.0.7", + "chromedriver": "^119.0.1", "compression-webpack-plugin": "^3.1.0", "copy-webpack-plugin": "^5.1.2", "cross-spawn": "^7.0.3", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index e1612dc95..8f8c1a940 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4777,10 +4777,10 @@ dependencies: defer-to-connect "^1.0.1" -"@testim/chrome-version@^1.0.7": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@testim/chrome-version/-/chrome-version-1.0.7.tgz#0cd915785ec4190f08a3a6acc9b61fc38fb5f1a9" - integrity sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw== +"@testim/chrome-version@^1.1.4": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@testim/chrome-version/-/chrome-version-1.1.4.tgz#86e04e677cd6c05fa230dd15ac223fa72d1d7090" + integrity sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g== "@testing-library/dom@^8.3.0": version "8.17.1" @@ -7116,13 +7116,22 @@ axe-core@^4.2.0: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f" integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w== -axios@^0.21.1, axios@^0.21.2: +axios@^0.21.2: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: follow-redirects "^1.14.0" +axios@^1.6.0: + version "1.6.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.1.tgz#76550d644bf0a2d469a01f9244db6753208397d7" + integrity sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" @@ -8565,19 +8574,18 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -chromedriver@^87.0.7: - version "87.0.7" - resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-87.0.7.tgz#74041e02ff7f633e91b98eb707e2476f713dc4ca" - integrity sha512-7J7iN2rJuSDsKb9BUUMewJt07PuTlZYd809D10dUCT1rjMD3i2jUw7dum9RxdC1xO3aFwMd8TwZ5NR82T+S+Dg== +chromedriver@^119.0.1: + version "119.0.1" + resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-119.0.1.tgz#064f3650790ccea055e9bfd95c600f5ea60295e9" + integrity sha512-lpCFFLaXPpvElTaUOWKdP74pFb/sJhWtWqMjn7Ju1YriWn8dT5JBk84BGXMPvZQs70WfCYWecxdMmwfIu1Mupg== dependencies: - "@testim/chrome-version" "^1.0.7" - axios "^0.21.1" - del "^6.0.0" + "@testim/chrome-version" "^1.1.4" + axios "^1.6.0" + compare-versions "^6.1.0" extract-zip "^2.0.1" - https-proxy-agent "^5.0.0" - mkdirp "^1.0.4" + https-proxy-agent "^5.0.1" proxy-from-env "^1.1.0" - tcp-port-used "^1.0.1" + tcp-port-used "^1.0.2" ci-info@^2.0.0: version "2.0.0" @@ -8975,6 +8983,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-versions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.0.tgz#3f2131e3ae93577df111dba133e6db876ffe127a" + integrity sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg== + complex.js@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.1.1.tgz#0675dac8e464ec431fb2ab7d30f41d889fb25c31" @@ -10066,20 +10079,6 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== - dependencies: - globby "^11.0.1" - graceful-fs "^4.2.4" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.2" - p-map "^4.0.0" - rimraf "^3.0.2" - slash "^3.0.0" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -11803,6 +11802,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== +follow-redirects@^1.15.0: + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -11878,6 +11882,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -12359,7 +12372,7 @@ globalthis@^1.0.0: dependencies: define-properties "^1.1.3" -globby@^11.0.1, globby@^11.0.2, globby@^11.0.3: +globby@^11.0.2, globby@^11.0.3: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -13097,10 +13110,10 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== +https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -13834,7 +13847,7 @@ is-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== -is-path-cwd@^2.0.0, is-path-cwd@^2.2.0: +is-path-cwd@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== @@ -21305,7 +21318,7 @@ taskkill@^3.1.0: arrify "^2.0.1" execa "^3.3.0" -tcp-port-used@^1.0.1: +tcp-port-used@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.2.tgz#9652b7436eb1f4cfae111c79b558a25769f6faea" integrity sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA== From 92dcacabe0e7174a73d3e393aced599f1d20f20c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 20:14:26 +0000 Subject: [PATCH 02/24] build(deps): bump cryptography from 41.0.6 to 42.0.4 in /eventhandlers Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.6 to 42.0.4. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/41.0.6...42.0.4) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- eventhandlers/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eventhandlers/requirements.txt b/eventhandlers/requirements.txt index 2703ce308..4d26f661b 100644 --- a/eventhandlers/requirements.txt +++ b/eventhandlers/requirements.txt @@ -16,7 +16,7 @@ Flask-SSLify==0.1.5 requests==2.31.0 imageio==2.9.0 analytics-python==1.2.9 -cryptography==41.0.6 +cryptography==42.0.4 colorlog==4.2.1 boto3==1.16.4 azure-storage-blob==12.8.0 From d76d9dcfbf4014a039e7fedded1340b82adb0880 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 20:34:35 +0000 Subject: [PATCH 03/24] build(deps): bump cryptography from 42.0.0 to 42.0.4 in /default Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.0 to 42.0.4. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/42.0.0...42.0.4) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- default/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default/requirements.txt b/default/requirements.txt index 24d28fd81..626e9fb6f 100644 --- a/default/requirements.txt +++ b/default/requirements.txt @@ -20,7 +20,7 @@ imageio==2.9.0 pyotp==2.2.6 analytics-python==1.2.9 memory-profiler==0.55.0 -cryptography==42.0.0 +cryptography==42.0.4 colorlog==4.2.1 boto3==1.16.4 alembic==1.11.1 From 439169f6b234720cc6fbadfe390466c15b0ffb59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 20:35:09 +0000 Subject: [PATCH 04/24] build(deps): bump cryptography from 42.0.0 to 42.0.4 in /walrus Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.0 to 42.0.4. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/42.0.0...42.0.4) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- walrus/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/walrus/requirements.txt b/walrus/requirements.txt index 8b03baadf..8fb99373d 100644 --- a/walrus/requirements.txt +++ b/walrus/requirements.txt @@ -22,7 +22,7 @@ memory-profiler==0.55.0 tenacity>=6.0.0 botocore==1.19.63 scaleapi==0.3.1 -cryptography==42.0.0 +cryptography==42.0.4 colorlog==4.2.1 labelbox==3.47.1 boto3==1.16.63 From 9af083c211682b0a44618448c22fb7967ff1f0a1 Mon Sep 17 00:00:00 2001 From: oss-maintainer-12 <161249534+oss-maintainer-12@users.noreply.github.com> Date: Sun, 25 Feb 2024 13:18:39 -0800 Subject: [PATCH 05/24] Update README.md remove legacy playground --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8227298e5..841e1748f 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,6 @@ read the commercial open source [license](https://github.com/diffgram/diffgram/b * [Install Diffgram](https://diffgram.readme.io/docs/install) * [Sales Info](https://diffgram.readme.io/docs/sales) -* [Try Online Playground](https://app.diffgram.com/user/data_platform/new) * [Join us on Slack](https://www.jotform.com/form/222377866413058) * [Contribute](https://diffgram.readme.io/docs/contribute) From 12e18f95fe825a3b3c14600320684bad8c4ebe80 Mon Sep 17 00:00:00 2001 From: OSS <161249534+oss-maintainer-12@users.noreply.github.com> Date: Mon, 26 Feb 2024 21:22:39 -0800 Subject: [PATCH 06/24] Add regressed instance ID update add_ids_to_new_instances_and_delete_old() is needed for Object level Global attributes too. In local testing this solved the global attribute update context when saving the same global attributes without reloading --- .../src/components/annotation/annotation_ui_factory.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frontend/src/components/annotation/annotation_ui_factory.vue b/frontend/src/components/annotation/annotation_ui_factory.vue index 5a0231fc8..a7c9d67f9 100644 --- a/frontend/src/components/annotation/annotation_ui_factory.vue +++ b/frontend/src/components/annotation/annotation_ui_factory.vue @@ -1292,6 +1292,15 @@ export default Vue.extend({ video_data, } const [result, error] = await saveFileAnnotations(this.computed_project_string_id, this.root_file.id, payload) + + AnnotationSavePrechecks.add_ids_to_new_instances_and_delete_old( + result, + false, + this.annotation_ui_context.compound_global_attributes_instance_list, + false, + false + ) + this.root_file.instance_list = this.annotation_ui_context.compound_global_attributes_instance_list if (error) { console.error(error) From 7ecd6cce0ca59c54c7babd7ac1938c1529fb2c4e Mon Sep 17 00:00:00 2001 From: OSS <161249534+oss-maintainer-12@users.noreply.github.com> Date: Mon, 26 Feb 2024 21:22:53 -0800 Subject: [PATCH 07/24] legacy eventhub --- shared/database/event/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/database/event/event.py b/shared/database/event/event.py index 1690828a6..76afd7d03 100644 --- a/shared/database/event/event.py +++ b/shared/database/event/event.py @@ -324,7 +324,7 @@ def new(session, session.flush() Event.track_user(event, email) logger.debug(f'Created event {event.id}:{event.kind}') - event.send_to_eventhub() + #event.send_to_eventhub() event.broadcast() return event From 3e3849643be0db8cbd400481e03d383fbc545082 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:54:14 +0000 Subject: [PATCH 08/24] build(deps): bump express from 4.18.2 to 4.19.2 in /frontend Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- frontend/yarn.lock | 48 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 38 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index e1612dc95..ae334811a 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -7649,25 +7649,7 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== -body-parser@1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== - dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.1" - type-is "~1.6.18" - unpipe "1.0.0" - -body-parser@^1.19.0: +body-parser@1.20.2, body-parser@^1.19.0: version "1.20.2" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== @@ -9150,10 +9132,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== +cookie@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== copy-concurrently@^1.0.0: version "1.0.5" @@ -11306,16 +11288,16 @@ express-history-api-fallback@^2.2.1: integrity sha1-OirSf3vryQ/FM9EQ18bYMJe80Fc= express@^4.16.3, express@^4.17.1, express@^4.17.3: - version "4.18.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" - integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== + version "4.19.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.1" + body-parser "1.20.2" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.5.0" + cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" @@ -18948,16 +18930,6 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - raw-body@2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" From 7258d0f5db512f99959f1079820b326a85f2909b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:28:10 +0000 Subject: [PATCH 09/24] build(deps): bump pillow from 10.2.0 to 10.3.0 in /walrus Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.2.0 to 10.3.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/10.2.0...10.3.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- walrus/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/walrus/requirements.txt b/walrus/requirements.txt index 8b03baadf..ba3d8afcb 100644 --- a/walrus/requirements.txt +++ b/walrus/requirements.txt @@ -6,7 +6,7 @@ gunicorn==20.0.4 psycopg2-binary==2.9.6 numpy==1.24.3 scipy==1.10.1 -pillow==10.2.0 +pillow==10.3.0 moviepy==1.0.3 google-cloud-storage==1.35.1 google-api-python-client==1.12.3 From 43a79eb4a1f2dfef1dabf19e12f6b875cead2f33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 00:43:06 +0000 Subject: [PATCH 10/24] build(deps): bump gunicorn from 20.0.4 to 22.0.0 in /walrus Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.0.4 to 22.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/20.0.4...22.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- walrus/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/walrus/requirements.txt b/walrus/requirements.txt index 8b03baadf..b791d4a0b 100644 --- a/walrus/requirements.txt +++ b/walrus/requirements.txt @@ -2,7 +2,7 @@ grpcio==1.54.3 oauth2client==4.1.3 Flask==2.2.5 sqlalchemy==1.4.48 -gunicorn==20.0.4 +gunicorn==22.0.0 psycopg2-binary==2.9.6 numpy==1.24.3 scipy==1.10.1 From 5b5d92b0ba4ec28a00da65cd91d715c4c796bf7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 23:52:22 +0000 Subject: [PATCH 11/24] build(deps): bump requests from 2.31.0 to 2.32.2 in /local_dispatcher Bumps [requests](https://github.com/psf/requests) from 2.31.0 to 2.32.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.31.0...v2.32.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- local_dispatcher/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local_dispatcher/requirements.txt b/local_dispatcher/requirements.txt index 6e4e6aed0..f0cea88d8 100644 --- a/local_dispatcher/requirements.txt +++ b/local_dispatcher/requirements.txt @@ -1,4 +1,4 @@ Flask==2.2.5 -requests==2.31.0 +requests==2.32.2 markupsafe==2.1.2 python-dotenv==1.0.0 \ No newline at end of file From d51608ec54033122e7ed48b7e380626160ad9b1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 23:52:26 +0000 Subject: [PATCH 12/24] build(deps): bump pug from 3.0.2 to 3.0.3 in /frontend Bumps [pug](https://github.com/pugjs/pug) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/pugjs/pug/releases) - [Commits](https://github.com/pugjs/pug/compare/pug@3.0.2...pug@3.0.3) --- updated-dependencies: - dependency-name: pug dependency-type: indirect ... Signed-off-by: dependabot[bot] --- frontend/yarn.lock | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index ae334811a..c84874ff7 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -18678,17 +18678,17 @@ pug-attrs@^3.0.0: js-stringify "^1.0.2" pug-runtime "^3.0.0" -pug-code-gen@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz#ad190f4943133bf186b60b80de483100e132e2ce" - integrity sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg== +pug-code-gen@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.3.tgz#58133178cb423fe1716aece1c1da392a75251520" + integrity sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw== dependencies: constantinople "^4.0.1" doctypes "^1.1.0" js-stringify "^1.0.2" pug-attrs "^3.0.0" - pug-error "^2.0.0" - pug-runtime "^3.0.0" + pug-error "^2.1.0" + pug-runtime "^3.0.1" void-elements "^3.1.0" with "^7.0.0" @@ -18697,6 +18697,11 @@ pug-error@^2.0.0: resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5" integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ== +pug-error@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.1.0.tgz#17ea37b587b6443d4b8f148374ec27b54b406e55" + integrity sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg== + pug-filters@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e" @@ -18759,11 +18764,11 @@ pug-walk@^2.0.0: integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ== pug@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.2.tgz#f35c7107343454e43bc27ae0ff76c731b78ea535" - integrity sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw== + version "3.0.3" + resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.3.tgz#e18324a314cd022883b1e0372b8af3a1a99f7597" + integrity sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g== dependencies: - pug-code-gen "^3.0.2" + pug-code-gen "^3.0.3" pug-filters "^4.0.0" pug-lexer "^5.0.1" pug-linker "^4.0.0" From feafc3dd2cd590f881df1962f4f79ece8f5f26cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 23:52:31 +0000 Subject: [PATCH 13/24] build(deps): bump azure-storage-blob from 12.8.0 to 12.13.0 Bumps [azure-storage-blob](https://github.com/Azure/azure-sdk-for-python) from 12.8.0 to 12.13.0. - [Release notes](https://github.com/Azure/azure-sdk-for-python/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md) - [Commits](https://github.com/Azure/azure-sdk-for-python/compare/azure-storage-blob_12.8.0...azure-storage-blob_12.13.0) --- updated-dependencies: - dependency-name: azure-storage-blob dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- default/requirements.txt | 2 +- eventhandlers/requirements.txt | 2 +- requirements.txt | 2 +- walrus/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default/requirements.txt b/default/requirements.txt index 24d28fd81..123570d14 100644 --- a/default/requirements.txt +++ b/default/requirements.txt @@ -25,7 +25,7 @@ colorlog==4.2.1 boto3==1.16.4 alembic==1.11.1 sqlalchemy-utils==0.41.1 -azure-storage-blob==12.8.0 +azure-storage-blob==12.13.0 lark lark-parser SQLAlchemy-serializer==1.4.1 diff --git a/eventhandlers/requirements.txt b/eventhandlers/requirements.txt index 2703ce308..d3ef8e5c2 100644 --- a/eventhandlers/requirements.txt +++ b/eventhandlers/requirements.txt @@ -19,7 +19,7 @@ analytics-python==1.2.9 cryptography==41.0.6 colorlog==4.2.1 boto3==1.16.4 -azure-storage-blob==12.8.0 +azure-storage-blob==12.13.0 lark SQLAlchemy-serializer==1.4.1 newrelic diff --git a/requirements.txt b/requirements.txt index 8fb930632..873c3e9a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ boto3==1.18.1 google-cloud-storage==1.35.1 google-api-python-client==1.12.3 google-cloud-aiplatform -azure-storage-blob==12.8.1 +azure-storage-blob==12.13.0 python-dotenv==1.0.0 jwt \ No newline at end of file diff --git a/walrus/requirements.txt b/walrus/requirements.txt index 8b03baadf..eb18889fa 100644 --- a/walrus/requirements.txt +++ b/walrus/requirements.txt @@ -27,7 +27,7 @@ colorlog==4.2.1 labelbox==3.47.1 boto3==1.16.63 alembic==1.4.2 -azure-storage-blob==12.8.0 +azure-storage-blob==12.13.0 git+https://github.com/diffgram/pypcd psutil==5.6.6 SQLAlchemy-serializer==1.4.1 From 6b06863305b072d9205e0089123675daba343b67 Mon Sep 17 00:00:00 2001 From: Anthony Chaudhary <18080164+anthony-chaudhary@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:59:22 -0700 Subject: [PATCH 14/24] Update Dockerfile --- frontend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index ff0420b58..ed7ef3eae 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 as builder +FROM node:18 as builder ENV DOCKER_CONTEXT=True From 01f500742c6f53a5e199c02fc993e2a2e0c41dbf Mon Sep 17 00:00:00 2001 From: Anthony Chaudhary <18080164+anthony-chaudhary@users.noreply.github.com> Date: Mon, 10 Jun 2024 17:07:50 -0700 Subject: [PATCH 15/24] Update diffgram_testing.yaml --- .github/workflows/diffgram_testing.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/diffgram_testing.yaml b/.github/workflows/diffgram_testing.yaml index 70b2a5b35..d944ef536 100644 --- a/.github/workflows/diffgram_testing.yaml +++ b/.github/workflows/diffgram_testing.yaml @@ -175,7 +175,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." @@ -200,6 +200,6 @@ jobs: - run: cd frontend - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" - run: yarn --cwd frontend install - run: yarn --cwd frontend run test:unit From 9d5e71a5282fb0b7ff76244a0ffbee8202c3ad46 Mon Sep 17 00:00:00 2001 From: Anthony Chaudhary <18080164+anthony-chaudhary@users.noreply.github.com> Date: Mon, 10 Jun 2024 17:52:53 -0700 Subject: [PATCH 16/24] Update e2e_tests.yaml --- .github/workflows/e2e_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index ed9512305..abcc24d79 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -83,7 +83,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." @@ -152,4 +152,4 @@ jobs: SERVICE_ACCOUNT_FULL_PATH: /gcp/gcloud-service-key.json DIFFGRAM_HOST_OS: ${{ secrets.DIFFGRAM_HOST_OS }} DIFFGRAM_VERSION_TAG: 0.0.1 - DIFFGRAM_INSTALL_FINGERPRINT: ${{ secrets.DIFFGRAM_INSTALL_FINGERPRINT }} \ No newline at end of file + DIFFGRAM_INSTALL_FINGERPRINT: ${{ secrets.DIFFGRAM_INSTALL_FINGERPRINT }} From 42141fbd76f9ff18e3b642158e2af319e26a5e58 Mon Sep 17 00:00:00 2001 From: Anthony Chaudhary <18080164+anthony-chaudhary@users.noreply.github.com> Date: Mon, 10 Jun 2024 18:11:44 -0700 Subject: [PATCH 17/24] Update e2e_tests.yaml --- .github/workflows/e2e_tests.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index abcc24d79..d80a0b291 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -19,6 +19,7 @@ jobs: options: --user root --shm-size 4gb env: NODE_ENV: development + NODE_OPTIONS: --openssl-legacy-provider DATABASE_URL: postgresql+psycopg2://postgres:postgres@postgres/diffgram_unit_tests?sslmode=disable PYTHONPATH: /__w/diffgram DIFFGRAM_SYSTEM_MODE: testing_e2e @@ -134,6 +135,7 @@ jobs: # Recommended: pass the GitHub token lets this action correctly # determine the unique run id necessary to re-run the checks GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_OPTIONS: --openssl-legacy-provider NODE_ENV: development DEBUG: 'cypress:server:util:process_profiler' DATABASE_URL: postgresql+psycopg2://postgres:postgres@postgres/diffgram_unit_tests?sslmode=disable From 7499a59723dbcd39d26935d50d1ea5dd37952387 Mon Sep 17 00:00:00 2001 From: Anthony Chaudhary <18080164+anthony-chaudhary@users.noreply.github.com> Date: Mon, 10 Jun 2024 18:22:09 -0700 Subject: [PATCH 18/24] Update e2e_tests.yaml --- .github/workflows/e2e_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index d80a0b291..abf8a1833 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -19,7 +19,6 @@ jobs: options: --user root --shm-size 4gb env: NODE_ENV: development - NODE_OPTIONS: --openssl-legacy-provider DATABASE_URL: postgresql+psycopg2://postgres:postgres@postgres/diffgram_unit_tests?sslmode=disable PYTHONPATH: /__w/diffgram DIFFGRAM_SYSTEM_MODE: testing_e2e @@ -85,6 +84,8 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 + env: + NODE_OPTIONS: --openssl-legacy-provider - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." @@ -135,7 +136,6 @@ jobs: # Recommended: pass the GitHub token lets this action correctly # determine the unique run id necessary to re-run the checks GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NODE_OPTIONS: --openssl-legacy-provider NODE_ENV: development DEBUG: 'cypress:server:util:process_profiler' DATABASE_URL: postgresql+psycopg2://postgres:postgres@postgres/diffgram_unit_tests?sslmode=disable From 6eb23782cbeed6b825d9b51dac1d7ef7c0dd5af8 Mon Sep 17 00:00:00 2001 From: Anthony Chaudhary <18080164+anthony-chaudhary@users.noreply.github.com> Date: Mon, 10 Jun 2024 18:29:04 -0700 Subject: [PATCH 19/24] Update e2e_tests.yaml --- .github/workflows/e2e_tests.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index abf8a1833..4e1353cb8 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -81,16 +81,14 @@ jobs: - /__w/diffgram/diffgram/myminio/.minio/data:/root/.minio options: --health-cmd "curl -s http://localhost:9000/minio/health/live" steps: - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 - env: - NODE_OPTIONS: --openssl-legacy-provider - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event." - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - name: Check out repository code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - run: cp -rf . /__w/diffgram - run: cd /__w/diffgram - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." From d2195d37413521c6f10ebcc152d5c4d56f6463c2 Mon Sep 17 00:00:00 2001 From: Anthony Chaudhary <18080164+anthony-chaudhary@users.noreply.github.com> Date: Mon, 10 Jun 2024 18:44:16 -0700 Subject: [PATCH 20/24] Update e2e_tests.yaml --- .github/workflows/e2e_tests.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index 4e1353cb8..57fbc33ca 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -108,8 +108,7 @@ jobs: - name: Check processes run: ls -a - run: yarn --cwd frontend/ install - # - run: yarn --cwd frontend/ run cypress install - - run: yarn --cwd frontend/ build + - run: NODE_OPTIONS=--openssl-legacy-provider yarn --cwd frontend/ build # Populate DB - run: cd default/play_and_scripts/scripts; python3 setup_database_e2e_tests.py - name: "UI Tests - Chrome" From b5ef76bec267c89442c34e2228141e4217f018c3 Mon Sep 17 00:00:00 2001 From: Anthony Chaudhary <18080164+anthony-chaudhary@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:01:39 -0700 Subject: [PATCH 21/24] Update e2e_tests.yaml --- .github/workflows/e2e_tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml index 57fbc33ca..5088eb604 100644 --- a/.github/workflows/e2e_tests.yaml +++ b/.github/workflows/e2e_tests.yaml @@ -117,6 +117,7 @@ jobs: # we have already installed all dependencies above install: false start: | + NODE_OPTIONS=--openssl-legacy-provider yarn --cwd run dev python3 ../default/main.py python3 ../walrus/main.py From 066dd9eba4cccf566da0902f76dfd5c7eab70d05 Mon Sep 17 00:00:00 2001 From: Anthony Sarkis <18080164+anthony-chaudhary@users.noreply.github.com> Date: Fri, 21 Jun 2024 13:49:13 -0700 Subject: [PATCH 22/24] make healthcheck variable Context of remote docker compose health check not being supported --- docker-compose.yaml | 2 +- install.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 896a4a622..e31a4e462 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -106,7 +106,7 @@ services: hostname: db restart: always healthcheck: - test: [ "CMD-SHELL", "pg_isready", "-d", "db_prod" ] + test: ${HEALTHCHECK_TEST} interval: 30s timeout: 60s retries: 5 diff --git a/install.py b/install.py index ea59730c3..9c9bfbd2c 100644 --- a/install.py +++ b/install.py @@ -524,13 +524,14 @@ def populate_env(self): env_file += f"RABBITMQ_PORT={self.rabbit_port}\n" if self.local_database: - env_file += "POSTGRES_IMAGE=postgres:12.5\n" + env_file += "POSTGRES_IMAGE=postgres:16\n" env_file += "DATABASE_URL=postgresql+psycopg2://postgres:postgres@db/diffgram\n" env_file += "DATABASE_NAME=diffgram\n" env_file += "DATABASE_HOST=db\n" env_file += "DATABASE_NAME=diffgram\n" env_file += "DATABASE_USER=postgres\n" env_file += "DATABASE_PASS=postgres\n" + env_file += f"HEALTHCHECK_TEST='['CMD-SHELL', 'pg_isready', '-d', 'db_prod']'\n" else: env_file += "POSTGRES_IMAGE=tianon/true\n" @@ -539,6 +540,7 @@ def populate_env(self): env_file += f"DATABASE_NAME={self.db_name}\n" env_file += f"DATABASE_USER={self.db_username}\n" env_file += f"DATABASE_PASS={self.db_pass}\n" + env_file += f"HEALTHCHECK_TEST='['CMD-SHELL', 'echo', 'Remote db in use. Health check not supported yet.']'\n" if self.mailgun: env_file += f"MAILGUN_KEY={self.mailgun_key}\n" From bc44bfa77c3555ec591681a355701248564b19fe Mon Sep 17 00:00:00 2001 From: Anthony Sarkis <18080164+anthony-chaudhary@users.noreply.github.com> Date: Fri, 21 Jun 2024 16:32:39 -0700 Subject: [PATCH 23/24] adjust for docker list format --- docker-compose.yaml | 2 +- install.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index e31a4e462..75932c377 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -106,7 +106,7 @@ services: hostname: db restart: always healthcheck: - test: ${HEALTHCHECK_TEST} + test: ['CMD-SHELL', ${HEALTHCHECK_TEST_COMMAND}, ${HEALTHCHECK_TEST_ARG_0}, ${HEALTHCHECK_TEST_ARG_1}] interval: 30s timeout: 60s retries: 5 diff --git a/install.py b/install.py index 9c9bfbd2c..059c52556 100644 --- a/install.py +++ b/install.py @@ -531,8 +531,9 @@ def populate_env(self): env_file += "DATABASE_NAME=diffgram\n" env_file += "DATABASE_USER=postgres\n" env_file += "DATABASE_PASS=postgres\n" - env_file += f"HEALTHCHECK_TEST='['CMD-SHELL', 'pg_isready', '-d', 'db_prod']'\n" - + env_file += "HEALTHCHECK_TEST_COMMAND=pg_isready\n" + env_file += "HEALTHCHECK_TEST_ARG_0=-d\n" + env_file += "HEALTHCHECK_TEST_ARG_1=db_prod\n" else: env_file += "POSTGRES_IMAGE=tianon/true\n" env_file += f"DATABASE_URL={self.database_url}\n" @@ -540,7 +541,9 @@ def populate_env(self): env_file += f"DATABASE_NAME={self.db_name}\n" env_file += f"DATABASE_USER={self.db_username}\n" env_file += f"DATABASE_PASS={self.db_pass}\n" - env_file += f"HEALTHCHECK_TEST='['CMD-SHELL', 'echo', 'Remote db in use. Health check not supported yet.']'\n" + env_file += "HEALTHCHECK_TEST_COMMAND=echo\n" + env_file += "HEALTHCHECK_TEST_ARG_0=remote_db_in_use\n" + env_file += "HEALTHCHECK_TEST_ARG_1=none\n" if self.mailgun: env_file += f"MAILGUN_KEY={self.mailgun_key}\n" From 614dee6656367a55c65a637d82f9106cd06cba83 Mon Sep 17 00:00:00 2001 From: Anthony Sarkis <18080164+anthony-chaudhary@users.noreply.github.com> Date: Sun, 13 Oct 2024 18:52:46 -0700 Subject: [PATCH 24/24] Update event.py --- shared/database/event/event.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared/database/event/event.py b/shared/database/event/event.py index 76afd7d03..9e06d3bd4 100644 --- a/shared/database/event/event.py +++ b/shared/database/event/event.py @@ -342,6 +342,10 @@ def send_to_eventhub(self): if settings.DIFFGRAM_SYSTEM_MODE in ['sandbox'] and self.kind in EXCLUDED_EVENTHUB_TRACKING_EVENTS: return + + if settings.ALLOW_EVENTHUB is False: + return + try: event_data = self.serialize() event_data['event_type'] = 'user'