Update openai module and add network link

infra/acr.tf

@@ -1,13 +1,6 @@
-resource "random_string" "acr_suffix" {
-  length  = 8
-  upper   = false
-  numeric = true
-  special = false
-}
-
 resource "azurerm_container_registry" "acr" {
   location            = azurerm_resource_group.this.location
-  name                = "openai${random_string.acr_suffix.result}"
+  name                = "openai${module.naming.container_registry.name_unique}"
   resource_group_name = azurerm_resource_group.this.name
   sku                 = "Premium"
 

infra/network.tf

@@ -12,4 +12,16 @@ module "vnet" {
   virtual_network_address_space = ["10.52.0.0/16"]
   virtual_network_location      = var.region
   virtual_network_name          = "vnet"
+}
+
+resource "azurerm_private_dns_zone" "zone" {
+  name                = "privatelink.openai.azure.com"
+  resource_group_name = azurerm_resource_group.this.name
+}
+
+resource "azurerm_private_dns_zone_virtual_network_link" "link" {
+  name                  = "openai-private-dns-zone"
+  private_dns_zone_name = azurerm_private_dns_zone.zone.name
+  resource_group_name   = azurerm_resource_group.this.name
+  virtual_network_id    = module.vnet.vnet_id
 }

infra/openai.tf

@@ -1,38 +1,54 @@
+module "naming" {
+  source  = "Azure/naming/azurerm"
+  version = ">= 0.3.0"
+}
+
 module "openai" {
-  source              = "Azure/openai/azurerm"
-  version             = "0.1.3"
+  source              = "Azure/avm-res-cognitiveservices-account/azurerm"
+  version             = "0.4.0"
+  kind                = "OpenAI"
+  name                = "azure-openai-${module.naming.cognitive_account.name_unique}"
   resource_group_name = azurerm_resource_group.this.name
+  sku_name            = "S0"
   location            = azurerm_resource_group.this.location
-  private_endpoint = {
+  private_endpoints = {
     "pe_endpoint" = {
-      private_dns_entry_enabled       = true
-      dns_zone_virtual_network_link   = "dns_zone_link_openai"
-      is_manual_connection            = false
       name                            = "openai_pe"
+      private_dns_zone_resource_ids   = toset([azurerm_private_dns_zone.zone.id])
       private_service_connection_name = "openai_pe_connection"
-      subnet_name                     = "subnet0"
-      vnet_name                       = module.vnet.vnet_name
-      vnet_rg_name                    = azurerm_resource_group.this.name
+      subnet_resource_id              = module.vnet.vnet_subnets_name_id["subnet0"]
     }
   }
-  deployment = {
+  cognitive_deployments  = {
     "chat_model" = {
       name          = var.chat_model_name
-      model_format  = "OpenAI"
-      model_name    = var.chat_model_name
-      model_version = var.chat_model_version
-      scale_type    = var.scale_type
-      capacity      = 30
+      model = {
+        format  = "OpenAI"
+        name    = var.chat_model_name
+        version = var.chat_model_version
+      }
+      scale = {
+        capacity = 120
+        type     = var.chat_scale_type
+      }
     },
     "embedding_model" = {
-      name          = "text-embedding-ada-002"
-      model_format  = "OpenAI"
-      model_name    = "text-embedding-ada-002"
-      model_version = "2"
-      scale_type    = "Standard"
-      capacity      = 120
+      name          = var.embedding_model_name
+      model = {
+        format  = "OpenAI"
+        name    = var.embedding_model_name
+        version = "2"
+      }
+      scale = {
+        capacity = 120
+        type     = var.embedding_scale_type
+      }
     },
   }
+  network_acls = {
+    default_action = "Deny"
+    virtual_network_rules = toset([{subnet_id = module.vnet.vnet_subnets_name_id["subnet0"]}])
+  }
   depends_on = [
     azurerm_resource_group.this,
     module.vnet

infra/output.tf

@@ -3,7 +3,7 @@ output "installation-script" {
     { resourceGroup   = azurerm_resource_group.this.name,
       aksName         = module.aks.aks_name,
       registry        = azurerm_container_registry.acr.name,
-      endpoint        = module.openai.openai_endpoint,
+      endpoint        = module.openai.endpoint,
       clientid        = azurerm_user_assigned_identity.chatbot.client_id,
       oidc_url        = module.aks.oidc_issuer_url,
       chat_model_name = var.chat_model_name

infra/providers.tf

@@ -7,10 +7,6 @@ terraform {
       source  = "hashicorp/azurerm"
       version = "~> 3.0, < 4.0"
     }
-    random = {
-      source  = "hashicorp/random"
-      version = "3.3.2"
-    }
   }
 }
 

infra/variables.tf

@@ -13,8 +13,24 @@ variable "chat_model_version" {
   default = "2024-08-06"
 }
 
-variable "scale_type" {
+variable "chat_scale_type" {
   type    = string
   description = "values: GlobalStandard, Standard"
   default = "GlobalStandard"
 }
+
+variable "embedding_model_name" {
+  type    = string
+  default = "text-embedding-ada-002"
+}
+
+variable "embedding_model_version" {
+  type    = string
+  default = "2"
+}
+
+variable "embedding_scale_type" {
+  type    = string
+  description = "values: GlobalStandard, Standard"
+  default = "Standard"
+}