From 9c5f0b982fd88eac0b13c67a74e020cbb868d8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frantis=CC=8Cek=20Ha=CC=81na?= Date: Sat, 17 Aug 2024 12:35:29 +0200 Subject: [PATCH 1/5] replace TF templates module by native function --- infra/core/ai/bingSearch/bingSearch.tf | 13 ++++--------- infra/core/videoindexer/vi.tf | 12 +++--------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/infra/core/ai/bingSearch/bingSearch.tf b/infra/core/ai/bingSearch/bingSearch.tf index 9a609d74f..e5c42810e 100644 --- a/infra/core/ai/bingSearch/bingSearch.tf +++ b/infra/core/ai/bingSearch/bingSearch.tf @@ -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)}" diff --git a/infra/core/videoindexer/vi.tf b/infra/core/videoindexer/vi.tf index 3dde8e9de..4025eb18d 100644 --- a/infra/core/videoindexer/vi.tf +++ b/infra/core/videoindexer/vi.tf @@ -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)}" From ae05cf492bc6aceb20564a6ebb68482305a2cbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frantis=CC=8Cek=20Ha=CC=81na?= Date: Sat, 17 Aug 2024 13:23:33 +0200 Subject: [PATCH 2/5] upgrade hashicorp/null to 3.2.2 --- infra/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/providers.tf b/infra/providers.tf index a6a8c3370..6aff434ca 100644 --- a/infra/providers.tf +++ b/infra/providers.tf @@ -15,7 +15,7 @@ terraform { } null = { source = "hashicorp/null" - version = "~> 3.0.0" + version = "~> 3.2.2" } } } From 370f72af832c2d97573ce10a7b7443d0f47f626d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:35:28 +0000 Subject: [PATCH 3/5] Bump nltk from 3.8.1 to 3.9 in /functions Bumps [nltk](https://github.com/nltk/nltk) from 3.8.1 to 3.9. - [Changelog](https://github.com/nltk/nltk/blob/develop/ChangeLog) - [Commits](https://github.com/nltk/nltk/compare/3.8.1...3.9) --- updated-dependencies: - dependency-name: nltk dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- functions/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/requirements.txt b/functions/requirements.txt index ae80a8363..4603e86f3 100644 --- a/functions/requirements.txt +++ b/functions/requirements.txt @@ -12,7 +12,7 @@ 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 tenacity == 8.2.3 unstructured[csv,doc,docx,email,html,md,msg,ppt,pptx,text,xlsx,xml] == 0.12.5 pyoo == 1.4 From 911d1b76fc124bd87875400594cf107d0dc1de26 Mon Sep 17 00:00:00 2001 From: dayland <48474707+dayland@users.noreply.github.com> Date: Mon, 2 Sep 2024 23:27:22 +0100 Subject: [PATCH 4/5] Emergency update for dependency issue in ntlk 3.9 --- functions/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/requirements.txt b/functions/requirements.txt index 4603e86f3..cd8c144aa 100644 --- a/functions/requirements.txt +++ b/functions/requirements.txt @@ -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.9 +nltk == 3.9.1 tenacity == 8.2.3 unstructured[csv,doc,docx,email,html,md,msg,ppt,pptx,text,xlsx,xml] == 0.12.5 pyoo == 1.4 azure-search-documents == 11.4.0b11 -beautifulsoup4 == 4.12.2 \ No newline at end of file +beautifulsoup4 == 4.12.2 From b6c3a3b82ca2b08b66f1a5d7dab78cca0f119188 Mon Sep 17 00:00:00 2001 From: dayland <48474707+dayland@users.noreply.github.com> Date: Tue, 3 Sep 2024 02:13:38 +0100 Subject: [PATCH 5/5] Update requirements.txt --- functions/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/requirements.txt b/functions/requirements.txt index cd8c144aa..dd473698e 100644 --- a/functions/requirements.txt +++ b/functions/requirements.txt @@ -14,7 +14,7 @@ azure-cosmos == 4.3.1 azure-storage-queue == 12.6.0 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