Revert "Fix Azure Environment Selector microsoft#133 for WizardContext"

This reverts commit 13d1a78.
creativekinetix · Mar 30, 2020 · f195cf5 · f195cf5
1 parent 13d1a78
commit f195cf5
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 43 deletions.
diff --git a/src/models/wizard/wizard.ts b/src/models/wizard/wizard.ts
diff --git a/src/utils/integration-account/partnerUtils.ts b/src/utils/integration-account/partnerUtils.ts
@@ -5,7 +5,7 @@
 
 import LogicAppsManagementClient from "azure-arm-logic";
 import { IntegrationAccountPartner } from "azure-arm-logic/lib/models";
-import { IWizardCredentials } from "../../models/wizard/wizard";
+import { ServiceClientCredentials } from "ms-rest";
 import { addExtensionUserAgent } from "vscode-azureextensionui";
 
 export enum PartnerType {
@@ -31,8 +31,8 @@ export async function createNewPartner(partnerName: string, qualifier: string, v
     return partner;
 }
 
-export async function getAllPartners(credentials: IWizardCredentials, subscriptionId: string, resourceGroup: string, integrationAccount: string): Promise<IntegrationAccountPartner[]> {
-    const client = new LogicAppsManagementClient(credentials, subscriptionId, credentials.environment?.resourceManagerEndpointUrl);
+export async function getAllPartners(credentials: ServiceClientCredentials, subscriptionId: string, resourceGroup: string, integrationAccount: string): Promise<IntegrationAccountPartner[]> {
+    const client = new LogicAppsManagementClient(credentials, subscriptionId);
     addExtensionUserAgent(client);
 
     const partners = await client.integrationAccountPartners.list(resourceGroup, integrationAccount);

diff --git a/src/wizard/integration-account/agreements/agreementCreateStep.ts b/src/wizard/integration-account/agreements/agreementCreateStep.ts
@@ -12,7 +12,7 @@ import { IAgreementWizardContext } from "./createAgreementWizard";
 
 export class AgreementCreateStep extends AzureWizardExecuteStep<IAgreementWizardContext> {
     public async execute(wizardContext: IAgreementWizardContext): Promise<IAgreementWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         const newAgreement: IntegrationAccountAgreement = await client.integrationAccountAgreements.createOrUpdate(wizardContext.resourceGroup!.name!,

diff --git a/src/wizard/integration-account/agreements/agreementNameStep.ts b/src/wizard/integration-account/agreements/agreementNameStep.ts
@@ -41,7 +41,7 @@ export class AgreementNameStep extends AzureWizardPromptStep<IAgreementWizardCon
     }
 
     private async isNameAvailable(name: string, wizardContext: IAgreementWizardContext): Promise<boolean> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         let agreements = await client.integrationAccountAgreements.list(wizardContext.resourceGroup!.name!, wizardContext.integrationAccountName);

diff --git a/src/wizard/integration-account/agreements/createAgreementWizard.ts b/src/wizard/integration-account/agreements/createAgreementWizard.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BusinessIdentity, IntegrationAccount, IntegrationAccountPartner } from "azure-arm-logic/lib/models";
-import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem } from "vscode-azureextensionui";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext } from "vscode-azureextensionui";
 import { IntegrationAccountAgreementTreeItem } from "../../../tree/integration-account/IntegrationAccountAgreementTreeItem";
 import { AgreementCreateStep } from "./agreementCreateStep";
 import { AgreementNameStep } from "./agreementNameStep";
@@ -13,9 +13,8 @@ import { GuestIdentityStep } from "./guestIdentityStep";
 import { GuestPartnerStep } from "./guestPartnerStep";
 import { HostIdentityStep } from "./hostIdentityStep";
 import { HostPartnerStep } from "./hostPartnerStep";
-import { IWizardContext } from "../../../models/wizard/wizard";
 
-export interface IAgreementWizardContext extends IWizardContext {
+export interface IAgreementWizardContext extends ILocationWizardContext, IResourceGroupWizardContext {
     integrationAccountName: string;
     agreement?: IntegrationAccountAgreementTreeItem;
     agreementName?: string;

diff --git a/src/wizard/integration-account/createIntegrationAccountWizard.ts b/src/wizard/integration-account/createIntegrationAccountWizard.ts
@@ -3,14 +3,13 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, LocationListStep, ResourceGroupCreateStep, ResourceGroupListStep } from "vscode-azureextensionui";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext, LocationListStep, ResourceGroupCreateStep, ResourceGroupListStep } from "vscode-azureextensionui";
 import { IntegrationAccountTreeItem } from "../../tree/integration-account/IntegrationAccountTreeItem";
 import { IntegrationAccountCreateStep } from "./integrationAccountCreateStep";
 import { IntegrationAccountNameStep } from "./integrationAccountNameStep";
 import { IntegrationAccountSkuStep } from "./integrationAccountSkuStep";
-import { IWizardContext } from "../../models/wizard/wizard";
 
-export interface IIntegrationAccountWizardContext extends IWizardContext {
+export interface IIntegrationAccountWizardContext extends ILocationWizardContext, IResourceGroupWizardContext {
     integrationAccount?: IntegrationAccountTreeItem;
     integrationAccountName?: string;
     sku?: string;

diff --git a/src/wizard/integration-account/integrationAccountCreateStep.ts b/src/wizard/integration-account/integrationAccountCreateStep.ts
@@ -12,7 +12,7 @@ import { IIntegrationAccountWizardContext } from "./createIntegrationAccountWiza
 
 export class IntegrationAccountCreateStep extends AzureWizardExecuteStep<IIntegrationAccountWizardContext> {
     public async execute(wizardContext: IIntegrationAccountWizardContext): Promise<IIntegrationAccountWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         const newIntegrationAccount: IntegrationAccount = await client.integrationAccounts.createOrUpdate(wizardContext.resourceGroup!.name!,

diff --git a/src/wizard/integration-account/integrationAccountNameStep.ts b/src/wizard/integration-account/integrationAccountNameStep.ts
@@ -52,7 +52,7 @@ export class IntegrationAccountNameStep extends AzureWizardPromptStep<IIntegrati
             resourceGroupName = wizardContext.resourceGroup!.name!;
         }
 
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         let integrationAccounts = await client.integrationAccounts.listByResourceGroup(resourceGroupName);

diff --git a/src/wizard/integration-account/maps/createMapWizard.ts b/src/wizard/integration-account/maps/createMapWizard.ts
@@ -4,14 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IntegrationAccount } from "azure-arm-logic/lib/models";
-import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem } from "vscode-azureextensionui";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext } from "vscode-azureextensionui";
 import { IntegrationAccountMapTreeItem } from "../../../tree/integration-account/IntegrationAccountMapTreeItem";
 import { MapCreateStep } from "./mapCreateStep";
 import { MapNameStep } from "./mapNameStep";
 import { MapTypeStep } from "./mapTypeStep";
-import { IWizardContext } from "../../../models/wizard/wizard";
 
-export interface IMapWizardContext extends IWizardContext {
+export interface IMapWizardContext extends ILocationWizardContext, IResourceGroupWizardContext {
     integrationAccountName: string;
     map?: IntegrationAccountMapTreeItem;
     mapName?: string;

diff --git a/src/wizard/integration-account/maps/mapCreateStep.ts b/src/wizard/integration-account/maps/mapCreateStep.ts
@@ -12,7 +12,7 @@ import { IMapWizardContext } from "./createMapWizard";
 
 export class MapCreateStep extends AzureWizardExecuteStep<IMapWizardContext> {
     public async execute(wizardContext: IMapWizardContext): Promise<IMapWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         const newMap: IntegrationAccountMap = await client.integrationAccountMaps.createOrUpdate(wizardContext.resourceGroup!.name!,

diff --git a/src/wizard/integration-account/maps/mapNameStep.ts b/src/wizard/integration-account/maps/mapNameStep.ts
@@ -41,7 +41,7 @@ export class MapNameStep extends AzureWizardPromptStep<IMapWizardContext> {
     }
 
     private async isNameAvailable(name: string, wizardContext: IMapWizardContext): Promise<boolean> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         let maps = await client.integrationAccountMaps.list(wizardContext.resourceGroup!.name!, wizardContext.integrationAccountName);

diff --git a/src/wizard/integration-account/partners/createPartnerWizard.ts b/src/wizard/integration-account/partners/createPartnerWizard.ts
@@ -4,15 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IntegrationAccount } from "azure-arm-logic/lib/models";
-import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem } from "vscode-azureextensionui";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext } from "vscode-azureextensionui";
 import { IntegrationAccountPartnerTreeItem } from "../../../tree/integration-account/IntegrationAccountPartnerTreeItem";
 import { PartnerCreateStep } from "./partnerCreateStep";
 import { PartnerNameStep } from "./partnerNameStep";
 import { PartnerQualifierStep } from "./partnerQualifierStep";
 import { PartnerValueStep } from "./partnerValueStep";
-import { IWizardContext } from "../../../models/wizard/wizard";
 
-export interface IPartnerWizardContext extends IWizardContext {
+export interface IPartnerWizardContext extends ILocationWizardContext, IResourceGroupWizardContext {
     integrationAccountName: string;
     partner?: IntegrationAccountPartnerTreeItem;
     partnerName?: string;

diff --git a/src/wizard/integration-account/partners/partnerCreateStep.ts b/src/wizard/integration-account/partners/partnerCreateStep.ts
@@ -12,7 +12,7 @@ import { IPartnerWizardContext } from "./createPartnerWizard";
 
 export class PartnerCreateStep extends AzureWizardExecuteStep<IPartnerWizardContext> {
     public async execute(wizardContext: IPartnerWizardContext): Promise<IPartnerWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         const newPartner: IntegrationAccountPartner = await client.integrationAccountPartners.createOrUpdate(wizardContext.resourceGroup!.name!,

diff --git a/src/wizard/integration-account/schemas/createSchemaWizard.ts b/src/wizard/integration-account/schemas/createSchemaWizard.ts
@@ -4,13 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IntegrationAccount } from "azure-arm-logic/lib/models";
-import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem } from "vscode-azureextensionui";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext } from "vscode-azureextensionui";
 import { IntegrationAccountSchemaTreeItem } from "../../../tree/integration-account/IntegrationAccountSchemaTreeItem";
 import { SchemaCreateStep } from "./schemaCreateStep";
 import { SchemaNameStep } from "./schemaNameStep";
-import { IWizardContext } from "../../../models/wizard/wizard";
 
-export interface ISchemaWizardContext extends IWizardContext {
+export interface ISchemaWizardContext extends ILocationWizardContext, IResourceGroupWizardContext {
     integrationAccountName: string;
     schema?: IntegrationAccountSchemaTreeItem;
     schemaName?: string;

diff --git a/src/wizard/integration-account/schemas/schemaCreateStep.ts b/src/wizard/integration-account/schemas/schemaCreateStep.ts
@@ -12,7 +12,7 @@ import { ISchemaWizardContext } from "./createSchemaWizard";
 
 export class SchemaCreateStep extends AzureWizardExecuteStep<ISchemaWizardContext> {
     public async execute(wizardContext: ISchemaWizardContext): Promise<ISchemaWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         const newSchema: IntegrationAccountSchema = await client.integrationAccountSchemas.createOrUpdate(wizardContext.resourceGroup!.name!,

diff --git a/src/wizard/integration-account/schemas/schemaNameStep.ts b/src/wizard/integration-account/schemas/schemaNameStep.ts
@@ -41,7 +41,7 @@ export class SchemaNameStep extends AzureWizardPromptStep<ISchemaWizardContext>
     }
 
     private async isNameAvailable(name: string, wizardContext: ISchemaWizardContext): Promise<boolean> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         let schemas = await client.integrationAccountSchemas.list(wizardContext.resourceGroup!.name!, wizardContext.integrationAccountName);

diff --git a/src/wizard/logic-app/LogicAppCreateStep.ts b/src/wizard/logic-app/LogicAppCreateStep.ts
@@ -11,7 +11,7 @@ import { IAzureLogicAppWizardContext } from "./createLogicApp";
 
 export class LogicAppCreateStep extends AzureWizardExecuteStep<IAzureLogicAppWizardContext> {
     public async execute(wizardContext: IAzureLogicAppWizardContext): Promise<IAzureLogicAppWizardContext> {
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         const location = wizardContext.location!.name!;

diff --git a/src/wizard/logic-app/LogicAppNameStep.ts b/src/wizard/logic-app/LogicAppNameStep.ts
@@ -53,7 +53,7 @@ export class LogicAppNameStep extends AzureWizardPromptStep<IAzureLogicAppWizard
             resourceGroupName = wizardContext.resourceGroup!.name!;
         }
 
-        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId, wizardContext.credentials.environment?.resourceManagerEndpointUrl);
+        const client = new LogicAppsManagementClient(wizardContext.credentials, wizardContext.subscriptionId);
         addExtensionUserAgent(client);
 
         let workflows = await client.workflows.listByResourceGroup(resourceGroupName);

diff --git a/src/wizard/logic-app/createLogicApp.ts b/src/wizard/logic-app/createLogicApp.ts
@@ -3,13 +3,12 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, LocationListStep, ResourceGroupCreateStep, ResourceGroupListStep } from "vscode-azureextensionui";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext, LocationListStep, ResourceGroupCreateStep, ResourceGroupListStep } from "vscode-azureextensionui";
 import { LogicAppTreeItem } from "../../tree/logic-app/LogicAppTreeItem";
 import { LogicAppCreateStep } from "./LogicAppCreateStep";
 import { LogicAppNameStep } from "./LogicAppNameStep";
-import { IWizardContext } from "../../models/wizard/wizard";
 
-export interface IAzureLogicAppWizardContext extends IWizardContext {
+export interface IAzureLogicAppWizardContext extends ILocationWizardContext, IResourceGroupWizardContext {
     logicApp?: LogicAppTreeItem;
     workflowName?: string;
 }