Skip to content

Commit 8c5dfd1

Browse files
AzureFunctionAppV2 Changes for Flex and fix race condition. (#20191)
* Adding Logging for the Updates to the AppSettings * Updates to support FlexConsumptionWebAppDeploymentProvider * Updates for FlexConsumption and Kudu Race Condition (#116) * Updated Task Version * Updated with the latest changes for FlexConsumption * Resolved Merge Conflicts * Adding Release Annotation Changes to support APPLICATIONINSIGHTS_CONNECTION_STRING * Fixed Typos in new Logging * Trying to fix build issues * Fixing BuildConifg * Updated Fields again after Sync * Errors on Generated Tasks * Ran BuildConfig again * Updated Codegen files * Sync 'base' task with missing changes --------- Co-authored-by: Merlyn Oppenheim <[email protected]>
1 parent 26503de commit 8c5dfd1

File tree

75 files changed

+3454
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+3454
-649
lines changed

Tasks/AzureFunctionAppV2/Strings/resources.resjson/de-DE/resources.resjson

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,6 @@
176176
"loc.messages.SyncingFunctionTriggers": "Die Trigger für die Funktions-App werden synchronisiert.",
177177
"loc.messages.SyncFunctionTriggersSuccess": "Die Triggersynchronisierung für die Funktions-App wurde erfolgreich abgeschlossen.",
178178
"loc.messages.UpdatedRunFromPackageSettings": "Die WEBSITE_RUN_FROM_PACKAGE-Anwendungseinstellung wurde auf \"%s\" aktualisiert.",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "Die Option \"Bereitstellungstyp\" gilt nicht für Linux-Verbrauch."
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "Die Option \"Bereitstellungstyp\" gilt nicht für Linux-Verbrauch.",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption" : "Die Option \"Bereitstellungstyp\" gilt nicht für Flex-Verbrauch."
180181
}

Tasks/AzureFunctionAppV2/Strings/resources.resjson/en-US/resources.resjson

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"loc.input.help.azureSubscription": "Select the Azure Resource Manager subscription for the deployment.",
1111
"loc.input.label.appType": "App type",
1212
"loc.input.help.appType": "Select the Azure Function App type for the deployment.",
13+
"loc.input.label.isFlexConsumption": "Is Function App on Flex Consumption Plan",
1314
"loc.input.label.appName": "Azure Functions App name",
1415
"loc.input.help.appName": "Enter or Select the name of an existing Azure Functions App. The Function Apps listed will be based on the selected app type.",
1516
"loc.input.label.deployToSlotOrASE": "Deploy to Slot or App Service Environment",
@@ -25,7 +26,7 @@
2526
"loc.input.label.appSettings": "App settings",
2627
"loc.input.help.appSettings": "Edit web app application settings following the syntax -key value . Value containing spaces should be enclosed in double quotes.<br /> <b>Example</b> : -Port 5000 -RequestTimeout 5000 <br /> -WEBSITE_TIME_ZONE \"Eastern Standard Time\"",
2728
"loc.input.label.deploymentMethod": "Deployment method",
28-
"loc.input.help.deploymentMethod": "Choose the deployment method for your Function app. Please note that Linux Consumption apps do not support this configuration.",
29+
"loc.input.help.deploymentMethod": "Choose the deployment method for your Function app. Please note that Linux and Flex Consumption apps do not support this configuration.",
2930
"loc.messages.Invalidwebapppackageorfolderpathprovided": "Invalid App Service package or folder path provided: %s",
3031
"loc.messages.SetParamFilenotfound0": "Set parameters file not found: %s",
3132
"loc.messages.XDTTransformationsappliedsuccessfully": "XML Transformations applied successfully",
@@ -176,5 +177,6 @@
176177
"loc.messages.SyncingFunctionTriggers": "Syncing triggers for function app",
177178
"loc.messages.SyncFunctionTriggersSuccess": "Sync triggers for function app completed successfully",
178179
"loc.messages.UpdatedRunFromPackageSettings": "Updated WEBSITE_RUN_FROM_PACKAGE Application setting to %s",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "The Deployment Type option does not apply for Linux Consumption."
180+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "The Deployment Type option does not apply for Linux Consumption.",
181+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "The Deployment Type option does not apply for Flex Consumption."
180182
}

Tasks/AzureFunctionAppV2/Strings/resources.resjson/es-ES/resources.resjson

+3-1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,7 @@
176176
"loc.messages.SyncingFunctionTriggers": "Sincronizando los desencadenadores para la aplicación de funciones",
177177
"loc.messages.SyncFunctionTriggersSuccess": "La sincronización de los desencadenadores de la aplicación de funciones se ha completado correctamente.",
178178
"loc.messages.UpdatedRunFromPackageSettings": "Se ha actualizado la configuración de aplicación de WEBSITE_RUN_FROM_PACKAGE a %s",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "La opción de Tipo de implementación no se aplica para el Consumo para Linux."
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "La opción de Tipo de implementación no se aplica para el Consumo para Linux.",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption" : "La opción de Tipo de implementación no se aplica para el Consumo para Flex."
181+
180182
}

