Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft #856

Closed
wants to merge 9 commits into from
6 changes: 3 additions & 3 deletions functions/requirements.txt
Original file line number Diff line number Diff line change
@@ -12,9 +12,9 @@ azure-core == 1.30.2
lxml == 4.9.2
azure-cosmos == 4.3.1
azure-storage-queue == 12.6.0
nltk == 3.8.1
nltk == 3.9.1
tenacity == 8.2.3
unstructured[csv,doc,docx,email,html,md,msg,ppt,pptx,text,xlsx,xml] == 0.12.5
unstructured[csv,doc,docx,email,html,md,msg,ppt,pptx,text,xlsx,xml] == 0.15.9
pyoo == 1.4
azure-search-documents == 11.4.0b11
beautifulsoup4 == 4.12.2
beautifulsoup4 == 4.12.2
13 changes: 4 additions & 9 deletions infra/core/ai/bingSearch/bingSearch.tf
Original file line number Diff line number Diff line change
@@ -2,14 +2,6 @@ locals {
arm_file_path = "arm_templates/bing_search/bing.template.json"
}

# Create the Bing Search instance via ARM Template
data "template_file" "workflow" {
template = file(local.arm_file_path)
vars = {
arm_template_schema_mgmt_api = var.arm_template_schema_mgmt_api
}
}

resource "azurerm_resource_group_template_deployment" "bing_search" {
count = var.enableWebChat ? 1 : 0
resource_group_name = var.resourceGroupName
@@ -19,7 +11,10 @@ resource "azurerm_resource_group_template_deployment" "bing_search" {
"sku" = { value = "${var.sku}" },
"tags" = { value = var.tags },
})
template_content = data.template_file.workflow.template

template_content = templatefile(local.arm_file_path, {
arm_template_schema_mgmt_api = var.arm_template_schema_mgmt_api
})
# The filemd5 forces this to run when the file is changed
# this ensures the keys are up-to-date
name = "bingsearch-${filemd5(local.arm_file_path)}"
12 changes: 3 additions & 9 deletions infra/core/videoindexer/vi.tf
Original file line number Diff line number Diff line change
@@ -15,14 +15,6 @@ resource "azurerm_storage_account" "media_storage" {
allow_nested_items_to_be_public = false
}

# Create the VI instance via ARM Template
data "template_file" "workflow" {
template = file(local.arm_file_path)
vars = {
arm_template_schema_mgmt_api = var.arm_template_schema_mgmt_api
}
}

resource "azurerm_user_assigned_identity" "vi" {
resource_group_name = var.resource_group_name
location = var.location
@@ -45,7 +37,9 @@ resource "azurerm_resource_group_template_deployment" "vi" {
"tags" = { value = var.tags },
"apiVersion" = { value = var.video_indexer_api_version }
})
template_content = data.template_file.workflow.template
template_content = templatefile(local.arm_file_path, {
arm_template_schema_mgmt_api = var.arm_template_schema_mgmt_api
})
# The filemd5 forces this to run when the file is changed
# this ensures the keys are up-to-date
name = "avi-${filemd5(local.arm_file_path)}"
2 changes: 1 addition & 1 deletion infra/providers.tf
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ terraform {
}
null = {
source = "hashicorp/null"
version = "~> 3.0.0"
version = "~> 3.2.2"
}
}
}