Skip to content

Commit 4b8f38b

Browse files
authored
If an incompatible tree item is passed, treat it as if no tree item was passed (#559)
1 parent 18be7d5 commit 4b8f38b

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/commands/createContainerApp/createContainerApp.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { LocationListStep, ResourceGroupListStep } from "@microsoft/vscode-azext
88
import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, createSubscriptionContext, nonNullProp, nonNullValue, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
99
import { ext } from "../../extensionVariables";
1010
import { ContainerAppItem } from "../../tree/ContainerAppItem";
11-
import type { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
11+
import { ManagedEnvironmentItem } from "../../tree/ManagedEnvironmentItem";
1212
import { createActivityContext } from "../../utils/activity/activityUtils";
1313
import { isAzdExtensionInstalled } from "../../utils/azdUtils";
1414
import { getVerifyProvidersStep } from "../../utils/getVerifyProvidersStep";
@@ -22,6 +22,11 @@ import type { CreateContainerAppContext } from "./CreateContainerAppContext";
2222
import { showContainerAppNotification } from "./showContainerAppNotification";
2323

2424
export async function createContainerApp(context: IActionContext, node?: ManagedEnvironmentItem): Promise<ContainerAppItem> {
25+
// If an incompatible tree item is passed, treat it as if no item was passed
26+
if (node && !ManagedEnvironmentItem.isManagedEnvironmentItem(node)) {
27+
node = undefined;
28+
}
29+
2530
node ??= await pickEnvironment(context);
2631

2732
const wizardContext: CreateContainerAppContext = {

src/commands/deployWorkspaceProject/deployWorkspaceProject.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ import { getDefaultContextValues } from "./getDefaultValues/getDefaultContextVal
3333
export async function deployWorkspaceProject(context: IActionContext, item?: ContainerAppItem | ManagedEnvironmentItem): Promise<void> {
3434
ext.outputChannel.appendLog(localize('beginCommandExecution', '--------Initializing deploy workspace project--------'));
3535

36+
// If an incompatible tree item is passed, treat it as if no item was passed
37+
if (item && !ContainerAppItem.isContainerAppItem(item) && !ManagedEnvironmentItem.isManagedEnvironmentItem(item)) {
38+
item = undefined;
39+
}
40+
3641
const subscription: AzureSubscription = await subscriptionExperience(context, ext.rgApiV2.resources.azureResourceTreeDataProvider);
3742
const subscriptionContext: ISubscriptionContext = createSubscriptionContext(subscription);
3843

0 commit comments

Comments
 (0)