Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AzureFunctionAppV2 Changes for Flex and fix race condition. #20191

Merged
merged 20 commits into from
Jul 30, 2024
Merged

AzureFunctionAppV2 Changes for Flex and fix race condition. #20191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fc79532
Adding Logging for the Updates to the AppSettings
FinVamp1 May 14, 2024
0032320
Updates to support FlexConsumptionWebAppDeploymentProvider
FinVamp1 Jun 17, 2024
ab20795
Updates for FlexConsumption and Kudu Race Condition (#116)
FinVamp1 Jul 5, 2024
abce555
Updated Task Version
FinVamp1 Jul 5, 2024
4baa510
Updated with the latest changes for FlexConsumption
FinVamp1 Jul 22, 2024
edf3890
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
FinVamp1 Jul 22, 2024
939c000
Resolved Merge Conflicts
FinVamp1 Jul 22, 2024
26fd789
Merge branch 'master' into users/FinVamp1/FunctionsSprint240
FinVamp1 Jul 25, 2024
4eb851e
Adding Release Annotation Changes to support APPLICATIONINSIGHTS_CONN…
FinVamp1 Jul 25, 2024
aa75d46
Merge branch 'master' into users/FinVamp1/FunctionsSprint240
FinVamp1 Jul 25, 2024
f95cf5e
Fixed Typos in new Logging
FinVamp1 Jul 26, 2024
2fbf2e0
Merge branch 'master' into users/FinVamp1/FunctionsSprint240
FinVamp1 Jul 26, 2024
f8a39e1
Trying to fix build issues
FinVamp1 Jul 26, 2024
0aa2833
Fixing BuildConifg
FinVamp1 Jul 29, 2024
a365a29
Merge branch 'master' into users/FinVamp1/FunctionsSprint240
FinVamp1 Jul 29, 2024
ab1ca23
Updated Fields again after Sync
FinVamp1 Jul 29, 2024
8000da4
Errors on Generated Tasks
FinVamp1 Jul 29, 2024
e37bb39
Ran BuildConfig again
FinVamp1 Jul 29, 2024
ae0d1fb
Updated Codegen files
FinVamp1 Jul 29, 2024
e2e10ee
Sync 'base' task with missing changes
merlynomsft Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Tasks/AzureFunctionAppV2/Strings/resources.resjson/de-DE/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,6 @@
"loc.messages.SyncingFunctionTriggers": "Die Trigger für die Funktions-App werden synchronisiert.",
"loc.messages.SyncFunctionTriggersSuccess": "Die Triggersynchronisierung für die Funktions-App wurde erfolgreich abgeschlossen.",
"loc.messages.UpdatedRunFromPackageSettings": "Die WEBSITE_RUN_FROM_PACKAGE-Anwendungseinstellung wurde auf \"%s\" aktualisiert.",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "Die Option \"Bereitstellungstyp\" gilt nicht für Linux-Verbrauch."
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "Die Option \"Bereitstellungstyp\" gilt nicht für Linux-Verbrauch.",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption" : "Die Option \"Bereitstellungstyp\" gilt nicht für Flex-Verbrauch."
}
6 changes: 4 additions & 2 deletions Tasks/AzureFunctionAppV2/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"loc.input.help.azureSubscription": "Select the Azure Resource Manager subscription for the deployment.",
"loc.input.label.appType": "App type",
"loc.input.help.appType": "Select the Azure Function App type for the deployment.",
"loc.input.label.isFlexConsumption": "Is Function App on Flex Consumption Plan",
"loc.input.label.appName": "Azure Functions App name",
"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.",
"loc.input.label.deployToSlotOrASE": "Deploy to Slot or App Service Environment",
Expand All @@ -25,7 +26,7 @@
"loc.input.label.appSettings": "App settings",
"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\"",
"loc.input.label.deploymentMethod": "Deployment method",
"loc.input.help.deploymentMethod": "Choose the deployment method for your Function app. Please note that Linux Consumption apps do not support this configuration.",
"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.",
"loc.messages.Invalidwebapppackageorfolderpathprovided": "Invalid App Service package or folder path provided: %s",
"loc.messages.SetParamFilenotfound0": "Set parameters file not found: %s",
"loc.messages.XDTTransformationsappliedsuccessfully": "XML Transformations applied successfully",
Expand Down Expand Up @@ -176,5 +177,6 @@
"loc.messages.SyncingFunctionTriggers": "Syncing triggers for function app",
"loc.messages.SyncFunctionTriggersSuccess": "Sync triggers for function app completed successfully",
"loc.messages.UpdatedRunFromPackageSettings": "Updated WEBSITE_RUN_FROM_PACKAGE Application setting to %s",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "The Deployment Type option does not apply for Linux Consumption."
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "The Deployment Type option does not apply for Linux Consumption.",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "The Deployment Type option does not apply for Flex Consumption."
}
4 changes: 3 additions & 1 deletion Tasks/AzureFunctionAppV2/Strings/resources.resjson/es-ES/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,7 @@
"loc.messages.SyncingFunctionTriggers": "Sincronizando los desencadenadores para la aplicación de funciones",
"loc.messages.SyncFunctionTriggersSuccess": "La sincronización de los desencadenadores de la aplicación de funciones se ha completado correctamente.",
"loc.messages.UpdatedRunFromPackageSettings": "Se ha actualizado la configuración de aplicación de WEBSITE_RUN_FROM_PACKAGE a %s",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "La opción de Tipo de implementación no se aplica para el Consumo para Linux."
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "La opción de Tipo de implementación no se aplica para el Consumo para Linux.",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption" : "La opción de Tipo de implementación no se aplica para el Consumo para Flex."

}
3 changes: 2 additions & 1 deletion Tasks/AzureFunctionAppV2/Strings/resources.resjson/fr-FR/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,6 @@
"loc.messages.SyncingFunctionTriggers": "Synchronisation des déclencheurs pour l'application de fonction",
"loc.messages.SyncFunctionTriggersSuccess": "Synchronisation réussie des déclencheurs de l'application de fonction",
"loc.messages.UpdatedRunFromPackageSettings": "Mise à jour effectuée du paramètre d'application WEBSITE_RUN_FROM_PACKAGE vers %s",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "L’option Type de déploiement ne s’applique pas à consommation Linux."
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "L’option Type de déploiement ne s’applique pas à consommation Linux.",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "L’option Type de déploiement ne s’applique pas à consommation Flex."
}
3 changes: 2 additions & 1 deletion Tasks/AzureFunctionAppV2/Strings/resources.resjson/it-IT/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,6 @@
"loc.messages.SyncingFunctionTriggers": "Sincronizzazione dei trigger per l'app per le funzioni",
"loc.messages.SyncFunctionTriggersSuccess": "La sincronizzazione dei trigger per l'app per le funzioni è stata completata",
"loc.messages.UpdatedRunFromPackageSettings": "L'impostazione applicazione WEBSITE_RUN_FROM_PACKAGE è stata aggiornata in %s",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "L'opzione Tipo di distribuzione non è valida per a consumo per Linux."
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "L'opzione Tipo di distribuzione non è valida per a consumo per Linux.",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "L'opzione Tipo di distribuzione non è valida per a consumo per Flex."
}
3 changes: 2 additions & 1 deletion Tasks/AzureFunctionAppV2/Strings/resources.resjson/ja-JP/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,6 @@
"loc.messages.SyncingFunctionTriggers": "関数アプリのトリガーを同期しています",
"loc.messages.SyncFunctionTriggersSuccess": "関数アプリの同期トリガーが正常に完了しました",
"loc.messages.UpdatedRunFromPackageSettings": "WEBSITE_RUN_FROM_PACKAGE アプリケーション設定が %s に更新されました",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "[展開の種類] オプションは、Linux 従量課金プランには適用されません。"
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "[展開の種類] オプションは、Linux 従量課金プランには適用されません。",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "[展開の種類] オプションは、Flex 従量課金プランには適用されません。"
}
3 changes: 2 additions & 1 deletion Tasks/AzureFunctionAppV2/Strings/resources.resjson/ko-KR/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,6 @@
"loc.messages.SyncingFunctionTriggers": "함수 앱의 트리거를 동기화하는 중",
"loc.messages.SyncFunctionTriggersSuccess": "함수 앱의 트리거 동기화를 완료했습니다.",
"loc.messages.UpdatedRunFromPackageSettings": "WEBSITE_RUN_FROM_PACKAGE 애플리케이션 설정을 %s(으)로 업데이트했습니다.",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "배포 유형 옵션은 Linux 사용에 적용되지 않습니다."
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "배포 유형 옵션은 Linux 사용에 적용되지 않습니다.",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "배포 유형 옵션은 Flex 사용에 적용되지 않습니다."
}
4 changes: 2 additions & 2 deletions Tasks/AzureFunctionAppV2/Strings/resources.resjson/ru-RU/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,5 @@
"loc.messages.SyncingFunctionTriggers": "Идет синхронизация триггеров для приложения-функции",
"loc.messages.SyncFunctionTriggersSuccess": "Синхронизация триггеров для приложения-функции успешно завершена.",
"loc.messages.UpdatedRunFromPackageSettings": "Параметр приложения WEBSITE_RUN_FROM_PACKAGE изменен на %s",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "Параметр \"Тип развертывания\" не применяется для Потребление Linux."
}
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "Параметр \"Тип развертывания\" не применяется для Потребление Linux.",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "Параметр \"Тип развертывания\" не применяется для Потребление Flex.",
3 changes: 2 additions & 1 deletion Tasks/AzureFunctionAppV2/Strings/resources.resjson/zh-CN/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,6 @@
"loc.messages.SyncingFunctionTriggers": "正在同步函数应用的触发器",
"loc.messages.SyncFunctionTriggersSuccess": "已成功完成函数应用的触发器同步",
"loc.messages.UpdatedRunFromPackageSettings": "已将 WEBSITE_RUN_FROM_PACKAGE 应用程序设置更新为 %s",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "部署类型选项不适用于 Linux 消耗计划。"
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "部署类型选项不适用于 Linux 消耗计划。",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "部署类型选项不适用于 Flex 消耗计划。"
}
3 changes: 2 additions & 1 deletion Tasks/AzureFunctionAppV2/Strings/resources.resjson/zh-TW/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,6 @@
"loc.messages.SyncingFunctionTriggers": "正在同步函數應用程式的觸發程序",
"loc.messages.SyncFunctionTriggersSuccess": "已成功完成函數應用程式的同步處理觸發程序",
"loc.messages.UpdatedRunFromPackageSettings": "已將 WEBSITE_RUN_FROM_PACKAGE 應用程式設定更新為 %s",
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "部署類型選項不適用於 Linux 使用量。"
"loc.messages.DeploymentTypeNotSupportedForLinuxConsumption": "部署類型選項不適用於 Linux 使用量。",
"loc.messages.DeploymentTypeNotSupportedForFlexConsumption": "部署類型選項不適用於 Flex 使用量。"
}
Loading
Loading