Rename context vars

MicroFish91 · MicroFish91 · commit ab5bfb21c3e4 · 2023-08-21T10:30:43.000-07:00
diff --git a/src/commands/scaling/addScaleRule/AddScaleRuleStep.ts b/src/commands/scaling/addScaleRule/AddScaleRuleStep.ts
@@ -28,16 +28,16 @@ export class AddScaleRuleStep<T extends IAddScaleRuleContext> extends RevisionDr
         this.updateRevisionDraftWithTemplate();
 
         const resourceName = context.containerApp.revisionsMode === KnownActiveRevisionsMode.Single ? context.containerApp.name : this.baseItem.revision.name;
-        ext.outputChannel.appendLog(localize('addedScaleRule', 'Added {0} rule "{1}" to "{2}" (draft)', context.ruleType, context.ruleName, resourceName));
+        ext.outputChannel.appendLog(localize('addedScaleRule', 'Added {0} rule "{1}" to "{2}" (draft)', context.newRuleType, context.newRuleName, resourceName));
     }
 
     public shouldExecute(context: IAddScaleRuleContext): boolean {
-        return !!context.ruleName && !!context.ruleType;
+        return !!context.newRuleName && !!context.newRuleType;
     }
 
     private buildRule(context: IAddScaleRuleContext): ScaleRule {
-        const scaleRule: ScaleRule = { name: context.ruleName };
-        switch (context.ruleType) {
+        const scaleRule: ScaleRule = { name: context.newRuleName };
+        switch (context.newRuleType) {
             case ScaleRuleTypes.HTTP:
                 scaleRule.http = {
                     metadata: {
@@ -47,9 +47,9 @@ export class AddScaleRuleStep<T extends IAddScaleRuleContext> extends RevisionDr
                 break;
             case ScaleRuleTypes.Queue:
                 scaleRule.azureQueue = {
-                    queueName: context.queueName,
-                    queueLength: context.queueLength,
-                    auth: [{ secretRef: context.secretRef, triggerParameter: context.triggerParameter }]
+                    queueName: context.newQueueName,
+                    queueLength: context.newQueueLength,
+                    auth: [{ secretRef: context.newQueueSecretRef, triggerParameter: context.newQueueTriggerParameter }]
                 }
                 break;
             default:
@@ -58,7 +58,7 @@ export class AddScaleRuleStep<T extends IAddScaleRuleContext> extends RevisionDr
     }
 
     private integrateRule(context: IAddScaleRuleContext, scaleRules: ScaleRule[], scaleRule: ScaleRule): void {
-        switch (context.ruleType) {
+        switch (context.newRuleType) {
             case ScaleRuleTypes.HTTP:
                 // Portal only allows one HTTP rule per revision
                 const idx: number = scaleRules.findIndex((rule) => rule.http);
diff --git a/src/commands/scaling/addScaleRule/IAddScaleRuleContext.ts b/src/commands/scaling/addScaleRule/IAddScaleRuleContext.ts
@@ -14,17 +14,17 @@ export interface IAddScaleRuleContext extends IContainerAppContext, ExecuteActiv
     parentResourceName: string;
 
     // Base Rule Properties
-    ruleName?: string;
-    ruleType?: string;
+    newRuleName?: string;
+    newRuleType?: string;
 
     // HTTP Rule Properties
-    concurrentRequests?: string;
+    newHttpConcurrentRequests?: string;
 
     // Queue Rule Properties
-    queueName?: string;
-    queueLength?: number;
-    secretRef?: string;
-    triggerParameter?: string;
+    newQueueName?: string;
+    newQueueLength?: number;
+    newQueueSecretRef?: string;
+    newQueueTriggerParameter?: string;
 
     scaleRule?: ScaleRule;
 }
diff --git a/src/commands/scaling/addScaleRule/ScaleRuleNameStep.ts b/src/commands/scaling/addScaleRule/ScaleRuleNameStep.ts
@@ -13,15 +13,15 @@ export class ScaleRuleNameStep extends AzureWizardPromptStep<IAddScaleRuleContex
     public hideStepCount: boolean = true;
 
     public async prompt(context: IAddScaleRuleContext): Promise<void> {
-        context.ruleName = (await context.ui.showInputBox({
+        context.newRuleName = (await context.ui.showInputBox({
             prompt: localize('scaleRuleNamePrompt', 'Enter a name for the new scale rule.'),
             validateInput: this.validateInput,
             asyncValidationTask: (name: string) => this.validateNameAvailable(context, name)
         })).trim();
     }
 
     public shouldPrompt(context: IAddScaleRuleContext): boolean {
-        return !context.ruleName;
+        return !context.newRuleName;
     }
 
     private validateInput(name: string | undefined): string | undefined {
diff --git a/src/commands/scaling/addScaleRule/ScaleRuleTypeListStep.ts b/src/commands/scaling/addScaleRule/ScaleRuleTypeListStep.ts
@@ -22,18 +22,18 @@ export class ScaleRuleTypeListStep extends AzureWizardPromptStep<IAddScaleRuleCo
             return { label: type };
         });
 
-        context.ruleType = (await context.ui.showQuickPick(qpItems, {
+        context.newRuleType = (await context.ui.showQuickPick(qpItems, {
             placeHolder: localize('chooseScaleType', 'Choose scale type')
         })).label;
     }
 
     public shouldPrompt(context: IAddScaleRuleContext): boolean {
-        return !context.ruleType;
+        return !context.newRuleType;
     }
 
     public async getSubWizard(context: IAddScaleRuleContext): Promise<IWizardOptions<IAddScaleRuleContext>> {
         const promptSteps: AzureWizardPromptStep<IAddScaleRuleContext>[] = [];
-        switch (context.ruleType) {
+        switch (context.newRuleType) {
             case ScaleRuleTypes.HTTP:
                 promptSteps.push(new HttpConcurrentRequestsStep());
                 break;
diff --git a/src/commands/scaling/addScaleRule/addScaleRule.ts b/src/commands/scaling/addScaleRule/addScaleRule.ts
@@ -40,7 +40,7 @@ export async function addScaleRule(context: IActionContext, node?: ScaleRuleGrou
 
     await wizard.prompt();
 
-    wizardContext.activityTitle = localize('addScaleRuleTitle', 'Add {0} rule "{1}" to "{2}" (draft)', wizardContext.ruleType, wizardContext.ruleName, parentResource.name);
+    wizardContext.activityTitle = localize('addScaleRuleTitle', 'Add {0} rule "{1}" to "{2}" (draft)', wizardContext.newRuleType, wizardContext.newRuleName, parentResource.name);
 
     await wizard.execute();
 }
diff --git a/src/commands/scaling/addScaleRule/http/HttpConcurrentRequestsStep.ts b/src/commands/scaling/addScaleRule/http/HttpConcurrentRequestsStep.ts
@@ -9,14 +9,14 @@ import { PositiveRealNumberBaseStep } from '../PositiveRealNumberBaseStep';
 
 export class HttpConcurrentRequestsStep extends PositiveRealNumberBaseStep {
     public async prompt(context: IAddScaleRuleContext): Promise<void> {
-        context.concurrentRequests = (await context.ui.showInputBox({
+        context.newHttpConcurrentRequests = (await context.ui.showInputBox({
             prompt: localize('concurrentRequestsPrompt', 'Enter the number of concurrent requests.'),
             validateInput: this.validateInput
         })).trim();
     }
 
     public shouldPrompt(context: IAddScaleRuleContext): boolean {
-        return !context.concurrentRequests;
+        return !context.newHttpConcurrentRequests;
     }
 }
 
diff --git a/src/commands/scaling/addScaleRule/queue/QueueAuthSecretStep.ts b/src/commands/scaling/addScaleRule/queue/QueueAuthSecretStep.ts
@@ -22,10 +22,10 @@ export class QueueAuthSecretStep extends AzureWizardPromptStep<IAddScaleRuleCont
         const qpItems: QuickPickItem[] = secrets.map((secret) => {
             return { label: nonNullProp(secret, "name") };
         });
-        context.secretRef = (await context.ui.showQuickPick(qpItems, { placeHolder })).label;
+        context.newQueueSecretRef = (await context.ui.showQuickPick(qpItems, { placeHolder })).label;
     }
 
     public shouldPrompt(context: IAddScaleRuleContext): boolean {
-        return context.secretRef === undefined;
+        return context.newQueueSecretRef === undefined;
     }
 }
diff --git a/src/commands/scaling/addScaleRule/queue/QueueAuthTriggerStep.ts b/src/commands/scaling/addScaleRule/queue/QueueAuthTriggerStep.ts
@@ -9,14 +9,14 @@ import type { IAddScaleRuleContext } from '../IAddScaleRuleContext';
 
 export class QueueAuthTriggerStep extends AzureWizardPromptStep<IAddScaleRuleContext> {
     public async prompt(context: IAddScaleRuleContext): Promise<void> {
-        context.triggerParameter = (await context.ui.showInputBox({
+        context.newQueueTriggerParameter = (await context.ui.showInputBox({
             prompt: localize('queueAuthTriggerPrompt', 'Enter a corresponding trigger parameter.'),
             validateInput: this.validateInput
         })).trim();
     }
 
     public shouldPrompt(context: IAddScaleRuleContext): boolean {
-        return !context.triggerParameter;
+        return !context.newQueueTriggerParameter;
     }
 
     private validateInput(name: string | undefined): string | undefined {
diff --git a/src/commands/scaling/addScaleRule/queue/QueueLengthStep.ts b/src/commands/scaling/addScaleRule/queue/QueueLengthStep.ts
@@ -9,14 +9,14 @@ import { PositiveRealNumberBaseStep } from '../PositiveRealNumberBaseStep';
 
 export class QueueLengthStep extends PositiveRealNumberBaseStep {
     public async prompt(context: IAddScaleRuleContext): Promise<void> {
-        context.queueLength = Number((await context.ui.showInputBox({
+        context.newQueueLength = Number((await context.ui.showInputBox({
             prompt: localize('queueLengthPrompt', 'Enter a queue length.'),
             validateInput: this.validateInput
         })).trim());
     }
 
     public shouldPrompt(context: IAddScaleRuleContext): boolean {
-        return !context.queueLength;
+        return !context.newQueueLength;
     }
 }
 
diff --git a/src/commands/scaling/addScaleRule/queue/QueueNameStep.ts b/src/commands/scaling/addScaleRule/queue/QueueNameStep.ts
@@ -9,14 +9,14 @@ import type { IAddScaleRuleContext } from '../IAddScaleRuleContext';
 
 export class QueueNameStep extends AzureWizardPromptStep<IAddScaleRuleContext> {
     public async prompt(context: IAddScaleRuleContext): Promise<void> {
-        context.queueName = (await context.ui.showInputBox({
+        context.newQueueName = (await context.ui.showInputBox({
             prompt: localize('queueNamePrompt', 'Enter a name for the queue.'),
             validateInput: this.validateInput
         })).trim();
     }
 
     public shouldPrompt(context: IAddScaleRuleContext): boolean {
-        return !context.queueName;
+        return !context.newQueueName;
     }
 
     private validateInput(name: string | undefined): string | undefined {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export async function addScaleRule(context: IActionContext, node?: ScaleRuleGrou`
`40`	`40`
`41`	`41`	`await wizard.prompt();`
`42`	`42`
`43`		`- wizardContext.activityTitle = localize('addScaleRuleTitle', 'Add {0} rule "{1}" to "{2}" (draft)', wizardContext.ruleType, wizardContext.ruleName, parentResource.name);`
	`43`	`+ wizardContext.activityTitle = localize('addScaleRuleTitle', 'Add {0} rule "{1}" to "{2}" (draft)', wizardContext.newRuleType, wizardContext.newRuleName, parentResource.name);`
`44`	`44`
`45`	`45`	`await wizard.execute();`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ import { PositiveRealNumberBaseStep } from '../PositiveRealNumberBaseStep';`
`9`	`9`
`10`	`10`	`export class HttpConcurrentRequestsStep extends PositiveRealNumberBaseStep {`
`11`	`11`	`public async prompt(context: IAddScaleRuleContext): Promise<void> {`
`12`		`- context.concurrentRequests = (await context.ui.showInputBox({`
	`12`	`+ context.newHttpConcurrentRequests = (await context.ui.showInputBox({`
`13`	`13`	`prompt: localize('concurrentRequestsPrompt', 'Enter the number of concurrent requests.'),`
`14`	`14`	`validateInput: this.validateInput`
`15`	`15`	`})).trim();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public shouldPrompt(context: IAddScaleRuleContext): boolean {`
`19`		`- return !context.concurrentRequests;`
	`19`	`+ return !context.newHttpConcurrentRequests;`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ export class QueueAuthSecretStep extends AzureWizardPromptStep<IAddScaleRuleCont`
`22`	`22`	`const qpItems: QuickPickItem[] = secrets.map((secret) => {`
`23`	`23`	`return { label: nonNullProp(secret, "name") };`
`24`	`24`	`});`
`25`		`- context.secretRef = (await context.ui.showQuickPick(qpItems, { placeHolder })).label;`
	`25`	`+ context.newQueueSecretRef = (await context.ui.showQuickPick(qpItems, { placeHolder })).label;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public shouldPrompt(context: IAddScaleRuleContext): boolean {`
`29`		`- return context.secretRef === undefined;`
	`29`	`+ return context.newQueueSecretRef === undefined;`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ import type { IAddScaleRuleContext } from '../IAddScaleRuleContext';`
`9`	`9`
`10`	`10`	`export class QueueAuthTriggerStep extends AzureWizardPromptStep<IAddScaleRuleContext> {`
`11`	`11`	`public async prompt(context: IAddScaleRuleContext): Promise<void> {`
`12`		`- context.triggerParameter = (await context.ui.showInputBox({`
	`12`	`+ context.newQueueTriggerParameter = (await context.ui.showInputBox({`
`13`	`13`	`prompt: localize('queueAuthTriggerPrompt', 'Enter a corresponding trigger parameter.'),`
`14`	`14`	`validateInput: this.validateInput`
`15`	`15`	`})).trim();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public shouldPrompt(context: IAddScaleRuleContext): boolean {`
`19`		`- return !context.triggerParameter;`
	`19`	`+ return !context.newQueueTriggerParameter;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`private validateInput(name: string \| undefined): string \| undefined {`