Skip to content

Commit

Permalink
Merge pull request #351 from microsoft/api-v2-compat
Browse files Browse the repository at this point in the history 
Upgrade virtual machines extension for V2 compatability
  • Loading branch information
@motm32
motm32 authored Oct 18, 2022
2 parents 536058b + a57e1a1 commit d9a9b3d
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 33 deletions.
7 changes: 2 additions & 5 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,13 @@
}
},
{
"name": "Launch Extension(s)",
"name": "Launch Extension + Host",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionDevelopmentPath=${workspaceFolder}/../vscode-azureresourcegroups",
"--extensionDevelopmentPath=${workspaceFolder}/../vscode-azureappservice",
"--extensionDevelopmentPath=${workspaceFolder}/../vscode-azurefunctions",
"--extensionDevelopmentPath=${workspaceFolder}/../vscode-azurestaticwebapps"
"--extensionDevelopmentPath=${workspaceFolder}/../vscode-azureresourcegroups"
],
"outFiles": [
"${workspaceFolder}/out/**/*.js"
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file

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

29 changes: 19 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@
],
"main": "./main.js",
"contributes": {
"x-azResourcesV2": {
"application": {
"branches": [
{
"type": "VirtualMachines"
}
]
}
},
"x-azResources": {
"activation": {
"onFetch": [
Expand Down Expand Up @@ -122,47 +131,47 @@
"view/item/context": [
{
"command": "azureVirtualMachines.createVirtualMachine",
"when": "view == azureResourceGroups && viewItem =~ /azureResourceTypeGroup.*microsoft.compute/virtualmachines/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /virtualmachines/i && viewItem =~ /azureResourceTypeGroup/i",
"group": "1@1"
},
{
"command": "azureVirtualMachines.createVirtualMachineAdvanced",
"when": "view == azureResourceGroups && viewItem =~ /azureResourceTypeGroup.*microsoft.compute/virtualmachines/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /virtualmachines/i && viewItem =~ /azureResourceTypeGroup/i",
"group": "1@2"
},
{
"command": "azureVirtualMachines.copyIpAddress",
"when": "view == azureResourceGroups && viewItem =~ /VirtualMachine$/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /VirtualMachine$/",
"group": "1@2"
},
{
"command": "azureVirtualMachines.startVirtualMachine",
"when": "view == azureResourceGroups && viewItem =~ /VirtualMachine$/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /VirtualMachine$/",
"group": "2@1"
},
{
"command": "azureVirtualMachines.restartVirtualMachine",
"when": "view == azureResourceGroups && viewItem =~ /VirtualMachine$/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /VirtualMachine$/",
"group": "2@2"
},
{
"command": "azureVirtualMachines.stopVirtualMachine",
"when": "view == azureResourceGroups && viewItem =~ /VirtualMachine$/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /VirtualMachine$/",
"group": "2@3"
},
{
"command": "azureVirtualMachines.deleteVirtualMachine",
"when": "view == azureResourceGroups && viewItem =~ /VirtualMachine$/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /VirtualMachine$/",
"group": "2@4"
},
{
"command": "azureVirtualMachines.openInRemoteSsh",
"when": "view == azureResourceGroups && viewItem =~ /linuxVirtualMachine/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /linuxVirtualMachine/",
"group": "1@1"
},
{
"command": "azureVirtualMachines.addSshKey",
"when": "view == azureResourceGroups && viewItem =~ /linuxVirtualMachine/",
"when": "view == azureResourceGroupsV2 && viewItem =~ /linuxVirtualMachine/",
"group": "1@3"
}
],
Expand Down Expand Up @@ -234,7 +243,7 @@
"@azure/arm-resources": "^5.0.0",
"@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0",
"@microsoft/vscode-azext-azureutils": "^0.3.4",
"@microsoft/vscode-azext-utils": "^0.3.9",
"@microsoft/vscode-azext-utils": "file:../vscode-azuretools/utils/microsoft-vscode-azext-utils-0.3.15.tgz",
"fs-extra": "^8.1.0",
"open": "^8.0.4",
"semver": "^5.7.0",
Expand Down
22 changes: 11 additions & 11 deletions src/extension.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'use strict';

import { registerAzureUtilsExtensionVariables } from '@microsoft/vscode-azext-azureutils';
import { callWithTelemetryAndErrorHandling, createApiProvider, createAzExtOutputChannel, IActionContext, registerCommand, registerErrorHandler, registerReportIssueCommand, registerUIExtensionVariables } from '@microsoft/vscode-azext-utils';
import { AzExtResourceType, callWithTelemetryAndErrorHandling, createApiProvider, createAzExtOutputChannel, IActionContext, registerCommand, registerCommandWithTreeNodeUnwrapping, registerErrorHandler, registerReportIssueCommand, registerUIExtensionVariables } from '@microsoft/vscode-azext-utils';
import { AzureExtensionApi, AzureExtensionApiProvider } from '@microsoft/vscode-azext-utils/api';
import { AzureHostExtensionApi } from '@microsoft/vscode-azext-utils/hostapi';
import * as vscode from 'vscode';
Expand Down Expand Up @@ -37,15 +37,15 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta
activateContext.telemetry.properties.isActivationEvent = 'true';
activateContext.telemetry.measurements.mainFileLoad = (perfStats.loadEndTime - perfStats.loadStartTime) / 1000;

registerCommand('azureVirtualMachines.createVirtualMachine', createVirtualMachine);
registerCommand('azureVirtualMachines.createVirtualMachineAdvanced', createVirtualMachineAdvanced);
registerCommand('azureVirtualMachines.startVirtualMachine', startVirtualMachine);
registerCommand('azureVirtualMachines.restartVirtualMachine', restartVirtualMachine);
registerCommand('azureVirtualMachines.stopVirtualMachine', stopVirtualMachine);
registerCommand('azureVirtualMachines.addSshKey', addSshKey);
registerCommand('azureVirtualMachines.deleteVirtualMachine', deleteVirtualMachine);
registerCommand('azureVirtualMachines.copyIpAddress', copyIpAddress);
registerCommand('azureVirtualMachines.openInRemoteSsh', openInRemoteSsh);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.createVirtualMachine', createVirtualMachine);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.createVirtualMachineAdvanced', createVirtualMachineAdvanced);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.startVirtualMachine', startVirtualMachine);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.restartVirtualMachine', restartVirtualMachine);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.stopVirtualMachine', stopVirtualMachine);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.addSshKey', addSshKey);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.deleteVirtualMachine', deleteVirtualMachine);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.copyIpAddress', copyIpAddress);
registerCommandWithTreeNodeUnwrapping('azureVirtualMachines.openInRemoteSsh', openInRemoteSsh);
registerCommand('azureVirtualMachines.showOutputChannel', () => { ext.outputChannel.show(); });
registerCommand('azureVirtualMachines.showRemoteSshExtension', () => { void vscode.commands.executeCommand('extension.open', remoteSshExtensionId); });

Expand All @@ -57,7 +57,7 @@ export async function activateInternal(context: vscode.ExtensionContext, perfSta
if (rgApiProvider) {
const api = rgApiProvider.getApi<AzureHostExtensionApi>('0.0.1');
ext.rgApi = api;
api.registerApplicationResourceResolver('Microsoft.Compute/virtualMachines', new VirtualMachineResolver());
api.registerApplicationResourceResolver(AzExtResourceType.VirtualMachines, new VirtualMachineResolver());
} else {
throw new Error('Could not find the Azure Resource Groups extension');
}
Expand Down

0 comments on commit d9a9b3d

Please sign in to comment.