Refactor Bing resource deployment and update module outputs

Azure · Mar 7, 2024 · 56b1321 · 56b1321
1 parent d5fd31d
commit 56b1321
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 27 deletions.
diff --git a/infra/main.tf b/infra/main.tf
@@ -132,7 +132,6 @@ module "cog" {
   resource_group_name                = azurerm_resource_group.rg.name
   resource_group_id                  = azurerm_resource_group.rg.id
   bing_name                          = local.bing_name
-  deploy_bing                        = var.deploy_bing
   cognitive_services_name            = local.cognitive_services_name
   content_safety_name                = local.content_safety_name
   speech_name                        = local.speech_name
@@ -220,7 +219,7 @@ module "ca_aihub" {
   speech_key                  = module.cog.speech_key
 
   storage_connection_string = module.st.connection_string
-  bing_key                  = var.bing_key
+  bing_key                  = module.cog.bing_key
 
   tenant_id                      = data.azurerm_subscription.current.tenant_id
   managed_identity_client_id     = module.mi.client_id

diff --git a/infra/modules/cog/main.tf b/infra/modules/cog/main.tf
@@ -31,24 +31,66 @@ resource "azurerm_cognitive_account" "speech" {
   custom_subdomain_name         = var.speech_name
 }
 
-resource "azapi_resource" "bing" {
-  count                     = var.deploy_bing ? 1 : 0
-  name                      = var.bing_name
-  location                  = "global"
-  parent_id                 = var.resource_group_id
-  type                      = "Microsoft.Bing/accounts@2020-06-10"
-  schema_validation_enabled = false // Required for this service otherwise it will fail.
-
-  body = jsonencode({
-    kind = "Bing.Search.v7"
-    sku = {
-      name = "S1"
-    }
-    properties : {
-      statisticsEnabled = true
+resource "azurerm_resource_group_template_deployment" "main" {
+  name                = var.bing_name
+  resource_group_name = var.resource_group_name
+  deployment_mode     = "Incremental"
+  parameters_content = jsonencode({
+    "name" = {
+      value = var.bing_name
+    },
+    "location" = {
+      value = "Global"
+    },
+    "sku" = {
+      value = S1
+    },
+    "kind" = {
+      value = "Bing.Search.v7"
     }
   })
-  response_export_values = ["properties.endpoint"]
+  template_content = <<TEMPLATE
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "name": {
+            "type": "String"
+        },
+        "location": {
+            "type": "String"
+        },
+        "sku": {
+            "type": "String"
+        },
+        "kind": {
+          "type": "String"
+        }
+
+    },
+    "resources": [
+        {
+            "apiVersion": "2020-06-10",
+            "name": "[parameters('name')]",
+            "location": "[parameters('location')]",
+            "type": "Microsoft.Bing/accounts",
+            "kind": "[parameters('kind')]",
+            "sku": {
+                "name": "[parameters('sku')]"
+            }
+        }
+    ],
+    "outputs": {
+      "accessKeys": {
+          "type": "object",
+          "value": {
+              "key1": "[listKeys(resourceId('Microsoft.Bing/accounts', parameters('name')), '2020-06-10').key1]",
+              "key2": "[listKeys(resourceId('Microsoft.Bing/accounts', parameters('name')), '2020-06-10').key2]"
+          }
+      }
+   }    
+}
+TEMPLATE
 }
 
 resource "azurerm_role_assignment" "reader" {

diff --git a/infra/modules/cog/outputs.tf b/infra/modules/cog/outputs.tf
@@ -17,3 +17,7 @@ output "cognitive_service_key" {
 output "speech_key" {
   value = azurerm_cognitive_account.speech.primary_access_key
 }
+
+output "bing_key" {
+  value = jsondecode(azurerm_resource_group_template_deployment.main.output_content).accessKeys.value.key1
+}
diff --git a/infra/modules/cog/variables.tf b/infra/modules/cog/variables.tf
@@ -5,5 +5,4 @@ variable "content_safety_name" {}
 variable "cognitive_services_name" {}
 variable "speech_name" {}
 variable "bing_name" {}
-variable "deploy_bing" {}
 variable "content_safety_storage_resource_id" {}
diff --git a/infra/variables.tf b/infra/variables.tf
@@ -110,14 +110,6 @@ variable "enable_apim" {
   default = false
 }
 
-variable "deploy_bing" {
-  default = false
-}
-
-variable "bing_key" {
-  default = "<replace with a valid bing key>"
-}
-
 variable "pbi_report_link" {
   default = ""
 }