From 0ad4aa92a679b6503cf3a28ddcdd1afc49fdbd64 Mon Sep 17 00:00:00 2001 From: Ian Jensen <94021216+ianjensenisme@users.noreply.github.com> Date: Thu, 16 Oct 2025 17:22:46 +0000 Subject: [PATCH 1/8] Fix bad default in main.tfvars for local deploy --- infra/main.tfvars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tfvars.json b/infra/main.tfvars.json index 15f4b419..5e5ffb69 100644 --- a/infra/main.tfvars.json +++ b/infra/main.tfvars.json @@ -4,7 +4,7 @@ "use_billing_policy": "${USE_BILLING_POLICY:-false}", "azd_environment_name": "${AZURE_ENV_NAME}", "resource_share_user": ${RESOURCE_SHARE_USER}, - "tags": ${RESOURCE_TAGS}, + "tags": ${RESOURCE_TAGS:-{"name":"AZD-MCS-AZAI"}}, "azure_ai_search_service_principal": { "client_id": "${AZURE_AI_SEARCH_SERVICE_PRINCIPAL_CLIENT_ID}", "enterprise_application_object_id": "${AZURE_AI_SEARCH_ENTERPRISE_APPLICATION_OBJECT_ID}", From 9f4d3e104d141426976be3bf73b63a17527e1fe8 Mon Sep 17 00:00:00 2001 From: Ian Jensen <94021216+ianjensenisme@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:11:21 +0000 Subject: [PATCH 2/8] Try escaping quotes --- infra/main.tfvars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tfvars.json b/infra/main.tfvars.json index 5e5ffb69..21da8fc3 100644 --- a/infra/main.tfvars.json +++ b/infra/main.tfvars.json @@ -4,7 +4,7 @@ "use_billing_policy": "${USE_BILLING_POLICY:-false}", "azd_environment_name": "${AZURE_ENV_NAME}", "resource_share_user": ${RESOURCE_SHARE_USER}, - "tags": ${RESOURCE_TAGS:-{"name":"AZD-MCS-AZAI"}}, + "tags": ${RESOURCE_TAGS:-{\"name\":\"AZD-MCS-AZAI\"}}, "azure_ai_search_service_principal": { "client_id": "${AZURE_AI_SEARCH_SERVICE_PRINCIPAL_CLIENT_ID}", "enterprise_application_object_id": "${AZURE_AI_SEARCH_ENTERPRISE_APPLICATION_OBJECT_ID}", From 4b1cdb98334ee45d8c420f1ee71b4e139632b4f5 Mon Sep 17 00:00:00 2001 From: Ian Jensen <94021216+ianjensenisme@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:30:31 +0000 Subject: [PATCH 3/8] Trying a slightly different format --- infra/main.tfvars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tfvars.json b/infra/main.tfvars.json index 21da8fc3..d46f23ea 100644 --- a/infra/main.tfvars.json +++ b/infra/main.tfvars.json @@ -4,7 +4,7 @@ "use_billing_policy": "${USE_BILLING_POLICY:-false}", "azd_environment_name": "${AZURE_ENV_NAME}", "resource_share_user": ${RESOURCE_SHARE_USER}, - "tags": ${RESOURCE_TAGS:-{\"name\":\"AZD-MCS-AZAI\"}}, + "tags": ${RESOURCE_TAGS:-"{\"name\":\"AZD-MCS-AZAI\"}"}, "azure_ai_search_service_principal": { "client_id": "${AZURE_AI_SEARCH_SERVICE_PRINCIPAL_CLIENT_ID}", "enterprise_application_object_id": "${AZURE_AI_SEARCH_ENTERPRISE_APPLICATION_OBJECT_ID}", From e79c285bcbd1bf02af150bf87a1ba0e9abef55fd Mon Sep 17 00:00:00 2001 From: Ian Jensen <94021216+ianjensenisme@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:38:33 +0000 Subject: [PATCH 4/8] Remove formatting --- infra/main.tfvars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tfvars.json b/infra/main.tfvars.json index d46f23ea..5584b5c7 100644 --- a/infra/main.tfvars.json +++ b/infra/main.tfvars.json @@ -4,7 +4,7 @@ "use_billing_policy": "${USE_BILLING_POLICY:-false}", "azd_environment_name": "${AZURE_ENV_NAME}", "resource_share_user": ${RESOURCE_SHARE_USER}, - "tags": ${RESOURCE_TAGS:-"{\"name\":\"AZD-MCS-AZAI\"}"}, + "tags": ${RESOURCE_TAGS:-{name:AZD-MCS-AZAI}}, "azure_ai_search_service_principal": { "client_id": "${AZURE_AI_SEARCH_SERVICE_PRINCIPAL_CLIENT_ID}", "enterprise_application_object_id": "${AZURE_AI_SEARCH_ENTERPRISE_APPLICATION_OBJECT_ID}", From a1524001656598e10d0ba1bc0b57dd2d2b925db7 Mon Sep 17 00:00:00 2001 From: Ian Jensen <94021216+ianjensenisme@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:41:31 +0000 Subject: [PATCH 5/8] Just quotes --- infra/main.tfvars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tfvars.json b/infra/main.tfvars.json index 5584b5c7..5e5ffb69 100644 --- a/infra/main.tfvars.json +++ b/infra/main.tfvars.json @@ -4,7 +4,7 @@ "use_billing_policy": "${USE_BILLING_POLICY:-false}", "azd_environment_name": "${AZURE_ENV_NAME}", "resource_share_user": ${RESOURCE_SHARE_USER}, - "tags": ${RESOURCE_TAGS:-{name:AZD-MCS-AZAI}}, + "tags": ${RESOURCE_TAGS:-{"name":"AZD-MCS-AZAI"}}, "azure_ai_search_service_principal": { "client_id": "${AZURE_AI_SEARCH_SERVICE_PRINCIPAL_CLIENT_ID}", "enterprise_application_object_id": "${AZURE_AI_SEARCH_ENTERPRISE_APPLICATION_OBJECT_ID}", From 93134463d340de3f54d7b918cc00a8072b12c9cd Mon Sep 17 00:00:00 2001 From: Ian Jensen <94021216+ianjensenisme@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:47:53 +0000 Subject: [PATCH 6/8] Trying just an empty default --- infra/main.tfvars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tfvars.json b/infra/main.tfvars.json index 5e5ffb69..b751aba6 100644 --- a/infra/main.tfvars.json +++ b/infra/main.tfvars.json @@ -4,7 +4,7 @@ "use_billing_policy": "${USE_BILLING_POLICY:-false}", "azd_environment_name": "${AZURE_ENV_NAME}", "resource_share_user": ${RESOURCE_SHARE_USER}, - "tags": ${RESOURCE_TAGS:-{"name":"AZD-MCS-AZAI"}}, + "tags": ${RESOURCE_TAGS:-{}}, "azure_ai_search_service_principal": { "client_id": "${AZURE_AI_SEARCH_SERVICE_PRINCIPAL_CLIENT_ID}", "enterprise_application_object_id": "${AZURE_AI_SEARCH_ENTERPRISE_APPLICATION_OBJECT_ID}", From 6150492f9d6d36bdbfe02e2de28d5e7d9987edb3 Mon Sep 17 00:00:00 2001 From: Ian Jensen <94021216+ianjensenisme@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:52:41 +0000 Subject: [PATCH 7/8] Reverting to the base case for the sanity check --- infra/main.tfvars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.tfvars.json b/infra/main.tfvars.json index b751aba6..15f4b419 100644 --- a/infra/main.tfvars.json +++ b/infra/main.tfvars.json @@ -4,7 +4,7 @@ "use_billing_policy": "${USE_BILLING_POLICY:-false}", "azd_environment_name": "${AZURE_ENV_NAME}", "resource_share_user": ${RESOURCE_SHARE_USER}, - "tags": ${RESOURCE_TAGS:-{}}, + "tags": ${RESOURCE_TAGS}, "azure_ai_search_service_principal": { "client_id": "${AZURE_AI_SEARCH_SERVICE_PRINCIPAL_CLIENT_ID}", "enterprise_application_object_id": "${AZURE_AI_SEARCH_ENTERPRISE_APPLICATION_OBJECT_ID}", From c08e744188be3af9513410b180ec6563ddb82fe3 Mon Sep 17 00:00:00 2001 From: Ian Jensen <94021216+ianjensenisme@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:56:24 +0000 Subject: [PATCH 8/8] Changing where RESOURCE_TAGS gets checked/updated --- .../hooks/preprovision/run_preconfig.ps1 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/azd-hooks/scripts/hooks/preprovision/run_preconfig.ps1 b/azd-hooks/scripts/hooks/preprovision/run_preconfig.ps1 index 3f15d71b..3db19561 100644 --- a/azd-hooks/scripts/hooks/preprovision/run_preconfig.ps1 +++ b/azd-hooks/scripts/hooks/preprovision/run_preconfig.ps1 @@ -180,4 +180,21 @@ try { Write-Host "✗ Error checking RS_CONTAINER_NAME environment variable: $($_.Exception.Message)" Write-Host "ℹ Make sure you're in an azd environment directory" exit 1 +} + +# Set default RESOURCE_TAGS if not already set +Write-Host "Checking RESOURCE_TAGS environment variable..." +try { + $resourceTags = $env:RESOURCE_TAGS + if ([string]::IsNullOrWhiteSpace($resourceTags)) { + Write-Host "RESOURCE_TAGS not set, using default value" + $defaultTags = '{"name":"AZD-MCS-AZAI"}' + azd env set RESOURCE_TAGS $defaultTags + Write-Host "RESOURCE_TAGS set to default: $defaultTags" + } else { + Write-Host "RESOURCE_TAGS already set to: $resourceTags" + } +} catch { + Write-Host "Error checking RESOURCE_TAGS: $($_.Exception.Message)" + # Non-fatal - Terraform will use its variable default if this fails } \ No newline at end of file