From 4cf8759a6c77c413ed32e28c8c4139bc0440c8d3 Mon Sep 17 00:00:00 2001
From: Marvin Buss <marvin.buss@gmail.com>
Date: Thu, 19 Sep 2024 17:15:14 +0200
Subject: [PATCH 1/3] Update all backend dependencies

---
 code/backend/requirements.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/backend/requirements.txt b/code/backend/requirements.txt
index d7f7388..df637df 100644
--- a/code/backend/requirements.txt
+++ b/code/backend/requirements.txt
@@ -1,11 +1,11 @@
 azure-identity~=1.17.1
-azure-monitor-opentelemetry~=1.6.1
-botbuilder-core~=4.16.1
-botbuilder-azure~=4.16.1
-botbuilder-integration-aiohttp~=4.16.1
-botbuilder-dialogs~=4.16.1
-openai~=1.44.1
-opentelemetry-instrumentation-aiohttp-client~=0.47b0
-opentelemetry-instrumentation-aiohttp-server~=0.47b0
-pydantic~=2.9.0
-pydantic-settings~=2.4.0
+azure-monitor-opentelemetry~=1.6.2
+botbuilder-core~=4.16.2
+botbuilder-azure~=4.16.2
+botbuilder-integration-aiohttp~=4.16.2
+botbuilder-dialogs~=4.16.2
+openai~=1.46.1
+opentelemetry-instrumentation-aiohttp-client~=0.48b0
+opentelemetry-instrumentation-aiohttp-server~=0.48b0
+pydantic~=2.9.2
+pydantic-settings~=2.5.2

From 840665c868d26def623f07425c96a8c4b3a0bf53 Mon Sep 17 00:00:00 2001
From: Marvin Buss <marvin.buss@gmail.com>
Date: Thu, 19 Sep 2024 17:25:41 +0200
Subject: [PATCH 2/3] Add concurrency to workflow

---
 .github/workflows/_terraformDestroyTemplate.yml     | 3 +++
 .github/workflows/_terraformEnvironmentTemplate.yml | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/.github/workflows/_terraformDestroyTemplate.yml b/.github/workflows/_terraformDestroyTemplate.yml
index 64ea241..a6576b1 100644
--- a/.github/workflows/_terraformDestroyTemplate.yml
+++ b/.github/workflows/_terraformDestroyTemplate.yml
@@ -57,6 +57,9 @@ jobs:
     continue-on-error: false
     environment: ${{ inputs.environment }}
     if: github.event_name == 'push' || github.event_name == 'release'
+    concurrency:
+      group: terraform-${{ inputs.config }}-${{ inputs.environment }}
+      cancel-in-progress: false
 
     env:
       ARM_TENANT_ID: ${{ inputs.tenant_id }}
diff --git a/.github/workflows/_terraformEnvironmentTemplate.yml b/.github/workflows/_terraformEnvironmentTemplate.yml
index 4297ad4..3891318 100644
--- a/.github/workflows/_terraformEnvironmentTemplate.yml
+++ b/.github/workflows/_terraformEnvironmentTemplate.yml
@@ -103,6 +103,9 @@ jobs:
     continue-on-error: false
     environment: ${{ inputs.environment }}
     needs: [lint]
+    concurrency:
+      group: terraform-${{ inputs.config }}-${{ inputs.environment }}
+      cancel-in-progress: false
 
     env:
       ARM_TENANT_ID: ${{ inputs.tenant_id }}
@@ -199,6 +202,9 @@ jobs:
     environment: ${{ inputs.environment }}
     # if: github.event_name == 'push' || github.event_name == 'release'
     needs: [plan]
+    concurrency:
+      group: terraform-${{ inputs.config }}-${{ inputs.environment }}
+      cancel-in-progress: false
 
     env:
       ARM_TENANT_ID: ${{ inputs.tenant_id }}

From c791107e8d28cd479d9d8f2722a01216b234d23b Mon Sep 17 00:00:00 2001
From: Marvin Buss <marvin.buss@gmail.com>
Date: Fri, 20 Sep 2024 00:14:53 +0200
Subject: [PATCH 3/3] Disable app insights key

---
 code/infra/botservice.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/infra/botservice.tf b/code/infra/botservice.tf
index 6573b1f..cc4b53c 100644
--- a/code/infra/botservice.tf
+++ b/code/infra/botservice.tf
@@ -25,6 +25,7 @@ module "bot_service" {
   bot_service_streaming_endpoint_enabled       = false
   bot_service_public_network_access_enabled    = true
   bot_service_application_insights_id          = module.application_insights.application_insights_id
+  bot_service_application_insights_key_enabled = false
   diagnostics_configurations                   = local.diagnostics_configurations
   subnet_id                                    = azapi_resource.subnet_private_endpoints.id
   connectivity_delay_in_seconds                = var.connectivity_delay_in_seconds