A few engineering improvements

.vscode/launch.json

@@ -8,35 +8,39 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "--extensionDevelopmentPath=${workspaceRoot}"
+                "--extensionDevelopmentPath=${workspaceFolder}"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/out/src/**/*.js"
+                "${workspaceFolder}/out/src/**/*.js"
             ],
-            "preLaunchTask": "npm"
+            "preLaunchTask": "npm: compile",
+            "env": {
+                "DEBUGTELEMETRY": "1"
+            }
         },
         {
             "name": "Launch Tests",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test"
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/out/test/**/*.js"
+                "${workspaceFolder}/out/test/**/*.js"
             ],
-            "preLaunchTask": "npm",
+            "preLaunchTask": "npm: compile",
             "env": {
                 "MOCHA_grep": "", // RegExp of tests to run (empty for all)
                 "MOCHA_enableTimeouts": "0", // Disable time-outs
                 "DEBUGTELEMETRY": "1",
-                "NODE_DEBUG": ""
+                "NODE_DEBUG": "",
+                "ENABLE_LONG_RUNNING_TESTS": ""
             }
         }
     ]

.vscode/tasks.json

@@ -2,19 +2,12 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "taskName": "npm",
-            "type": "shell",
-            "command": "npm",
+            "type": "npm",
+            "script": "compile",
             "group": {
                 "kind": "build",
                 "isDefault": true
             },
-            "args": [
-                "run",
-                "compile",
-                "--loglevel",
-                "silent"
-            ],
             "isBackground": true,
             "presentation": {
                 "reveal": "silent"
@@ -30,4 +23,4 @@
             }
         }
     ]
-}
+}

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-azurefunctions",
     "displayName": "Azure Functions",
     "description": "%extension.description%",
-    "version": "0.12.0",
+    "version": "0.12.1-alpha",
     "publisher": "ms-azuretools",
     "icon": "resources/azure-functions.png",
     "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
@@ -701,27 +701,26 @@
         "@types/websocket": "^0.0.37",
         "@types/xml2js": "^0.4.2",
         "@types/xregexp": "^3.0.29",
+        "azure-arm-resource": "^3.0.0-preview",
         "azure-storage": "^2.8.1",
         "gulp": "^3.9.1",
         "gulp-decompress": "^2.0.1",
         "gulp-download": "^0.0.1",
         "mocha": "^2.3.3",
         "tslint": "^5.7.0",
