upgrade to azapi 1.13.1 & housekeeping

Azure · Jun 19, 2024 · 482cda6 · 482cda6
1 parent d6aad77
commit 482cda6
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 50 deletions.
diff --git a/infra/.terraform.lock.hcl b/infra/.terraform.lock.hcl
diff --git a/infra/modules/apim/main.tf b/infra/modules/apim/main.tf
@@ -12,7 +12,7 @@ resource "azapi_resource" "apim" {
     type = "SystemAssigned"
   }
   schema_validation_enabled = false # requiered for now
-  body = jsonencode({
+  body = {
     sku = {
       name     = "StandardV2"
       capacity = 1
@@ -27,7 +27,7 @@ resource "azapi_resource" "apim" {
         subnetResourceId = var.apim_subnet_id        
       } : null
     }
-  })
+  }
   response_export_values = [
     "identity.principalId",
     "properties.gatewayUrl"
@@ -51,7 +51,7 @@ resource "azapi_resource" "apim_backend_pool" {
   parent_id                 = azapi_resource.apim.id
   name                      = "openai-backend-pool"
   schema_validation_enabled = false # requiered for now
-  body = jsonencode({
+  body = {
     properties = {
       description = "Azure OpenAI Backend Pool"
       type        = "Pool"
@@ -65,7 +65,7 @@ resource "azapi_resource" "apim_backend_pool" {
         ]
       }
     }
-  })
+  }
 }
 
 resource "azurerm_api_management_logger" "appi_logger" {
@@ -231,10 +231,10 @@ resource "azapi_update_resource" "diagnostics" {
   type        = "Microsoft.ApiManagement/service/diagnostics@2022-08-01"
   resource_id = azurerm_api_management_diagnostic.diagnostics.id
 
-  body = jsonencode({
+  body = {
     properties = {
       loggerId = azurerm_api_management_logger.appi_logger.id
       metrics  = true
     }
-  })
+  }
 }
diff --git a/infra/modules/apim/outputs.tf b/infra/modules/apim/outputs.tf
@@ -3,5 +3,5 @@ output "apim_name" {
 }
 
 output "gateway_url" {
-  value = jsondecode(azapi_resource.apim.output).properties.gatewayUrl
+  value = azapi_resource.apim.output.properties.gatewayUrl
 }
diff --git a/infra/modules/apim/providers.tf b/infra/modules/apim/providers.tf
@@ -2,11 +2,9 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source  = "azure/azapi"
-      version = "= 1.12.1"
     }
   }
 }
diff --git a/infra/modules/ca-aihub/auth_config.tf b/infra/modules/ca-aihub/auth_config.tf
@@ -13,7 +13,7 @@ resource "azapi_resource" "current" {
   name      = "Current"
   parent_id = azapi_resource.ca_back.id
   timeouts {}
-  body = jsonencode({
+  body = {
     properties = {
       platform = {
         enabled = true
@@ -42,5 +42,5 @@ resource "azapi_resource" "current" {
         preserveUrlFragmentsForLogins = false
       }
     }
-  })
+  }
 }
diff --git a/infra/modules/ca-aihub/main.tf b/infra/modules/ca-aihub/main.tf
@@ -10,7 +10,7 @@ resource "azapi_resource" "ca_back" {
     ]
   }
 
-  body = jsonencode({
+  body = {
     properties : {
       managedEnvironmentId = "${var.cae_id}"
       configuration = {
@@ -272,7 +272,7 @@ resource "azapi_resource" "ca_back" {
         ]
       }
     }
-  })
+  }
   response_export_values = ["properties.configuration.ingress.fqdn"]
 }
 

diff --git a/infra/modules/ca-aihub/outputs.tf b/infra/modules/ca-aihub/outputs.tf
@@ -1,4 +1,4 @@
 output "fqdn" {
-  value = jsondecode(azapi_resource.ca_back.output).properties.configuration.ingress.fqdn
+  value = azapi_resource.ca_back.output.properties.configuration.ingress.fqdn
 }
 
diff --git a/infra/modules/ca-aihub/providers.tf b/infra/modules/ca-aihub/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"

diff --git a/infra/modules/ca-chat/auth_config.tf b/infra/modules/ca-chat/auth_config.tf
@@ -13,7 +13,7 @@ resource "azapi_resource" "current" {
   name      = "Current"
   parent_id = azapi_resource.ca_back.id
   timeouts {}
-  body = jsonencode({
+  body = {
     properties = {
       platform = {
         enabled = true
@@ -42,5 +42,5 @@ resource "azapi_resource" "current" {
         preserveUrlFragmentsForLogins = false
       }
     }
-  })
+  }
 }
diff --git a/infra/modules/ca-chat/main.tf b/infra/modules/ca-chat/main.tf
@@ -10,7 +10,7 @@ resource "azapi_resource" "ca_back" {
     ]
   }
 
