Fix and improve scheduler creation with consumption sku (#4963)

Author: MicroFish91

src/commands/durableTaskScheduler/createScheduler.ts

@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { type ResourceManagementClient } from '@azure/arm-resources';
 import { type AzExtClientContext, createAzureClient, type ILocationWizardContext, type IResourceGroupWizardContext, LocationListStep, parseClientContext, ResourceGroupCreateStep, ResourceGroupListStep, VerifyProvidersStep } from "@microsoft/vscode-azext-azureutils";
-import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, createSubscriptionContext, type ExecuteActivityContext, type IAzureQuickPickItem, type IActionContext, type ISubscriptionActionContext, subscriptionExperience } from "@microsoft/vscode-azext-utils";
+import { AzureWizard, AzureWizardExecuteStepWithActivityOutput, AzureWizardPromptStep, createSubscriptionContext, type ExecuteActivityContext, type ExecuteActivityOutput, type IActionContext, type IAzureQuickPickItem, type ISubscriptionActionContext, subscriptionExperience } from "@microsoft/vscode-azext-utils";
 import { type AzureSubscription } from "@microsoft/vscode-azureresources-api";
+import { type Progress } from "vscode";
 import { DurableTaskProvider, DurableTaskSchedulersResourceType } from "../../constants";
 import { defaultDescription } from "../../constants-nls";
 import { ext } from '../../extensionVariables';
 import { localize } from '../../localize';
-import { DurableTaskSchedulerSku, type DurableTaskSchedulerClient } from "../../tree/durableTaskScheduler/DurableTaskSchedulerClient";
+import { type DurableTaskSchedulerClient, DurableTaskSchedulerSku } from "../../tree/durableTaskScheduler/DurableTaskSchedulerClient";
 import { type DurableTaskSchedulerDataBranchProvider } from "../../tree/durableTaskScheduler/DurableTaskSchedulerDataBranchProvider";
 import { createActivityContext } from "../../utils/activityUtils";
 import { withCancellation } from "../../utils/cancellation";
-import { type Progress } from "vscode";
-import { type ResourceManagementClient } from '@azure/arm-resources';
 
 interface ICreateSchedulerContext extends ISubscriptionActionContext, ILocationWizardContext, IResourceGroupWizardContext, ExecuteActivityContext {
     subscription?: AzureSubscription;
@@ -51,16 +51,30 @@ class SchedulerSkuStep extends AzureWizardPromptStep<ICreateSchedulerContext> {
     }
 }
 
-class SchedulerCreationStep extends AzureWizardExecuteStep<ICreateSchedulerContext> {
-    priority: number = 1;
+class SchedulerCreationStep extends AzureWizardExecuteStepWithActivityOutput<ICreateSchedulerContext> {
+    priority: number = 110;
+    readonly stepName: string = 'schedulerCreationStep';
+
+    protected getTreeItemLabel = (context: ICreateSchedulerContext) => localize('createSchedulerLabel', 'Create Durable Task Scheduler "{0}"', context.schedulerName);
+    protected getOutputLogSuccess = (context: ICreateSchedulerContext) => localize('createSchedulerSuccess', 'Successfully created Durable Task Scheduler "{0}".', context.schedulerName);
+    protected getOutputLogFail = (context: ICreateSchedulerContext) => localize('createSchedulerFail', 'Failed to create Durable Task Scheduler "{0}".', context.schedulerName);
+
+    public createProgressOutput(context: ICreateSchedulerContext): ExecuteActivityOutput {
+        const output = super.createProgressOutput(context);
+        if (output.item) {
+            output.item.description = localize('schedulerProgressDescription', 'This may take a while...');
+        }
+        return output;
+    }
 
     constructor(private readonly schedulerClient: DurableTaskSchedulerClient) {
         super();
     }
 
-    async execute(wizardContext: ICreateSchedulerContext, _: Progress<{ message?: string; increment?: number; }>): Promise<void> {
-        const location = await LocationListStep.getLocation(wizardContext);
+    async execute(wizardContext: ICreateSchedulerContext, progress: Progress<{ message?: string; increment?: number; }>): Promise<void> {
+        progress.report({ message: localize('creatingScheduler', 'Creating Durable Task Scheduler...') });
 
+        const location = await LocationListStep.getLocation(wizardContext);
         const response = await this.schedulerClient.createScheduler(
             wizardContext.subscription as AzureSubscription,
             wizardContext.resourceGroup?.name as string,
@@ -109,7 +123,7 @@ export function createSchedulerCommandFactory(dataBranchProvider: DurableTaskSch
 
             ...actionContext,
             ...createSubscriptionContext(subscription),
-            ...await createActivityContext()
+            ...await createActivityContext({ withChildren: true }),
         };
 
         if (!await isDtsProviderRegistered(wizardContext)) {

src/tree/durableTaskScheduler/DurableTaskSchedulerClient.ts

@@ -23,7 +23,7 @@ interface DurableTaskSchedulerCreateRequest {
         readonly ipAllowlist: string[];
         readonly sku: {
             readonly name: string;
-            readonly capacity: number;
+            readonly capacity?: number;
         };
     };
     readonly tags: unknown;
@@ -95,7 +95,7 @@ export class HttpDurableTaskSchedulerClient implements DurableTaskSchedulerClien
                 ipAllowlist: ['0.0.0.0/0'],
                 sku: {
                     name: sku,
-                    capacity: sku === DurableTaskSchedulerSku.Dedicated ? 1 : 0
+                    ...(sku === DurableTaskSchedulerSku.Dedicated ? { capacity: 1 } : {})
                 }
             },
             tags: {
@@ -187,7 +187,7 @@ export class HttpDurableTaskSchedulerClient implements DurableTaskSchedulerClien
 
     private static getBaseUrl(subscription: AzureSubscription, resourceGroupName?: string, schedulerName?: string, relativeUrl?: string | undefined) {
         const provider = 'Microsoft.DurableTask';
-        const apiVersion = '2024-10-01-preview';
+        const apiVersion = '2025-11-01';
 
         let url = `${subscription.environment.resourceManagerEndpointUrl}subscriptions/${subscription.subscriptionId}`;