Create from Deploy feature and some local UX changes #4130
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.md in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { AzureWizardPromptStep, type IAzureQuickPickItem } from "@microsoft/vscode-azext-utils"; | ||
| import { type AzureSubscription } from "@microsoft/vscode-azureresources-api"; | ||
| import { l10n } from "vscode"; | ||
| import { ext } from "../extensionVariables"; | ||
| import { type IFuncDeployContext } from "./deploy/deploy"; | ||
|
|
||
| export class SubscriptionListStep extends AzureWizardPromptStep<IFuncDeployContext> { | ||
| private _picks: IAzureQuickPickItem<AzureSubscription>[] = []; | ||
| private _oneSubscription: boolean = false; | ||
| public async prompt(context: IFuncDeployContext): Promise<void> { | ||
| context.subscription = (await context.ui.showQuickPick(this._picks, { placeHolder: l10n.t("Select a subscription") })).data; | ||
| } | ||
|
|
||
| public shouldPrompt(_: IFuncDeployContext): boolean { | ||
| return !this._oneSubscription; | ||
| } | ||
|
|
||
| public async configureBeforePrompt(context: IFuncDeployContext): Promise<void> { | ||
| this._picks = await this.getPicks(context); | ||
| // auto select if only one subscription | ||
| if (this._picks.length === 1) { | ||
| this._oneSubscription = true; | ||
| context.subscription = this._picks[0].data; | ||
| } | ||
| } | ||
|
|
||
| private async getPicks(_: IFuncDeployContext): Promise<IAzureQuickPickItem<AzureSubscription>[]> { | ||
|
There was a problem hiding this comment. Any reason we didn't just remove the parameter if it's not being used? |
||
| return (await ext.rgApi.getSubscriptions(true)).map(s => { | ||
| return { label: s.name, description: s.subscriptionId, data: s }; | ||
| }); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { type IAppServiceWizardContext } from "@microsoft/vscode-azext-azureappservice"; | ||
| import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils"; | ||
| import { localize } from "../../localize"; | ||
| import { setConsumptionPlanProperties } from "./FunctionAppHostingPlanStep"; | ||
| import { type IFunctionAppWizardContext } from "./IFunctionAppWizardContext"; | ||
|
|
||
| export class ConfigureCommonNamesStep extends AzureWizardPromptStep<IAppServiceWizardContext> { | ||
| public async prompt(_context: IAppServiceWizardContext): Promise<void> { | ||
| // do nothing, will be handled in configuration | ||
| } | ||
|
|
||
| public shouldPrompt(_context: IAppServiceWizardContext): boolean { | ||
| // never prompt | ||
| return false; | ||
| } | ||
|
|
||
| public async configureBeforePrompt(context: IFunctionAppWizardContext): Promise<void> { | ||
| if (!context.advancedCreation) { | ||
| const newName: string | undefined = await context.relatedNameTask; | ||
| if (!newName) { | ||
| throw new Error(localize('noUniqueName', 'Failed to generate unique name for resources. Use advanced creation to manually enter resource names.')); | ||
| } | ||
| context.newResourceGroupName = context.newResourceGroupName || newName; | ||
| setConsumptionPlanProperties(context); | ||
| context.newStorageAccountName = newName; | ||
| context.newAppInsightsName = newName; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it supposed to be "Deploy to Azure..." or "Deploy function to Azure..."?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I think we originally went with "Deploy function to Azure..." but after more discussion, just went with a more generic "Deploy to Azure..."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't think we need to give more context to users on what they are deploying?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I mean you're in the workspace part of the extension so I think it's kind of clear. That being said, I think it still prompts you for a workspace folder.
I'm thinking of adding a right-click context item on the local project node though that also has "Deploy to Azure..." on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well I was thinking that they might need to know that the command is for deploying Functions to Azure and not App Service or anything else. But maybe they should already know?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, you click the Functions symbol to open the menu for the commands. I thought that was kind of the reason we had those buttons there to give them that context.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, that's fine