-        "tslint-microsoft-contrib": "5.0.1",
-        "typescript": "^2.0.3",
+        "tslint-microsoft-contrib": "5.2.1",
+        "typescript": "^3.1.3",
         "vscode": "^1.0.0",
         "vsce": "^1.37.5"
     },
     "dependencies": {
         "azure-arm-cosmosdb": "^1.1.2",
-        "azure-arm-resource": "^3.0.0-preview",
         "azure-arm-sb": "^2.3.0-preview",
-        "azure-arm-storage": "^3.1.0",
+        "azure-arm-storage": "^4.0.0",
         "azure-arm-website": "^5.3.0",
         "clipboardy": "^1.2.2",
         "extract-zip": "^1.6.6",
         "fs-extra": "^4.0.2",
-        "ms-rest": "^2.2.2",
         "ms-rest-azure": "^2.3.1",
         "opn": "^5.2.0",
         "portfinder": "^1.0.13",

src/DebugProxy.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { User } from 'azure-arm-website/lib/models';
+import { WebSiteManagementModels } from 'azure-arm-website';
 import * as EventEmitter from 'events';
 import { createServer, Server, Socket } from 'net';
 import { OutputChannel } from 'vscode';
@@ -16,11 +16,11 @@ export class DebugProxy extends EventEmitter {
     private _wsconnection: websocket.connection | undefined;
     private _client: SiteClient;
     private _port: number;
-    private _publishCredential: User;
+    private _publishCredential: WebSiteManagementModels.User;
     private _keepAlive: boolean;
     private _outputChannel: OutputChannel;
 
-    constructor(outputChannel: OutputChannel, client: SiteClient, port: number, publishCredential: User) {
+    constructor(outputChannel: OutputChannel, client: SiteClient, port: number, publishCredential: WebSiteManagementModels.User) {
         super();
         this._client = client;
         this._port = port;

src/LocalAppSettings.ts

@@ -12,7 +12,6 @@ import { ext } from './extensionVariables';
 import { localize } from './localize';
 import { getResourceTypeLabel, ResourceType } from './templates/IFunctionSetting';
 import * as azUtil from './utils/azure';
-import { IResourceResult } from './utils/azure';
 import * as fsUtil from './utils/fs';
 
 export interface ILocalAppSettings {
@@ -40,7 +39,7 @@ export async function promptForAppSetting(actionContext: IActionContext, localSe
         }
     }
 
-    let resourceResult: IResourceResult | undefined;
+    let resourceResult: azUtil.IResourceResult | undefined;
     try {
         switch (resourceType) {
             case ResourceType.DocumentDB:
@@ -108,7 +107,7 @@ export async function validateAzureWebJobsStorage(actionContext: IActionContext,
         let connectionString: string;
 
         try {
-            const resourceResult: IResourceResult = await azUtil.promptForStorageAccount(
+            const resourceResult: azUtil.IResourceResult = await azUtil.promptForStorageAccount(
                 actionContext,
                 {
                     kind: [

src/ProjectSettings.ts

@@ -7,8 +7,7 @@ import * as fse from 'fs-extra';
 // tslint:disable-next-line:no-require-imports
 import opn = require("opn");
 import * as path from 'path';
-import { MessageItem, QuickPickItem, QuickPickOptions, WorkspaceConfiguration } from "vscode";
-import * as vscode from 'vscode';
+import { ConfigurationTarget, MessageItem, QuickPickItem, QuickPickOptions, Uri, workspace, WorkspaceConfiguration } from "vscode";
 import { DialogResponses, IAzureQuickPickItem, IAzureQuickPickOptions, IAzureUserInput } from 'vscode-azureextensionui';
 import { extensionPrefix, ProjectLanguage, projectLanguageSetting, ProjectRuntime, projectRuntimeSetting, TemplateFilter, templateFilterSetting } from './constants';
 import { ext } from './extensionVariables';
@@ -17,12 +16,12 @@ import { localize } from "./localize";
 const previewDescription: string = localize('previewDescription', '(Preview)');
 
 export async function updateGlobalSetting<T = string>(section: string, value: T): Promise<void> {
-    const projectConfiguration: WorkspaceConfiguration = vscode.workspace.getConfiguration(extensionPrefix);
-    await projectConfiguration.update(section, value, vscode.ConfigurationTarget.Global);
+    const projectConfiguration: WorkspaceConfiguration = workspace.getConfiguration(extensionPrefix);
+    await projectConfiguration.update(section, value, ConfigurationTarget.Global);
 }
 
 export async function updateWorkspaceSetting<T = string>(section: string, value: T, fsPath: string): Promise<void> {
-    const projectConfiguration: WorkspaceConfiguration = vscode.workspace.getConfiguration(extensionPrefix, vscode.Uri.file(fsPath));
+    const projectConfiguration: WorkspaceConfiguration = workspace.getConfiguration(extensionPrefix, Uri.file(fsPath));
     await projectConfiguration.update(section, value);
 }
 
@@ -80,13 +79,13 @@ export async function selectTemplateFilter(projectPath: string, ui: IAzureUserIn
 }
 
 export function getGlobalFuncExtensionSetting<T>(key: string): T | undefined {
-    const projectConfiguration: WorkspaceConfiguration = vscode.workspace.getConfiguration(extensionPrefix);
+    const projectConfiguration: WorkspaceConfiguration = workspace.getConfiguration(extensionPrefix);
     const result: { globalValue?: T } | undefined = projectConfiguration.inspect<T>(key);
     return result && result.globalValue;
 }
 
 export function getFuncExtensionSetting<T>(key: string, fsPath?: string): T | undefined {
-    const projectConfiguration: WorkspaceConfiguration = vscode.workspace.getConfiguration(extensionPrefix, fsPath ? vscode.Uri.file(fsPath) : undefined);
+    const projectConfiguration: WorkspaceConfiguration = workspace.getConfiguration(extensionPrefix, fsPath ? Uri.file(fsPath) : undefined);
     return projectConfiguration.get<T>(key);
 }
 

src/commands/appSettings/downloadAppSettings.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { StringDictionary } from "azure-arm-website/lib/models";
+import { WebSiteManagementModels } from "azure-arm-website";
 import * as fse from 'fs-extra';
 import * as vscode from 'vscode';
 import { AppSettingsTreeItem, SiteClient } from "vscode-azureappservice";
@@ -43,7 +43,7 @@ export async function downloadAppSettings(node?: AppSettingsTreeItem): Promise<v
                 localSettings.Values = {};
             }
 
-            const remoteSettings: StringDictionary = await client.listApplicationSettings();
+            const remoteSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings();
             if (remoteSettings.properties) {
                 await confirmOverwriteSettings(remoteSettings.properties, localSettings.Values, localSettingsFileName);
             }

src/commands/appSettings/uploadAppSettings.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { StringDictionary } from "azure-arm-website/lib/models";
+import { WebSiteManagementModels } from "azure-arm-website";
 import * as fse from 'fs-extra';
 import * as vscode from 'vscode';
 import { AppSettingsTreeItem, SiteClient } from "vscode-azureappservice";
@@ -41,7 +41,7 @@ export async function uploadAppSettings(node?: AppSettingsTreeItem): Promise<voi
         }
 
         if (localSettings.Values) {
-            const remoteSettings: StringDictionary = await client.listApplicationSettings();
+            const remoteSettings: WebSiteManagementModels.StringDictionary = await client.listApplicationSettings();
             if (!remoteSettings.properties) {
                 remoteSettings.properties = {};
             }

src/commands/createFunction/CSharpFunctionCreator.ts

@@ -25,7 +25,7 @@ export class CSharpFunctionCreator extends FunctionCreatorBase {
         super(functionAppPath, template);
     }
 
-    public async promptForSettings(ui: IAzureUserInput, functionName: string | undefined, functionSettings: { [key: string]: string | undefined; }): Promise<void> {
+    public async promptForSettings(ui: IAzureUserInput, functionName: string | undefined, functionSettings: { [key: string]: string | undefined }): Promise<void> {
         if (!functionName) {
             const defaultFunctionName: string | undefined = await fsUtil.getUniqueFsPath(this._functionAppPath, this._template.defaultFunctionName, '.cs');
             this._functionName = await ui.showInputBox({
@@ -39,7 +39,7 @@ export class CSharpFunctionCreator extends FunctionCreatorBase {
         }
 
         if (functionSettings.namespace !== undefined) {
-            this._namespace = <string>functionSettings.namespace;
+            this._namespace = functionSettings.namespace;
         } else {
             this._namespace = await ui.showInputBox({
                 placeHolder: localize('azFunc.namespacePlaceHolder', 'Namespace'),

src/commands/createFunction/FunctionCreatorBase.ts

@@ -21,6 +21,6 @@ export abstract class FunctionCreatorBase {
      * Prompt for any settings that are specific to this creator
      * This includes the function name (Since the name could have different restrictions for different languages)
      */
-    public abstract async promptForSettings(ui: IAzureUserInput, functionName: string | undefined, functionSettings: { [key: string]: string | undefined; }): Promise<void>;
+    public abstract async promptForSettings(ui: IAzureUserInput, functionName: string | undefined, functionSettings: { [key: string]: string | undefined }): Promise<void>;
     public abstract async createFunction(userSettings: { [propertyName: string]: string }, runtime: ProjectRuntime): Promise<string | undefined>;
 }

src/commands/createFunction/ScriptFunctionCreator.ts

@@ -64,7 +64,7 @@ export class ScriptFunctionCreator extends FunctionCreatorBase {
         }
     }
 
-    public async createFunction(userSettings: { [propertyName: string]: string; }): Promise<string | undefined> {
+    public async createFunction(userSettings: { [propertyName: string]: string }): Promise<string | undefined> {
         const functionPath: string = path.join(this._functionAppPath, this._functionName);
         await fse.ensureDir(functionPath);
         await Promise.all(Object.keys(this._template.templateFiles).map(async (fileName: string) => {

src/commands/createFunction/createFunction.ts

@@ -6,8 +6,7 @@
 import * as fse from 'fs-extra';
 import * as path from 'path';
 import { isString } from 'util';
-import { QuickPickItem } from 'vscode';
-import * as vscode from 'vscode';
+import { InputBoxOptions, MessageItem, QuickPickItem, Uri, window, workspace } from 'vscode';
 import { DialogResponses, IActionContext, IAzureQuickPickItem, TelemetryProperties } from 'vscode-azureextensionui';
 import { localSettingsFileName, ProjectLanguage, projectLanguageSetting, ProjectRuntime, projectRuntimeSetting, TemplateFilter } from '../../constants';
 import { ext } from '../../extensionVariables';
@@ -57,7 +56,7 @@ async function promptForBooleanSetting(setting: IFunctionSetting): Promise<strin
 }
 
 async function promptForStringSetting(setting: IFunctionSetting): Promise<string> {
-    const options: vscode.InputBoxOptions = {
+    const options: InputBoxOptions = {
         placeHolder: setting.label,
         prompt: setting.description || localize('azFunc.stringSettingPrompt', 'Provide a \'{0}\'', setting.label),
         validateInput: (s: string): string | undefined => setting.validateSetting(s),
@@ -72,11 +71,11 @@ export async function createFunction(
     functionAppPath?: string,
     templateId?: string,
     functionName?: string,
-    caseSensitiveFunctionSettings?: { [key: string]: string | undefined; },
+    caseSensitiveFunctionSettings?: { [key: string]: string | undefined },
     language?: ProjectLanguage,
     runtime?: ProjectRuntime): Promise<void> {
 
-    const functionSettings: { [key: string]: string | undefined; } = {};
+    const functionSettings: { [key: string]: string | undefined } = {};
     if (caseSensitiveFunctionSettings) {
         Object.keys(caseSensitiveFunctionSettings).forEach((key: string) => functionSettings[key.toLowerCase()] = caseSensitiveFunctionSettings[key]);
     }
@@ -90,7 +89,7 @@ export async function createFunction(
     let templateFilter: TemplateFilter;
     if (!await isFunctionProject(functionAppPath)) {
         const message: string = localize('azFunc.notFunctionApp', 'The selected folder is not a function app project. Initialize Project?');
-        const result: vscode.MessageItem = await ext.ui.showWarningMessage(message, { modal: true }, DialogResponses.yes, DialogResponses.skipForNow, DialogResponses.cancel);
+        const result: MessageItem = await ext.ui.showWarningMessage(message, { modal: true }, DialogResponses.yes, DialogResponses.skipForNow, DialogResponses.cancel);
         if (result === DialogResponses.yes) {
             await createNewProject(actionContext, functionAppPath, undefined, undefined, false);
             isNewProject = true;
@@ -161,8 +160,8 @@ export async function createFunction(
 
     const newFilePath: string | undefined = await functionCreator.createFunction(userSettings, runtime);
     if (newFilePath && (await fse.pathExists(newFilePath))) {
-        const newFileUri: vscode.Uri = vscode.Uri.file(newFilePath);
-        vscode.window.showTextDocument(await vscode.workspace.openTextDocument(newFileUri));
+        const newFileUri: Uri = Uri.file(newFilePath);
+        window.showTextDocument(await workspace.openTextDocument(newFileUri));
     }
 
     if (!template.isHttpTrigger) {

src/commands/createNewProject/JavaProjectCreator.ts

@@ -6,8 +6,7 @@
 import * as fse from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
-import * as vscode from 'vscode';
-import { InputBoxOptions } from 'vscode';
+import { InputBoxOptions, window } from 'vscode';
 import { IActionContext } from "vscode-azureextensionui";
 import { ProjectRuntime, TemplateFilter } from '../../constants';
 import { ext } from '../../extensionVariables';
@@ -134,7 +133,7 @@ export class JavaProjectCreator extends ProjectCreatorBase {
             const functionAppName: string | undefined = await mavenUtils.getFunctionAppNameInPom(pomFilePath);
             if (!functionAppName) {
                 this._javaTargetPath = '<function_build_path>';
-                vscode.window.showWarningMessage(localize('functionAppNameNotFound', 'Cannot parse the Azure Functions name from pom file, you may need to specify it in the tasks.json.'));
+                window.showWarningMessage(localize('functionAppNameNotFound', 'Cannot parse the Azure Functions name from pom file, you may need to specify it in the tasks.json.'));
             } else {
                 this._javaTargetPath = `target/azure-functions/${functionAppName}/`;
             }

src/commands/createNewProject/ScriptProjectCreatorBase.ts

@@ -8,8 +8,7 @@ import * as path from 'path';
 import { gitignoreFileName, hostFileName, localSettingsFileName, ProjectRuntime, proxiesFileName, TemplateFilter } from '../../constants';
 import { funcHostCommand, funcHostTaskLabel } from "../../funcCoreTools/funcHostTask";
 import { ILocalAppSettings } from '../../LocalAppSettings';
-import { confirmOverwriteFile } from "../../utils/fs";
-import * as fsUtil from '../../utils/fs';
+import { confirmOverwriteFile, writeFormattedJson } from "../../utils/fs";
 import { funcWatchProblemMatcher, ProjectCreatorBase } from './IProjectCreator';
 
 // tslint:disable-next-line:no-multiline-string
@@ -71,7 +70,7 @@ export class ScriptProjectCreatorBase extends ProjectCreatorBase {
             const hostJson: {} = {
                 version: '2.0'
             };
-            await fsUtil.writeFormattedJson(hostJsonPath, hostJson);
+            await writeFormattedJson(hostJsonPath, hostJson);
         }
 
         const localSettingsJsonPath: string = path.join(this.functionAppPath, localSettingsFileName);
@@ -88,7 +87,7 @@ export class ScriptProjectCreatorBase extends ProjectCreatorBase {
                 localSettingsJson.Values!.FUNCTIONS_WORKER_RUNTIME = this.functionsWorkerRuntime;
             }
 
-            await fsUtil.writeFormattedJson(localSettingsJsonPath, localSettingsJson);
+            await writeFormattedJson(localSettingsJsonPath, localSettingsJson);
         }
 
         const proxiesJsonPath: string = path.join(this.functionAppPath, proxiesFileName);
@@ -98,7 +97,7 @@ export class ScriptProjectCreatorBase extends ProjectCreatorBase {
                 $schema: 'http://json.schemastore.org/proxies',
                 proxies: {}
             };
-            await fsUtil.writeFormattedJson(proxiesJsonPath, proxiesJson);
+            await writeFormattedJson(proxiesJsonPath, proxiesJson);
         }
 
         const gitignorePath: string = path.join(this.functionAppPath, gitignoreFileName);

src/commands/createNewProject/createNewProject.ts

@@ -31,7 +31,7 @@ export async function createNewProject(
     openFolder: boolean = true,
     templateId?: string,
     functionName?: string,
-    caseSensitiveFunctionSettings?: { [key: string]: string | undefined; }): Promise<void> {
+    caseSensitiveFunctionSettings?: { [key: string]: string | undefined }): Promise<void> {
 
     if (functionAppPath === undefined) {
         functionAppPath = await workspaceUtil.selectWorkspaceFolder(ext.ui, localize('azFunc.selectFunctionAppFolderNew', 'Select the folder that will contain your function app'));