Fix name validation for containerized function apps (#4012)
* Fix name validation * Change casing * use ternary * upgrade appservice package * push broke * try again
This commit is contained in:
Родитель
f91a838900
Коммит
96b2972ea3
|
@ -19,7 +19,7 @@
|
|||
"@azure/core-client": "^1.7.3",
|
||||
"@azure/core-rest-pipeline": "^1.11.0",
|
||||
"@azure/storage-blob": "^12.5.0",
|
||||
"@microsoft/vscode-azext-azureappservice": "^3.1.1",
|
||||
"@microsoft/vscode-azext-azureappservice": "^3.1.2",
|
||||
"@microsoft/vscode-azext-azureappsettings": "^0.2.1",
|
||||
"@microsoft/vscode-azext-azureutils": "^3.0.0",
|
||||
"@microsoft/vscode-azext-serviceconnector": "^0.1.3",
|
||||
|
@ -873,9 +873,10 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@microsoft/vscode-azext-azureappservice": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-3.1.1.tgz",
|
||||
"integrity": "sha512-E/yvExbpjAlD6FXJdu1sRGdO2t0jwcUeOZla/8Hxj2ZAQI45JIcP71mLMBSMj81pf6q5B9OBY5jJAoTvhGjQoA==",
|
||||
"version": "3.1.2",
|
||||
"resolved": "file:../vscode-azuretools/appservice/microsoft-vscode-azext-azureappservice-3.1.2.tgz",
|
||||
"integrity": "sha512-uPT0C6QB4NmmxTdVghYXbe5urpvU5HCMANQYvmNEjz7Yxst8xfGA8CMoA84W84jIu4o/HP54jjA4Rio4U9pC4Q==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@azure/abort-controller": "^1.0.4",
|
||||
"@azure/arm-appinsights": "^5.0.0-beta.4",
|
||||
|
@ -13987,9 +13988,8 @@
|
|||
}
|
||||
},
|
||||
"@microsoft/vscode-azext-azureappservice": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-azureappservice/-/vscode-azext-azureappservice-3.1.1.tgz",
|
||||
"integrity": "sha512-E/yvExbpjAlD6FXJdu1sRGdO2t0jwcUeOZla/8Hxj2ZAQI45JIcP71mLMBSMj81pf6q5B9OBY5jJAoTvhGjQoA==",
|
||||
"version": "3.1.2",
|
||||
"integrity": "sha512-uPT0C6QB4NmmxTdVghYXbe5urpvU5HCMANQYvmNEjz7Yxst8xfGA8CMoA84W84jIu4o/HP54jjA4Rio4U9pC4Q==",
|
||||
"requires": {
|
||||
"@azure/abort-controller": "^1.0.4",
|
||||
"@azure/arm-appinsights": "^5.0.0-beta.4",
|
||||
|
|
|
@ -1178,7 +1178,7 @@
|
|||
"@azure/core-client": "^1.7.3",
|
||||
"@azure/core-rest-pipeline": "^1.11.0",
|
||||
"@azure/storage-blob": "^12.5.0",
|
||||
"@microsoft/vscode-azext-azureappservice": "^3.1.1",
|
||||
"@microsoft/vscode-azext-azureappservice": "^3.1.2",
|
||||
"@microsoft/vscode-azext-azureappsettings": "^0.2.1",
|
||||
"@microsoft/vscode-azext-azureutils": "^3.0.0",
|
||||
"@microsoft/vscode-azext-serviceconnector": "^0.1.3",
|
||||
|
|
|
@ -108,8 +108,6 @@ export class SubscriptionTreeItem extends SubscriptionTreeItemBase {
|
|||
const promptSteps: AzureWizardPromptStep<IAppServiceWizardContext>[] = [];
|
||||
const executeSteps: AzureWizardExecuteStep<IAppServiceWizardContext>[] = [];
|
||||
|
||||
promptSteps.push(new SiteNameStep("functionApp"));
|
||||
|
||||
const storageAccountCreateOptions: INewStorageAccountDefaults = {
|
||||
kind: StorageAccountKind.Storage,
|
||||
performance: StorageAccountPerformance.Standard,
|
||||
|
@ -118,6 +116,8 @@ export class SubscriptionTreeItem extends SubscriptionTreeItemBase {
|
|||
|
||||
await detectDockerfile(context);
|
||||
|
||||
promptSteps.push(new SiteNameStep(context.dockerfilePath ? "containerizedFunctionApp" : "functionApp"));
|
||||
|
||||
if (context.dockerfilePath) {
|
||||
const containerizedfunctionAppWizard = await createContainerizedFunctionAppWizard();
|
||||
promptSteps.push(...containerizedfunctionAppWizard.promptSteps);
|
||||
|
|
Загрузка…
Ссылка в новой задаче