Merge branch 'main' into marrobi/issue3992

microsoft · Oct 24, 2024 · 5ff6594 · 5ff6594
2 parents e2d18e7 + 8d27d59
commit 5ff6594
Show file tree

Hide file tree

Showing 17 changed files with 168 additions and 167 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ ENHANCEMENTS:
 * Add info regarding workspace limit into docs ([#3920](https://github.com/microsoft/AzureTRE/issues/3920))
 
 BUG FIXES:
+* Add Snyk Security updates for September
 * Workspace creation blocked due to Azure API depreciation ([#4095](https://github.com/microsoft/AzureTRE/issues/4095))
 
 COMPONENTS:

diff --git a/core/terraform/.terraform.lock.hcl b/core/terraform/.terraform.lock.hcl
diff --git a/core/terraform/airlock/main.tf b/core/terraform/airlock/main.tf
@@ -7,7 +7,7 @@ terraform {
     }
     azapi = {
       source  = "Azure/azapi"
-      version = ">= 1.9.0"
+      version = ">= 1.15.0"
     }
     local = {
       source  = "hashicorp/local"

diff --git a/core/terraform/main.tf b/core/terraform/main.tf
@@ -19,7 +19,7 @@ terraform {
     }
     azapi = {
       source  = "Azure/azapi"
-      version = "~> 1.13.0"
+      version = "~> 1.15.0"
     }
   }
 

diff --git a/templates/workspace_services/azureml/terraform/.terraform.lock.hcl b/templates/workspace_services/azureml/terraform/.terraform.lock.hcl
diff --git a/templates/workspace_services/azureml/terraform/providers.tf b/templates/workspace_services/azureml/terraform/providers.tf
@@ -6,7 +6,7 @@ terraform {
     }
     azapi = {
       source  = "Azure/azapi"
-      version = "=1.1.0"
+      version = "=1.15.0"
     }
     external = {
       source  = "hashicorp/external"

diff --git a/...lates/workspace_services/azureml/user_resources/aml_compute/terraform/.terraform.lock.hcl b/...lates/workspace_services/azureml/user_resources/aml_compute/terraform/.terraform.lock.hcl
diff --git a/templates/workspace_services/azureml/user_resources/aml_compute/terraform/providers.tf b/templates/workspace_services/azureml/user_resources/aml_compute/terraform/providers.tf
@@ -6,7 +6,7 @@ terraform {
     }
     azapi = {
       source  = "Azure/azapi"
-      version = "=1.1.0"
+      version = "=1.15.0"
     }
   }
 

diff --git a/templates/workspace_services/databricks/terraform/.terraform.lock.hcl b/templates/workspace_services/databricks/terraform/.terraform.lock.hcl
diff --git a/templates/workspace_services/databricks/terraform/providers.tf b/templates/workspace_services/databricks/terraform/providers.tf
@@ -6,7 +6,7 @@ terraform {
     }
     azapi = {
       source  = "Azure/azapi"
-      version = "=1.13.1"
+      version = "=1.15.0"
     }
     databricks = {
       source  = "databricks/databricks"

diff --git 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.5"
+__version__ = "0.8.6"
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
@@ -48,12 +48,12 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-security-keyvault-secrets</artifactId>
-            <version>4.8.2</version>
+            <version>4.8.4</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-identity</artifactId>
-            <version>1.12.2</version>
+            <version>1.13.0</version>
         </dependency>
         <!-- Http and Json Components -->
         <dependency>

diff --git a/templates/workspaces/base/terraform/.terraform.lock.hcl b/templates/workspaces/base/terraform/.terraform.lock.hcl
diff --git a/templates/workspaces/base/terraform/azure-monitor/providers.tf b/templates/workspaces/base/terraform/azure-monitor/providers.tf
@@ -8,7 +8,7 @@ terraform {
 
     azapi = {
       source  = "Azure/azapi"
-      version = ">= 1.3.0"
+      version = ">= 1.15.0"
     }
   }
 }
diff --git a/templates/workspaces/base/terraform/providers.tf b/templates/workspaces/base/terraform/providers.tf
@@ -10,7 +10,7 @@ terraform {
     }
     azapi = {
       source  = "Azure/azapi"
-      version = "=1.5.0"
+      version = "=1.15.0"
     }
   }
 

diff --git a/ui/app/package.json b/ui/app/package.json
@@ -5,8 +5,8 @@
   "dependencies": {
     "@azure/msal-browser": "^2.35.0",
     "@azure/msal-react": "^1.5.12",
-    "@fluentui/react": "^8.119.1",
-    "@fluentui/react-file-type-icons": "^8.11.18",
+    "@fluentui/react": "^8.120.3",
+    "@fluentui/react-file-type-icons": "^8.11.20",
     "@reduxjs/toolkit": "^1.8.6",
     "@rjsf/core": "^4.2.3",
     "@rjsf/fluent-ui": "^4.2.3",
@@ -24,7 +24,7 @@
     "react-dom": "^18.3.1",
     "react-markdown": "^8.0.3",
     "react-redux": "^8.0.4",
-    "react-router-dom": "6.22.1",
+    "react-router-dom": "6.25.1",
     "remark-gfm": "^3.0.1",
     "typescript": "^5.5.3",
     "web-vitals": "^3.3.0"