From 54b63388b2e15c4596593987ddd61c4f3ddb8759 Mon Sep 17 00:00:00 2001
From: cmendible <266546+cmendible@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:06:30 +0100
Subject: [PATCH] Remove unused variables and update API Management outputs

---
 infra/main.tf                   |  2 +-
 infra/modules/apim/main.tf      | 28 +++++++------------
 infra/modules/apim/outputs.tf   |  4 +--
 infra/modules/apim/variables.tf |  2 --
 infra/outputs.tf                | 48 ++++++++++++++++++++-------------
 5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/infra/main.tf b/infra/main.tf
index 55180ba..76eba0b 100644
--- a/infra/main.tf
+++ b/infra/main.tf
@@ -50,6 +50,7 @@ module "nsg" {
 }
 
 module "apim" {
+  count                    = var.enable_apim ? 1 : 0
   source                   = "./modules/apim"
   location                 = azurerm_resource_group.rg.location
   resource_group_name      = azurerm_resource_group.rg.name
@@ -57,7 +58,6 @@ module "apim" {
   apim_subnet_id           = module.vnet.apim_subnet_id
   publisher_name           = var.publisher_name
   publisher_email          = var.publisher_email
-  enable_apim              = var.enable_apim
   appi_resource_id         = module.appi.appi_id
   appi_instrumentation_key = module.appi.appi_key
   openai_service_name      = module.openai.openai_service_name
diff --git a/infra/modules/apim/main.tf b/infra/modules/apim/main.tf
index bb67485..63d312f 100644
--- a/infra/modules/apim/main.tf
+++ b/infra/modules/apim/main.tf
@@ -4,7 +4,6 @@ locals {
 }
 
 resource "azurerm_public_ip" "apim_public_ip" {
-  count               = var.enable_apim ? 1 : 0
   name                = "pip-apim"
   location            = var.location
   resource_group_name = var.resource_group_name
@@ -16,15 +15,14 @@ resource "azurerm_public_ip" "apim_public_ip" {
 }
 
 resource "azurerm_api_management" "apim" {
-  count                = var.enable_apim ? 1 : 0
   name                 = var.apim_name
   location             = var.location
   resource_group_name  = var.resource_group_name
   publisher_name       = var.publisher_name
   publisher_email      = var.publisher_email
   sku_name             = "Developer_1"
-  virtual_network_type = "External" # Use "Internal" for a fully private APIM
-  public_ip_address_id = azurerm_public_ip.apim_public_ip[0].id // Required to deploy APIM in STv2 platform
+  virtual_network_type = "External"                          # Use "Internal" for a fully private APIM
+  public_ip_address_id = azurerm_public_ip.apim_public_ip.id // Required to deploy APIM in STv2 platform
 
   virtual_network_configuration {
     subnet_id = var.apim_subnet_id
@@ -32,10 +30,9 @@ resource "azurerm_api_management" "apim" {
 }
 
 resource "azurerm_api_management_backend" "openai" {
-  count               = var.enable_apim ? 1 : 0
   name                = "openai-api"
   resource_group_name = var.resource_group_name
-  api_management_name = azurerm_api_management.apim[0].name
+  api_management_name = azurerm_api_management.apim.name
   protocol            = "http"
   url                 = local.backend_url
   tls {
@@ -45,9 +42,8 @@ resource "azurerm_api_management_backend" "openai" {
 }
 
 resource "azurerm_api_management_logger" "appi_logger" {
-  count               = var.enable_apim ? 1 : 0
   name                = local.logger_name
-  api_management_name = azurerm_api_management.apim[0].name
+  api_management_name = azurerm_api_management.apim.name
   resource_group_name = var.resource_group_name
   resource_id         = var.appi_resource_id
 
@@ -58,10 +54,9 @@ resource "azurerm_api_management_logger" "appi_logger" {
 
 // https://learn.microsoft.com/en-us/semantic-kernel/deploy/use-ai-apis-with-api-management#setup-azure-api-management-instance-with-azure-openai-api
 resource "azurerm_api_management_api" "openai" {
-  count                 = var.enable_apim ? 1 : 0
   name                  = "openai-api"
   resource_group_name   = var.resource_group_name
-  api_management_name   = azurerm_api_management.apim[0].name
+  api_management_name   = azurerm_api_management.apim.name
   revision              = "1"
   display_name          = "Azure Open AI API"
   path                  = "openai"
@@ -76,18 +71,16 @@ resource "azurerm_api_management_api" "openai" {
 }
 
 resource "azurerm_api_management_named_value" "tenant_id" {
-  count               = var.enable_apim ? 1 : 0
   name                = "tenant-id"
   resource_group_name = var.resource_group_name
-  api_management_name = azurerm_api_management.apim[0].name
+  api_management_name = azurerm_api_management.apim.name
   display_name        = "TENANT_ID"
   value               = var.tenant_id
 }
 
 resource "azurerm_api_management_api_policy" "policy" {
-  count               = var.enable_apim ? 1 : 0
-  api_name            = azurerm_api_management_api.openai[0].name
-  api_management_name = azurerm_api_management.apim[0].name
+  api_name            = azurerm_api_management_api.openai.name
+  api_management_name = azurerm_api_management.apim.name
   resource_group_name = var.resource_group_name
 
   xml_content = <<XML
@@ -124,11 +117,10 @@ resource "azurerm_api_management_api_policy" "policy" {
 
 # https://github.com/aavetis/azure-openai-logger/blob/main/README.md
 resource "azurerm_api_management_diagnostic" "diagnostics" {
-  count                    = var.enable_apim ? 1 : 0
   identifier               = "applicationinsights"
   resource_group_name      = var.resource_group_name
-  api_management_name      = azurerm_api_management.apim[0].name
-  api_management_logger_id = azurerm_api_management_logger.appi_logger[0].id
+  api_management_name      = azurerm_api_management.apim.name
+  api_management_logger_id = azurerm_api_management_logger.appi_logger.id
 
   sampling_percentage       = 100
   always_log_errors         = true
diff --git a/infra/modules/apim/outputs.tf b/infra/modules/apim/outputs.tf
index dc93460..8fcb9da 100644
--- a/infra/modules/apim/outputs.tf
+++ b/infra/modules/apim/outputs.tf
@@ -1,7 +1,7 @@
 output "apim_name" {
-  value = var.enable_apim ? azurerm_api_management.apim[0].name : ""
+  value = azurerm_api_management.apim.name
 }
 
 output "gateway_url" {
-  value = var.enable_apim ? azurerm_api_management.apim[0].gateway_url : ""
+  value = azurerm_api_management.apim.gateway_url
 }
diff --git a/infra/modules/apim/variables.tf b/infra/modules/apim/variables.tf
index 58b293f..8de67ee 100644
--- a/infra/modules/apim/variables.tf
+++ b/infra/modules/apim/variables.tf
@@ -9,5 +9,3 @@ variable "appi_instrumentation_key" {}
 variable "openai_service_name" {}
 variable "openai_service_endpoint" {}
 variable "tenant_id" {}
-
-variable "enable_apim" {}
diff --git a/infra/outputs.tf b/infra/outputs.tf
index b19049b..c3274b3 100644
--- a/infra/outputs.tf
+++ b/infra/outputs.tf
@@ -1,44 +1,54 @@
 output "resource_group_name" {
-    value = "${azurerm_resource_group.rg.name}"
-    description = "The name of the resource group"
+  value       = azurerm_resource_group.rg.name
+  description = "The name of the resource group"
 }
 
 output "subscription_id" {
-    value = "${data.azurerm_subscription.current.subscription_id}"
-    description = "The subscription ID used"
+  value       = data.azurerm_subscription.current.subscription_id
+  description = "The subscription ID used"
 }
 
 output "tenant_id" {
-    value = "${data.azurerm_subscription.current.tenant_id}"
-    description = "The tenant ID used"
+  value       = data.azurerm_subscription.current.tenant_id
+  description = "The tenant ID used"
 }
 
 output "storage_account_name" {
-    value = "${module.st.storage_account_name}"
-    description = "The name of the storage account"
+  value       = module.st.storage_account_name
+  description = "The name of the storage account"
 }
 
 output "storage_container_name" {
-    value = "${module.st.storage_container_name}"
-    description = "The name of the storage account"
+  value       = module.st.storage_container_name
+  description = "The name of the storage account"
 }
 
 output "search_service_name" {
-    value = "${module.search.search_service_name}"
-    description = "The name of the search service"
+  value       = module.search.search_service_name
+  description = "The name of the search service"
 }
 
 output "search_service_index_name" {
-    value = "${module.search.search_index_name}"
-    description = "The name of the search service index"
+  value       = module.search.search_index_name
+  description = "The name of the search service index"
 }
 
 output "openai_service_name" {
-    value = "${module.openai.openai_service_name}"
-    description = "The name of the openai service"
+  value       = module.openai.openai_service_name
+  description = "The name of the openai service"
 }
 
 output "embedding_deployment_name" {
-    value = "${module.openai.embedding_deployment_name}"
-    description = "The name of the embedding deployment"
-}
\ No newline at end of file
+  value       = module.openai.embedding_deployment_name
+  description = "The name of the embedding deployment"
+}
+
+output "aihub_fqdn" {
+  value       = module.ca_aihub.fqdn
+  description = "The FQDN of the AI Hub service"
+}
+
+output "chat_fqdn" {
+  value       = module.ca_chat.fqdn
+  description = "The FQDN of the Chat service"
+}