From 26a878f4becd698e15e438019c2d467d9b83d999 Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Tue, 2 Apr 2024 09:38:19 +0100 Subject: [PATCH 01/11] Update clean_validation_envs.yml --- .github/workflows/clean_validation_envs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean_validation_envs.yml b/.github/workflows/clean_validation_envs.yml index c027224cb7..6d728fa344 100644 --- a/.github/workflows/clean_validation_envs.yml +++ b/.github/workflows/clean_validation_envs.yml @@ -4,7 +4,7 @@ name: Clean Validation Environments on: # yamllint disable-line rule:truthy schedule: # Every 2 hours - - cron: "0 */2 * * *" + - cron: "0 19 * * *" workflow_dispatch: jobs: From 907cf4760204b57f2889dd06c8d188b904717492 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 4 Apr 2024 15:52:25 +0100 Subject: [PATCH 02/11] update --- .github/workflows/clean_validation_envs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean_validation_envs.yml b/.github/workflows/clean_validation_envs.yml index 6d728fa344..c027224cb7 100644 --- a/.github/workflows/clean_validation_envs.yml +++ b/.github/workflows/clean_validation_envs.yml @@ -4,7 +4,7 @@ name: Clean Validation Environments on: # yamllint disable-line rule:truthy schedule: # Every 2 hours - - cron: "0 19 * * *" + - cron: "0 */2 * * *" workflow_dispatch: jobs: From 6b3aa09ad2d2c9b517dea02b60ef9ed6c7755f3e Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Thu, 4 Apr 2024 15:54:39 +0100 Subject: [PATCH 03/11] update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8 --- .github/workflows/clean_validation_envs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean_validation_envs.yml b/.github/workflows/clean_validation_envs.yml index c027224cb7..a784a570aa 100644 --- a/.github/workflows/clean_validation_envs.yml +++ b/.github/workflows/clean_validation_envs.yml @@ -31,6 +31,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAIN_TRE_ID: ${{ secrets.TRE_ID }} GITHUB_REPOSITORY: ${{ github.repository}} - BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 2 + BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8 BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_DESTROY: 48 run: devops/scripts/clean_ci_validation_envs.sh From 723399e1594d78ff6e0899eda4fd088b39193995 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 10 May 2024 16:27:08 +0100 Subject: [PATCH 04/11] snyk update --- .../guacamole-auth-azure/pom.xml | 8 ++--- .../workspace_services/guacamole/porter.yaml | 2 +- ui/app/package.json | 2 +- ui/app/yarn.lock | 32 +++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml index 075cab92a8..70d4939e9a 100644 --- a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml +++ b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml @@ -20,7 +20,7 @@ com.auth0 jwks-rsa - 0.22.0 + 0.22.1 com.auth0 @@ -41,19 +41,19 @@ org.apache.guacamole guacamole-ext - 1.5.3 + 1.5.4 provided com.azure azure-security-keyvault-secrets - 4.7.2 + 4.7.3 com.azure azure-identity - 1.9.1 + 1.11.2 diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml index 18a50e9b83..f49e3b02e3 100644 --- a/templates/workspace_services/guacamole/porter.yaml +++ b/templates/workspace_services/guacamole/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-guacamole -version: 0.10.6 +version: 0.10.7 description: "An Azure TRE service for Guacamole" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/ui/app/package.json b/ui/app/package.json index a1b55d7333..9e68fdb7c9 100644 --- a/ui/app/package.json +++ b/ui/app/package.json @@ -24,7 +24,7 @@ "react-dom": "^18.2.0", "react-markdown": "^8.0.3", "react-redux": "^8.0.4", - "react-router-dom": "6.21.1", + "react-router-dom": "6.22.1", "remark-gfm": "^3.0.1", "typescript": "^5.3.3", "web-vitals": "^3.3.0" diff --git a/ui/app/yarn.lock b/ui/app/yarn.lock index 97db5a0caa..5feec43d88 100644 --- a/ui/app/yarn.lock +++ b/ui/app/yarn.lock @@ -1932,10 +1932,10 @@ redux-thunk "^2.4.2" reselect "^4.1.8" -"@remix-run/router@1.14.1": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.14.1.tgz#6d2dd03d52e604279c38911afc1079d58c50a755" - integrity sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow== +"@remix-run/router@1.15.1": + version "1.15.1" + resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.15.1.tgz#221fd31a65186b9bc027b74573485fb3226dff7f" + integrity sha512-zcU0gM3z+3iqj8UX45AmWY810l3oUmXM7uH4dt5xtzvMhRtYVhKGOmgOd1877dOPPepfCjUv57w+syamWIYe7w== "@rjsf/core@^4.2.3": version "4.2.3" @@ -9444,20 +9444,20 @@ react-refresh@^0.11.0: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046" integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A== -react-router-dom@6.21.1: - version "6.21.1" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.21.1.tgz#58b459d2fe1841388c95bb068f85128c45e27349" - integrity sha512-QCNrtjtDPwHDO+AO21MJd7yIcr41UetYt5jzaB9Y1UYaPTCnVuJq6S748g1dE11OQlCFIQg+RtAA1SEZIyiBeA== +react-router-dom@6.22.1: + version "6.22.1" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.22.1.tgz#cfa109d4b6b0a4d00bac179bc0ad2a6469455282" + integrity sha512-iwMyyyrbL7zkKY7MRjOVRy+TMnS/OPusaFVxM2P11x9dzSzGmLsebkCvYirGq0DWB9K9hOspHYYtDz33gE5Duw== dependencies: - "@remix-run/router" "1.14.1" - react-router "6.21.1" + "@remix-run/router" "1.15.1" + react-router "6.22.1" -react-router@6.21.1: - version "6.21.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.21.1.tgz#8db7ee8d7cfc36513c9a66b44e0897208c33be34" - integrity sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA== +react-router@6.22.1: + version "6.22.1" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.22.1.tgz#a5ff849bfe709438f7e139421bb28138209662c7" + integrity sha512-0pdoRGwLtemnJqn1K0XHUbnKiX0S4X8CgvVVmHGOWmofESj31msHo/1YiqcJWK7Wxfq2a4uvvtS01KAQyWK/CQ== dependencies: - "@remix-run/router" "1.14.1" + "@remix-run/router" "1.15.1" react-scripts@5.0.1: version "5.0.1" @@ -11866,4 +11866,4 @@ yocto-queue@^0.1.0: zwitch@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7" - integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A== + integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A== \ No newline at end of file From cc6373159d1b25f84374d4961d777d91d04a6bb4 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 10 May 2024 16:28:01 +0100 Subject: [PATCH 05/11] update version --- ui/app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/package.json b/ui/app/package.json index 9e68fdb7c9..f691245496 100644 --- a/ui/app/package.json +++ b/ui/app/package.json @@ -1,6 +1,6 @@ { "name": "tre-ui", - "version": "0.5.23", + "version": "0.5.24", "private": true, "dependencies": { "@azure/msal-browser": "^2.35.0", From 4691efa9cb3c6f0d21897cbad4c11892fbe55acc Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 10 May 2024 16:29:29 +0100 Subject: [PATCH 06/11] update --- .github/workflows/clean_validation_envs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean_validation_envs.yml b/.github/workflows/clean_validation_envs.yml index 332afd50b4..e5d5a38700 100644 --- a/.github/workflows/clean_validation_envs.yml +++ b/.github/workflows/clean_validation_envs.yml @@ -31,6 +31,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAIN_TRE_ID: ${{ secrets.TRE_ID }} GITHUB_REPOSITORY: ${{ github.repository}} - BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8 + BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 2 BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_DESTROY: 48 run: devops/scripts/clean_ci_validation_envs.sh From 0727e41078a77c782c125799e392e6b93d16dfd5 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 10 May 2024 16:30:18 +0100 Subject: [PATCH 07/11] update --- ui/app/yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/yarn.lock b/ui/app/yarn.lock index 5feec43d88..d711e557a4 100644 --- a/ui/app/yarn.lock +++ b/ui/app/yarn.lock @@ -11866,4 +11866,4 @@ yocto-queue@^0.1.0: zwitch@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7" - integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A== \ No newline at end of file + integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A== From ab55184c9de8001b4f11685fda259fa65fd129e2 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 10 May 2024 16:32:20 +0100 Subject: [PATCH 08/11] update --- .../guacamole/guacamole-server/guacamole-auth-azure/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml index 70d4939e9a..5749a10c60 100644 --- a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml +++ b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml @@ -6,7 +6,7 @@ org.apache.guacamole guacamole-auth-tre - 0.3.4 + 0.3.5 jar guacamole-azure-tre From 04a4aa1bf231b61cbb5ca8dd971ee9c29b3f5214 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 10 May 2024 16:37:00 +0100 Subject: [PATCH 09/11] update version --- .../guacamole/guacamole-server/docker/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt index deded3247f..732155f8df 100644 --- a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt +++ b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt @@ -1 +1 @@ -__version__ = "0.8.2" +__version__ = "0.8.3" From 25bf7a9c2acaa9fb83497f0e23f573fd9081fa75 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 10 May 2024 16:37:09 +0100 Subject: [PATCH 10/11] update --- .../guacamole/guacamole-server/guacamole-auth-azure/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml index 5749a10c60..70d4939e9a 100644 --- a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml +++ b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml @@ -6,7 +6,7 @@ org.apache.guacamole guacamole-auth-tre - 0.3.5 + 0.3.4 jar guacamole-azure-tre From e54219692eb8728634aa8411e14b92510d3cc0ad Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 10 May 2024 16:42:07 +0100 Subject: [PATCH 11/11] update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61b916c43f..e0e08b7b2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,13 @@ FEATURES: ENHANCEMENTS: BUG FIXES: -* Update Guacomole Linux VM Images to Ubuntu 22.04 LTS. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) +* Update Guacamole Linux VM Images to Ubuntu 22.04 LTS. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) * Update Nexus Shared Service with new proxies. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) * Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523)) * Remove TLS1.0/1.1 support from Application Gateway ([#3914](https://github.com/microsoft/AzureTRE/issues/3914)) * GitHub Actions version updates. ([#3847](https://github.com/microsoft/AzureTRE/issues/3847)) * Add workaround to avoid name clashes for storage accounts([#3863](https://github.com/microsoft/AzureTRE/pull/3858)) +* Dependency and Vulnerability updates COMPONENTS: