Merge pull request #168 from Barts-Life-Science/azurerm-provider

Fix azurerm terraform provider for base workspace, guacamole, and windows VM
Barts-Life-Science · Sep 26, 2024 · d72bb8c · d72bb8c
2 parents 79c0806 + 4cc88ae
commit d72bb8c
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 47 deletions.
diff --git a/templates/workspace_services/guacamole/terraform/.terraform.lock.hcl b/templates/workspace_services/guacamole/terraform/.terraform.lock.hcl
diff --git a/templates/workspace_services/guacamole/terraform/providers.tf b/templates/workspace_services/guacamole/terraform/providers.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.57.0"
+      version = "=3.108.0"
     }
     local = {
       source  = "hashicorp/local"

diff --git a/...services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/.terraform.lock.hcl b/...services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/.terraform.lock.hcl
diff --git a/...s/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/main.tf b/...s/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/terraform/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.57.0"
+      version = "=3.108.0"
     }
     random = {
       source  = "hashicorp/random"

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/azure-monitor.tf b/templates/workspaces/base/terraform/azure-monitor/azure-monitor.tf
@@ -136,7 +136,8 @@ resource "azurerm_monitor_private_link_scoped_service" "ampls_app_insights" {
   scope_name          = azapi_resource.ampls_workspace.name
 
   # linked_resource_id  = azurerm_application_insights.workspace.id
-  linked_resource_id = jsondecode(azapi_resource.appinsights.output).id
+  # linked_resource_id = jsondecode(azapi_resource.appinsights.output).id
+  linked_resource_id = replace(jsondecode(azapi_resource.appinsights.output).id, "microsoft.insights", "Microsoft.Insights")
 }
 
 resource "azurerm_private_endpoint" "azure_monitor_private_endpoint" {

diff --git a/templates/workspaces/base/terraform/providers.tf b/templates/workspaces/base/terraform/providers.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.73.0"
+      version = "=3.108.0"
     }
     azuread = {
       source  = "hashicorp/azuread"