Add CONTROL_PLANE_REGION to common app settings (#182)

feat: lift CONTROL_PLANE_REGION into common function app settings

All three control plane function apps (resource-task, diagnostic-settings-task,
scaling-task) now receive CONTROL_PLANE_REGION via commonAppSettings, not just
scaling-task. Mirrors the change across both deployment paths so they stay in
lockstep:

- ARM/Bicep (control_plane.bicep, dist/azuredeploy.json)
- Python imperative installer (resource_setup.py)

Rebuilt dist artifacts whose contents bundle logging_install/src:
- logging_install/dist/azure_logging_install.pyz
- integration_quickstart/dist/azure_app_registration_quickstart.pyz
- integration_quickstart/dist/azure_log_forwarding_quickstart.pyz

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: kendlelam680

azure/integration_quickstart/dist/azure_app_registration_quickstart.pyz

@@ -97,6 +97,7 @@ var commonAppSettings = [
   { name: DD_SITE_SETTING, value: datadogSite }
   { name: DD_TELEMETRY_SETTING, value: datadogTelemetry ? 'true' : 'false' }
   { name: CONTROL_PLANE_ID_SETTING, value: controlPlaneId }
+  { name: CONTROL_PLANE_REGION_SETTING, value: controlPlaneLocation }
   { name: AZURE_AUTHORITY_SETTING, value: environment().authentication.loginEndpoint }
   { name: 'AzureWebJobsFeatureFlags', value: 'EnableWorkerIndexing' }
   { name: 'FUNCTIONS_EXTENSION_VERSION', value: '~4' }
@@ -163,7 +164,6 @@ resource scalingTask 'Microsoft.Web/sites@2022-09-01' = {
       appSettings: union(commonAppSettings, [
         { name: RESOURCE_GROUP_SETTING, value: controlPlaneResourceGroupName }
         { name: FORWARDER_IMAGE_SETTING, value: forwarderImage }
-        { name: CONTROL_PLANE_REGION_SETTING, value: controlPlaneLocation }
         { name: PII_SCRUBBER_RULES_SETTING, value: piiScrubberRules }
       ])
       linuxFxVersion: 'Python|3.11'

azure/integration_quickstart/dist/azure_log_forwarding_quickstart.pyz

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.40.2.10011",
-      "templateHash": "18303434784922487411"
+      "templateHash": "4805661646382295969"
     }
   },
   "functions": [
@@ -281,7 +281,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.40.2.10011",
-              "templateHash": "8884005524177157862"
+              "templateHash": "3098917315707782675"
             }
           },
           "parameters": {
@@ -421,7 +421,7 @@
               "properties": {
                 "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', format('control-plane-asp-{0}', parameters('controlPlaneId')))]",
                 "siteConfig": {
-                  "appSettings": "[union(createArray(createObject('name', variables('STORAGE_CONNECTION_SETTING'), 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('DD_API_KEY_SETTING'), 'value', parameters('datadogApiKey')), createObject('name', variables('DD_SITE_SETTING'), 'value', parameters('datadogSite')), createObject('name', variables('DD_TELEMETRY_SETTING'), 'value', if(parameters('datadogTelemetry'), 'true', 'false')), createObject('name', variables('CONTROL_PLANE_ID_SETTING'), 'value', parameters('controlPlaneId')), createObject('name', variables('AZURE_AUTHORITY_SETTING'), 'value', environment().authentication.loginEndpoint), createObject('name', 'AzureWebJobsFeatureFlags', 'value', 'EnableWorkerIndexing'), createObject('name', 'FUNCTIONS_EXTENSION_VERSION', 'value', '~4'), createObject('name', 'FUNCTIONS_WORKER_RUNTIME', 'value', 'python'), createObject('name', 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('LOG_LEVEL_SETTING'), 'value', parameters('logLevel'))), createArray(createObject('name', variables('MONITORED_SUBSCRIPTIONS_SETTING'), 'value', parameters('monitoredSubscriptions')), createObject('name', variables('RESOURCE_TAG_FILTERS_SETTING'), 'value', parameters('resourceTagFilters'))))]",
+                  "appSettings": "[union(createArray(createObject('name', variables('STORAGE_CONNECTION_SETTING'), 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('DD_API_KEY_SETTING'), 'value', parameters('datadogApiKey')), createObject('name', variables('DD_SITE_SETTING'), 'value', parameters('datadogSite')), createObject('name', variables('DD_TELEMETRY_SETTING'), 'value', if(parameters('datadogTelemetry'), 'true', 'false')), createObject('name', variables('CONTROL_PLANE_ID_SETTING'), 'value', parameters('controlPlaneId')), createObject('name', variables('CONTROL_PLANE_REGION_SETTING'), 'value', parameters('controlPlaneLocation')), createObject('name', variables('AZURE_AUTHORITY_SETTING'), 'value', environment().authentication.loginEndpoint), createObject('name', 'AzureWebJobsFeatureFlags', 'value', 'EnableWorkerIndexing'), createObject('name', 'FUNCTIONS_EXTENSION_VERSION', 'value', '~4'), createObject('name', 'FUNCTIONS_WORKER_RUNTIME', 'value', 'python'), createObject('name', 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('LOG_LEVEL_SETTING'), 'value', parameters('logLevel'))), createArray(createObject('name', variables('MONITORED_SUBSCRIPTIONS_SETTING'), 'value', parameters('monitoredSubscriptions')), createObject('name', variables('RESOURCE_TAG_FILTERS_SETTING'), 'value', parameters('resourceTagFilters'))))]",
                   "linuxFxVersion": "Python|3.11"
                 },
                 "publicNetworkAccess": "Enabled",
@@ -445,7 +445,7 @@
               "properties": {
                 "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', format('control-plane-asp-{0}', parameters('controlPlaneId')))]",
                 "siteConfig": {
-                  "appSettings": "[union(createArray(createObject('name', variables('STORAGE_CONNECTION_SETTING'), 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('DD_API_KEY_SETTING'), 'value', parameters('datadogApiKey')), createObject('name', variables('DD_SITE_SETTING'), 'value', parameters('datadogSite')), createObject('name', variables('DD_TELEMETRY_SETTING'), 'value', if(parameters('datadogTelemetry'), 'true', 'false')), createObject('name', variables('CONTROL_PLANE_ID_SETTING'), 'value', parameters('controlPlaneId')), createObject('name', variables('AZURE_AUTHORITY_SETTING'), 'value', environment().authentication.loginEndpoint), createObject('name', 'AzureWebJobsFeatureFlags', 'value', 'EnableWorkerIndexing'), createObject('name', 'FUNCTIONS_EXTENSION_VERSION', 'value', '~4'), createObject('name', 'FUNCTIONS_WORKER_RUNTIME', 'value', 'python'), createObject('name', 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('LOG_LEVEL_SETTING'), 'value', parameters('logLevel'))), createArray(createObject('name', variables('RESOURCE_GROUP_SETTING'), 'value', parameters('controlPlaneResourceGroupName'))))]",
+                  "appSettings": "[union(createArray(createObject('name', variables('STORAGE_CONNECTION_SETTING'), 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('DD_API_KEY_SETTING'), 'value', parameters('datadogApiKey')), createObject('name', variables('DD_SITE_SETTING'), 'value', parameters('datadogSite')), createObject('name', variables('DD_TELEMETRY_SETTING'), 'value', if(parameters('datadogTelemetry'), 'true', 'false')), createObject('name', variables('CONTROL_PLANE_ID_SETTING'), 'value', parameters('controlPlaneId')), createObject('name', variables('CONTROL_PLANE_REGION_SETTING'), 'value', parameters('controlPlaneLocation')), createObject('name', variables('AZURE_AUTHORITY_SETTING'), 'value', environment().authentication.loginEndpoint), createObject('name', 'AzureWebJobsFeatureFlags', 'value', 'EnableWorkerIndexing'), createObject('name', 'FUNCTIONS_EXTENSION_VERSION', 'value', '~4'), createObject('name', 'FUNCTIONS_WORKER_RUNTIME', 'value', 'python'), createObject('name', 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('LOG_LEVEL_SETTING'), 'value', parameters('logLevel'))), createArray(createObject('name', variables('RESOURCE_GROUP_SETTING'), 'value', parameters('controlPlaneResourceGroupName'))))]",
                   "linuxFxVersion": "Python|3.11"
                 },
                 "publicNetworkAccess": "Enabled",
@@ -469,7 +469,7 @@
               "properties": {
                 "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', format('control-plane-asp-{0}', parameters('controlPlaneId')))]",
                 "siteConfig": {
-                  "appSettings": "[union(createArray(createObject('name', variables('STORAGE_CONNECTION_SETTING'), 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('DD_API_KEY_SETTING'), 'value', parameters('datadogApiKey')), createObject('name', variables('DD_SITE_SETTING'), 'value', parameters('datadogSite')), createObject('name', variables('DD_TELEMETRY_SETTING'), 'value', if(parameters('datadogTelemetry'), 'true', 'false')), createObject('name', variables('CONTROL_PLANE_ID_SETTING'), 'value', parameters('controlPlaneId')), createObject('name', variables('AZURE_AUTHORITY_SETTING'), 'value', environment().authentication.loginEndpoint), createObject('name', 'AzureWebJobsFeatureFlags', 'value', 'EnableWorkerIndexing'), createObject('name', 'FUNCTIONS_EXTENSION_VERSION', 'value', '~4'), createObject('name', 'FUNCTIONS_WORKER_RUNTIME', 'value', 'python'), createObject('name', 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('LOG_LEVEL_SETTING'), 'value', parameters('logLevel'))), createArray(createObject('name', variables('RESOURCE_GROUP_SETTING'), 'value', parameters('controlPlaneResourceGroupName')), createObject('name', variables('FORWARDER_IMAGE_SETTING'), 'value', variables('forwarderImage')), createObject('name', variables('CONTROL_PLANE_REGION_SETTING'), 'value', parameters('controlPlaneLocation')), createObject('name', variables('PII_SCRUBBER_RULES_SETTING'), 'value', parameters('piiScrubberRules'))))]",
+                  "appSettings": "[union(createArray(createObject('name', variables('STORAGE_CONNECTION_SETTING'), 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('DD_API_KEY_SETTING'), 'value', parameters('datadogApiKey')), createObject('name', variables('DD_SITE_SETTING'), 'value', parameters('datadogSite')), createObject('name', variables('DD_TELEMETRY_SETTING'), 'value', if(parameters('datadogTelemetry'), 'true', 'false')), createObject('name', variables('CONTROL_PLANE_ID_SETTING'), 'value', parameters('controlPlaneId')), createObject('name', variables('CONTROL_PLANE_REGION_SETTING'), 'value', parameters('controlPlaneLocation')), createObject('name', variables('AZURE_AUTHORITY_SETTING'), 'value', environment().authentication.loginEndpoint), createObject('name', 'AzureWebJobsFeatureFlags', 'value', 'EnableWorkerIndexing'), createObject('name', 'FUNCTIONS_EXTENSION_VERSION', 'value', '~4'), createObject('name', 'FUNCTIONS_WORKER_RUNTIME', 'value', 'python'), createObject('name', 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};AccountKey={2}', format('lfostorage{0}', parameters('controlPlaneId')), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', format('lfostorage{0}', parameters('controlPlaneId'))), '2019-06-01').keys[0].value)), createObject('name', variables('LOG_LEVEL_SETTING'), 'value', parameters('logLevel'))), createArray(createObject('name', variables('RESOURCE_GROUP_SETTING'), 'value', parameters('controlPlaneResourceGroupName')), createObject('name', variables('FORWARDER_IMAGE_SETTING'), 'value', variables('forwarderImage')), createObject('name', variables('PII_SCRUBBER_RULES_SETTING'), 'value', parameters('piiScrubberRules'))))]",
                   "linuxFxVersion": "Python|3.11"
                 },
                 "publicNetworkAccess": "Enabled",

azure/logging_install/bicep/control_plane.bicep

@@ -163,6 +163,7 @@ def set_function_app_env_vars(config: Configuration, function_app_name: str):
         "DD_SITE": config.datadog_site,
         "DD_TELEMETRY": "true" if config.datadog_telemetry else "false",
         "CONTROL_PLANE_ID": config.control_plane_id,
+        "CONTROL_PLANE_REGION": config.control_plane_region,
         "LOG_LEVEL": config.log_level,
     }
 
@@ -180,7 +181,6 @@ def set_function_app_env_vars(config: Configuration, function_app_name: str):
         specific_settings = {
             "RESOURCE_GROUP": config.control_plane_rg,
             "FORWARDER_IMAGE": f"{IMAGE_REGISTRY_URL}/forwarder:latest",
-            "CONTROL_PLANE_REGION": config.control_plane_region,
             "PII_SCRUBBER_RULES": config.pii_scrubber_rules,
         }
     else: