From 52d73b82e26732dbb134027eebb0786cc81b63f8 Mon Sep 17 00:00:00 2001 From: Peter Kahle Date: Thu, 8 Oct 2020 08:42:23 -0400 Subject: [PATCH] Sovereign cloud support (#74) * Adding the basics of sovereign cloud support. * Using suffixes from environment * Fixing additional storage backend references. Co-authored-by: Peter Kahle Co-authored-by: Peter Kahle --- src/DroneStatus/azuredeploy-slots.json | 4 ++-- src/azuredeploy-backend-functionapps-v2.json | 4 ++-- src/azuredeploy-backend-functionapps.json | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/DroneStatus/azuredeploy-slots.json b/src/DroneStatus/azuredeploy-slots.json index d7eabda..9d8b8cf 100644 --- a/src/DroneStatus/azuredeploy-slots.json +++ b/src/DroneStatus/azuredeploy-slots.json @@ -111,11 +111,11 @@ "appSettings": [ { "name": "AzureWebJobsStorage", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccountName'), ';AccountKey=', listKeys(variables('storageAccountid'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccountName'), ';AccountKey=', listKeys(variables('storageAccountid'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccountName'), ';AccountKey=', listKeys(variables('storageAccountid'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccountName'), ';AccountKey=', listKeys(variables('storageAccountid'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTSHARE", diff --git a/src/azuredeploy-backend-functionapps-v2.json b/src/azuredeploy-backend-functionapps-v2.json index 6f14cb0..0701ef8 100644 --- a/src/azuredeploy-backend-functionapps-v2.json +++ b/src/azuredeploy-backend-functionapps-v2.json @@ -132,11 +132,11 @@ "appSettings": [ { "name": "AzureWebJobsStorage", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneStatusStorageAccountName'), ';AccountKey=', listKeys(variables('droneStatusStorageAccountId'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneStatusStorageAccountName'), ';AccountKey=', listKeys(variables('droneStatusStorageAccountId'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneStatusStorageAccountName'), ';AccountKey=', listKeys(variables('droneStatusStorageAccountId'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneStatusStorageAccountName'), ';AccountKey=', listKeys(variables('droneStatusStorageAccountId'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTSHARE", diff --git a/src/azuredeploy-backend-functionapps.json b/src/azuredeploy-backend-functionapps.json index d4f6107..007cf27 100644 --- a/src/azuredeploy-backend-functionapps.json +++ b/src/azuredeploy-backend-functionapps.json @@ -223,11 +223,11 @@ "appSettings": [ { "name": "AzureWebJobsStorage", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneStatusStorageAccountName'), ';AccountKey=', listKeys(variables('droneStatusStorageAccountId'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneStatusStorageAccountName'), ';AccountKey=', listKeys(variables('droneStatusStorageAccountId'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneStatusStorageAccountName'), ';AccountKey=', listKeys(variables('droneStatusStorageAccountId'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneStatusStorageAccountName'), ';AccountKey=', listKeys(variables('droneStatusStorageAccountId'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTSHARE", @@ -389,11 +389,11 @@ "appSettings": [ { "name": "AzureWebJobsStorage", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneTelemetryStorageAccountName'), ';AccountKey=', listKeys(variables('droneTelemetryStorageAccountId'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneTelemetryStorageAccountName'), ';AccountKey=', listKeys(variables('droneTelemetryStorageAccountId'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneTelemetryStorageAccountName'), ';AccountKey=', listKeys(variables('droneTelemetryStorageAccountId'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneTelemetryStorageAccountName'), ';AccountKey=', listKeys(variables('droneTelemetryStorageAccountId'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTSHARE", @@ -441,7 +441,7 @@ }, { "name": "DeadLetterStorage", - "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneTelemetryDeadLetterStorageQueueAccountName'), ';AccountKey=', listKeys(variables('droneTelemetryDeadLetterStorageQueueAccountId'),'2015-05-01-preview').key1)]" + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('droneTelemetryDeadLetterStorageQueueAccountName'), ';AccountKey=', listKeys(variables('droneTelemetryDeadLetterStorageQueueAccountId'),'2015-05-01-preview').key1, ';EndpointSuffix=',environment().suffixes.storage)]" } ] }