Tasks/AzureFunctionAppV2/Strings/resources.resjson/fr-FR/resources.resjson

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,6 @@
176176
"loc.messages.SyncingFunctionTriggers": "Synchronisation des déclencheurs pour l'application de fonction",
177177
"loc.messages.SyncFunctionTriggersSuccess": "Synchronisation réussie des déclencheurs de l'application de fonction",
178178
"loc.messages.UpdatedRunFromPackageSettings": "Mise à jour effectuée du paramètre d'application WEBSITE_RUN_FROM_PACKAGE vers %s",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "L’option Type de déploiement ne s’applique pas à consommation Linux."
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "L’option Type de déploiement ne s’applique pas à consommation Linux.",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "L’option Type de déploiement ne s’applique pas à consommation Flex."
180181
}

Tasks/AzureFunctionAppV2/Strings/resources.resjson/it-IT/resources.resjson

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,6 @@
176176
"loc.messages.SyncingFunctionTriggers": "Sincronizzazione dei trigger per l'app per le funzioni",
177177
"loc.messages.SyncFunctionTriggersSuccess": "La sincronizzazione dei trigger per l'app per le funzioni è stata completata",
178178
"loc.messages.UpdatedRunFromPackageSettings": "L'impostazione applicazione WEBSITE_RUN_FROM_PACKAGE è stata aggiornata in %s",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "L'opzione Tipo di distribuzione non è valida per a consumo per Linux."
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "L'opzione Tipo di distribuzione non è valida per a consumo per Linux.",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "L'opzione Tipo di distribuzione non è valida per a consumo per Flex."
180181
}

Tasks/AzureFunctionAppV2/Strings/resources.resjson/ja-JP/resources.resjson

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,6 @@
176176
"loc.messages.SyncingFunctionTriggers": "関数アプリのトリガーを同期しています",
177177
"loc.messages.SyncFunctionTriggersSuccess": "関数アプリの同期トリガーが正常に完了しました",
178178
"loc.messages.UpdatedRunFromPackageSettings": "WEBSITE_RUN_FROM_PACKAGE アプリケーション設定が %s に更新されました",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "[展開の種類] オプションは、Linux 従量課金プランには適用されません。"
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "[展開の種類] オプションは、Linux 従量課金プランには適用されません。",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "[展開の種類] オプションは、Flex 従量課金プランには適用されません。"
180181
}

Tasks/AzureFunctionAppV2/Strings/resources.resjson/ko-KR/resources.resjson

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,6 @@
176176
"loc.messages.SyncingFunctionTriggers": "함수 앱의 트리거를 동기화하는 중",
177177
"loc.messages.SyncFunctionTriggersSuccess": "함수 앱의 트리거 동기화를 완료했습니다.",
178178
"loc.messages.UpdatedRunFromPackageSettings": "WEBSITE_RUN_FROM_PACKAGE 애플리케이션 설정을 %s(으)로 업데이트했습니다.",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "배포 유형 옵션은 Linux 사용에 적용되지 않습니다."
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "배포 유형 옵션은 Linux 사용에 적용되지 않습니다.",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "배포 유형 옵션은 Flex 사용에 적용되지 않습니다."
180181
}

Tasks/AzureFunctionAppV2/Strings/resources.resjson/ru-RU/resources.resjson

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,5 @@
176176
"loc.messages.SyncingFunctionTriggers": "Идет синхронизация триггеров для приложения-функции",
177177
"loc.messages.SyncFunctionTriggersSuccess": "Синхронизация триггеров для приложения-функции успешно завершена.",
178178
"loc.messages.UpdatedRunFromPackageSettings": "Параметр приложения WEBSITE_RUN_FROM_PACKAGE изменен на %s",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "Параметр \"Тип развертывания\" не применяется для Потребление Linux."
180-
}
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "Параметр \"Тип развертывания\" не применяется для Потребление Linux.",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "Параметр \"Тип развертывания\" не применяется для Потребление Flex.",

Tasks/AzureFunctionAppV2/Strings/resources.resjson/zh-CN/resources.resjson

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,6 @@
176176
"loc.messages.SyncingFunctionTriggers": "正在同步函数应用的触发器",
177177
"loc.messages.SyncFunctionTriggersSuccess": "已成功完成函数应用的触发器同步",
178178
"loc.messages.UpdatedRunFromPackageSettings": "已将 WEBSITE_RUN_FROM_PACKAGE 应用程序设置更新为 %s",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "部署类型选项不适用于 Linux 消耗计划。"
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "部署类型选项不适用于 Linux 消耗计划。",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "部署类型选项不适用于 Flex 消耗计划。"
180181
}

Tasks/AzureFunctionAppV2/Strings/resources.resjson/zh-TW/resources.resjson

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,6 @@
176176
"loc.messages.SyncingFunctionTriggers": "正在同步函數應用程式的觸發程序",
177177
"loc.messages.SyncFunctionTriggersSuccess": "已成功完成函數應用程式的同步處理觸發程序",
178178
"loc.messages.UpdatedRunFromPackageSettings": "已將 WEBSITE_RUN_FROM_PACKAGE 應用程式設定更新為 %s",
179-
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "部署類型選項不適用於 Linux 使用量。"
179+
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "部署類型選項不適用於 Linux 使用量。",
180+
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "部署類型選項不適用於 Flex 使用量。"
180181
}

0 commit comments

Comments
 (0)