Skip to content

Commit

Permalink
Fix microsoft#133 - Update vscode-azureextensionui to 0.17.1
Browse files Browse the repository at this point in the history
  • Loading branch information
creativekinetix committed Mar 31, 2020
1 parent 5c8a557 commit 0006d8d
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 11 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@
"lodash": "^4.17.15",
"request": "^2.88.2",
"request-promise-native": "^1.0.8",
"vscode-azureextensionui": "^0.16.5",
"vscode-azureextensionui": "0.17.1",
"vscode-extension-telemetry": "0.0.18",
"vscode-nls": "^3.2.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzureEnvironment } from "ms-rest-azure";
import { BusinessIdentity, IntegrationAccount, IntegrationAccountPartner } from "azure-arm-logic/lib/models";
import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext } from "vscode-azureextensionui";
import { IntegrationAccountAgreementTreeItem } from "../../../tree/integration-account/IntegrationAccountAgreementTreeItem";
Expand All @@ -23,6 +24,7 @@ export interface IAgreementWizardContext extends ILocationWizardContext, IResour
hostIdentity?: BusinessIdentity;
guestPartner?: string;
guestIdentity?: BusinessIdentity;
environment: AzureEnvironment;

// Passing Data Around
partners?: Map<string, IntegrationAccountPartner>;
Expand Down Expand Up @@ -53,7 +55,8 @@ export async function runNewAgreementWizard(integrationAccount: IntegrationAccou
name: integrationAccount.id!.split("/").slice(-5, -4)[0]
},
subscriptionDisplayName: node.subscriptionDisplayName,
subscriptionId: node.subscriptionId
subscriptionId: node.subscriptionId,
environment: node.environment
};

// Create a new instance of an Azure wizard for creating Agreements.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzureEnvironment } from "ms-rest-azure";
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";
Expand All @@ -13,6 +13,7 @@ export interface IIntegrationAccountWizardContext extends ILocationWizardContext
integrationAccount?: IntegrationAccountTreeItem;
integrationAccountName?: string;
sku?: string;
environment: AzureEnvironment;
}

export async function runNewIntegrationAccountWizard(node: IAzureNode, showCreatingNode: (label: string) => void): Promise<IAzureTreeItem> {
Expand All @@ -34,7 +35,8 @@ export async function runNewIntegrationAccountWizard(node: IAzureNode, showCreat
let wizardContext: IIntegrationAccountWizardContext = {
credentials: node.credentials,
subscriptionDisplayName: node.subscriptionDisplayName,
subscriptionId: node.subscriptionId
subscriptionId: node.subscriptionId,
environment: node.environment
};

// Create a new instance of an Azure wizard for creating Integration Accounts.
Expand Down
5 changes: 4 additions & 1 deletion src/wizard/integration-account/maps/createMapWizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzureEnvironment } from "ms-rest-azure";
import { IntegrationAccount } from "azure-arm-logic/lib/models";
import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext } from "vscode-azureextensionui";
import { IntegrationAccountMapTreeItem } from "../../../tree/integration-account/IntegrationAccountMapTreeItem";
Expand All @@ -15,6 +16,7 @@ export interface IMapWizardContext extends ILocationWizardContext, IResourceGrou
map?: IntegrationAccountMapTreeItem;
mapName?: string;
mapType?: string;
environment: AzureEnvironment;
}

export async function runNewMapWizard(integrationAccount: IntegrationAccount, node: IAzureNode, showCreatingNode: (label: string) => void): Promise<IAzureTreeItem> {
Expand All @@ -38,7 +40,8 @@ export async function runNewMapWizard(integrationAccount: IntegrationAccount, no
name: integrationAccount.id!.split("/").slice(-5, -4)[0]
},
subscriptionDisplayName: node.subscriptionDisplayName,
subscriptionId: node.subscriptionId
subscriptionId: node.subscriptionId,
environment: node.environment
};

// Create a new instance of an Azure wizard for creating Maps.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzureEnvironment } from "ms-rest-azure";
import { IntegrationAccount } from "azure-arm-logic/lib/models";
import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext } from "vscode-azureextensionui";
import { IntegrationAccountPartnerTreeItem } from "../../../tree/integration-account/IntegrationAccountPartnerTreeItem";
Expand All @@ -17,6 +18,7 @@ export interface IPartnerWizardContext extends ILocationWizardContext, IResource
partnerName?: string;
partnerQualifier?: string;
partnerValue?: string;
environment: AzureEnvironment;
}

export async function runNewPartnerWizard(integrationAccount: IntegrationAccount, node: IAzureNode, showCreatingNode: (label: string) => void): Promise<IAzureTreeItem> {
Expand All @@ -41,7 +43,8 @@ export async function runNewPartnerWizard(integrationAccount: IntegrationAccount
name: integrationAccount.id!.split("/").slice(-5, -4)[0]
},
subscriptionDisplayName: node.subscriptionDisplayName,
subscriptionId: node.subscriptionId
subscriptionId: node.subscriptionId,
environment: node.environment
};

// Create a new instance of an Azure wizard for creating Partners.
Expand Down
5 changes: 4 additions & 1 deletion src/wizard/integration-account/schemas/createSchemaWizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzureEnvironment } from "ms-rest-azure";
import { IntegrationAccount } from "azure-arm-logic/lib/models";
import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, IAzureNode, IAzureTreeItem, ILocationWizardContext, IResourceGroupWizardContext } from "vscode-azureextensionui";
import { IntegrationAccountSchemaTreeItem } from "../../../tree/integration-account/IntegrationAccountSchemaTreeItem";
Expand All @@ -13,6 +14,7 @@ export interface ISchemaWizardContext extends ILocationWizardContext, IResourceG
integrationAccountName: string;
schema?: IntegrationAccountSchemaTreeItem;
schemaName?: string;
environment: AzureEnvironment;
}

export async function runNewSchemaWizard(integrationAccount: IntegrationAccount, node: IAzureNode, showCreatingNode: (label: string) => void): Promise<IAzureTreeItem> {
Expand All @@ -35,7 +37,8 @@ export async function runNewSchemaWizard(integrationAccount: IntegrationAccount,
name: integrationAccount.id!.split("/").slice(-5, -4)[0]
},
subscriptionDisplayName: node.subscriptionDisplayName,
subscriptionId: node.subscriptionId
subscriptionId: node.subscriptionId,
environment: node.environment
};

// Create a new instance of an Azure wizard for creating Schemas.
Expand Down
5 changes: 4 additions & 1 deletion src/wizard/logic-app/createLogicApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the MIT License. See LICENSE in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzureEnvironment } from "ms-rest-azure";
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";
Expand All @@ -11,6 +12,7 @@ import { LogicAppNameStep } from "./LogicAppNameStep";
export interface IAzureLogicAppWizardContext extends ILocationWizardContext, IResourceGroupWizardContext {
logicApp?: LogicAppTreeItem;
workflowName?: string;
environment: AzureEnvironment;
}

export async function createLogicApp(node: IAzureNode, showCreatingNode: (label: string) => void): Promise<IAzureTreeItem> {
Expand All @@ -31,7 +33,8 @@ export async function createLogicApp(node: IAzureNode, showCreatingNode: (label:
let wizardContext: IAzureLogicAppWizardContext = {
credentials: node.credentials,
subscriptionDisplayName: node.subscriptionDisplayName,
subscriptionId: node.subscriptionId
subscriptionId: node.subscriptionId,
environment: node.environment
};

// Create a new instance of an Azure wizard for creating Logic Apps.
Expand Down

0 comments on commit 0006d8d

Please sign in to comment.