-  body = jsonencode({
+  body = {
     properties : {
       managedEnvironmentId = "${var.cae_id}"
       configuration = {
@@ -103,6 +103,6 @@ resource "azapi_resource" "ca_back" {
         }
       }
     }
-  })
+  }
   response_export_values = ["properties.configuration.ingress.fqdn"]
 }
diff --git a/infra/modules/ca-chat/outputs.tf b/infra/modules/ca-chat/outputs.tf
@@ -1,4 +1,4 @@
 output "fqdn" {
-  value = jsondecode(azapi_resource.ca_back.output).properties.configuration.ingress.fqdn
+  value = azapi_resource.ca_back.output.properties.configuration.ingress.fqdn
 }
 
diff --git a/infra/modules/ca-chat/providers.tf b/infra/modules/ca-chat/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"

diff --git a/infra/modules/ca-plugin-fsi/main.tf b/infra/modules/ca-plugin-fsi/main.tf
@@ -13,7 +13,7 @@ resource "azapi_resource" "ca_function" {
   location                  = var.location
   parent_id                 = var.resource_group_id
   type                      = "Microsoft.Web/sites@2023-01-01"
-  body = jsonencode({
+  body = {
     kind = "functionapp,linux,container,azurecontainerapps"
     properties : {
       language             = "dotnet-isolated"
@@ -78,5 +78,5 @@ resource "azapi_resource" "ca_function" {
       }
       httpsOnly = false
     }
-  })
+  }
 }
diff --git a/infra/modules/ca-plugin-fsi/providers.tf b/infra/modules/ca-plugin-fsi/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"

diff --git a/infra/modules/ca-plugin/main.tf b/infra/modules/ca-plugin/main.tf
@@ -13,7 +13,7 @@ resource "azapi_resource" "ca_function" {
   location                  = var.location
   parent_id                 = var.resource_group_id
   type                      = "Microsoft.Web/sites@2023-01-01"
-  body = jsonencode({
+  body = {
     kind = "functionapp,linux,container,azurecontainerapps"
     properties : {
       language             = "dotnet-isolated"
@@ -70,5 +70,5 @@ resource "azapi_resource" "ca_function" {
       }
       httpsOnly = false
     }
-  })
+  }
 }
diff --git a/infra/modules/ca-plugin/providers.tf b/infra/modules/ca-plugin/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"

diff --git a/infra/modules/ca-prep-docs/main.tf b/infra/modules/ca-prep-docs/main.tf
@@ -10,7 +10,7 @@ resource "azapi_resource" "ca_back" {
     ]
   }
 
-  body = jsonencode({
+  body = {
     properties : {
       environmentId = "${var.cae_id}"
       configuration = {
@@ -107,7 +107,7 @@ resource "azapi_resource" "ca_back" {
         ]
       }
     }
-  })
+  }
   response_export_values = ["properties.configuration.ingress.fqdn"]
 }
 

diff --git a/infra/modules/ca-prep-docs/providers.tf b/infra/modules/ca-prep-docs/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"

diff --git a/infra/modules/cae/main.tf b/infra/modules/cae/main.tf
@@ -4,7 +4,7 @@ resource "azapi_resource" "cae" {
   parent_id = var.resource_group_id
   type      = "Microsoft.App/managedEnvironments@2022-11-01-preview"
 
-  body = jsonencode({
+  body = {
     properties : {
       daprAIInstrumentationKey = "${var.appi_key}"
       appLogsConfiguration = {
@@ -25,6 +25,6 @@ resource "azapi_resource" "cae" {
         },
       ]
     }
-  })
+  }
   response_export_values = ["properties.defaultDomain"]
 }
diff --git a/infra/modules/cae/outputs.tf b/infra/modules/cae/outputs.tf
@@ -3,6 +3,6 @@ output "cae_id" {
 }
 
 output "default_domain" {
-  value = jsondecode(azapi_resource.cae.output).properties.defaultDomain
+  value = azapi_resource.cae.output.properties.defaultDomain
 }
 
diff --git a/infra/modules/cae/providers.tf b/infra/modules/cae/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"

diff --git a/infra/modules/cog/providers.tf b/infra/modules/cog/providers.tf
@@ -3,7 +3,6 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.87.0"
     }
     azapi = {
       source = "Azure/azapi"

diff --git a/infra/providers.tf b/infra/providers.tf
@@ -7,7 +7,7 @@ terraform {
     }
     azapi = {
       source  = "Azure/azapi"
-      version = "1.12.1"
+      version = "1.13.1"
     }
     azuread = {
       source  = "hashicorp/azuread"