fix: Resolves issues running plugin (#141)

Fixes plugin after conversion to TypeScript

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 /lib
 *.dll
+.env

package.json

@@ -7,8 +7,8 @@
   "author": "Azure Functions",
   "scripts": {
     "test": "eslint src/**/*.js",
-    "prebuild": "rm lib/ -rf && npm test",
-    "build": "tsc && cp src/shared/bindings.json lib/shared"
+    "prebuild": "rm -rf lib/ && npm test",
+    "build": "tsc"
   },
   "repository": {
     "git": "https://github.com/serverless/serverless-azure-functions"
@@ -34,17 +34,20 @@
     "az-login": "^0.3.0",
     "azure-arm-resource": "^2.0.0-preview",
     "jsonpath": "^0.2.11",
-    "lodash": "^4.16.6",
+    "lodash": "^4.17.11",
     "open": "^6.3.0",
     "request": "^2.81.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
     "@babel/core": "^7.4.4",
     "@babel/preset-env": "^7.4.4",
+    "@types/lodash": "^4.14.130",
     "@types/open": "^6.1.0",
+    "@types/request": "^2.48.1",
     "@types/serverless": "^1.18.2",
-    "eslint": "3.19.0"
+    "eslint": "3.19.0",
+    "tslint": "^5.16.0"
   },
   "optionalDependencies": {
     "serverless-webpack": "^4.2.0",

src/index.ts

@@ -5,12 +5,12 @@ whole provider implementation.
 */
 
 import * as Serverless from 'serverless';
+import AzureProvider from './provider/azureProvider';
 import { AzureInvoke } from './plugins/invoke/azureInvoke';
 import { AzureLogs } from './plugins/logs/azureLogs';
 import { AzureRemove } from './plugins/remove/azureRemove';
 import { AzurePackage } from './plugins/package/azurePackage';
 import { AzurePackageFunction } from './plugins/package/azurePackageFunction';
-import AzureProvider from './provider/azureProvider';
 import { AzureDeployPlugin } from './plugins/deploy/azureDeployPlugin';
 import { AzureDeployFunctionPlugin } from './plugins/deploy/azureDeployFunctionPlugin';
 import { AzureLoginPlugin } from './plugins/login/loginPlugin';

src/plugins/deploy/azureDeployFunctionPlugin.ts

@@ -7,16 +7,16 @@ export class AzureDeployFunctionPlugin {
   constructor(private serverless: Serverless, private options: Serverless.Options) {
     this.hooks = {
       'deploy:function:packageFunction': this.beforeDeploy.bind(this),
-      'deploy:function:deploy': this.deploy.bind(this, options)
+      'deploy:function:deploy': this.deploy.bind(this)
     };
   }
 
-  async beforeDeploy() {
+  private async beforeDeploy() {
     // Spawn 'package:function' to create the single-function zip artifact
     this.serverless.pluginManager.spawn('package:function');
   }
 
-  async deploy() {
+  private async deploy() {
     const functionAppService = new FunctionAppService(this.serverless, this.options);
     const functionApp = await functionAppService.get();
 

src/plugins/deploy/azureDeployPlugin.ts

@@ -21,19 +21,6 @@ export class AzureDeployPlugin {
     }
   }
 
-  private async sync() {
-    const functionAppService = new FunctionAppService(this.serverless, this.options);
-    const functionApp = await functionAppService.get();
-
-    await functionAppService.syncTriggers(functionApp);
-  }
-
-  private async upload() {
-    const functionAppService = new FunctionAppService(this.serverless, this.options);
-    const functionApp = await functionAppService.get();
-    await functionAppService.uploadFunctions(functionApp);
-  }
-
   private async deploy() {
     const resourceService = new ResourceService(this.serverless, this.options);
     await resourceService.deployResourceGroup();

src/plugins/invoke/azureInvoke.ts

@@ -1,20 +1,15 @@
 import * as Serverless from 'serverless';
-import { invokeFunction } from './lib/invokeFunction';
 import { getAdminKey } from '../../shared/getAdminKey';
 import { join, isAbsolute } from 'path';
+import AzureProvider from '../../provider/azureProvider';
 
 export class AzureInvoke {
   public hooks: { [eventName: string]: Promise<any> };
-  private invokeFunction: () => Promise<any>;
-  private getAdminKey: () => Promise<any>;
+  private provider: AzureProvider;
+  private getAdminKey = getAdminKey;
 
   constructor(private serverless: Serverless, private options: Serverless.Options) {
-    Object.assign(
-      this,
-      getAdminKey,
-      invokeFunction
-    );
-
+    this.provider = (this.serverless.getProvider('azure') as any) as AzureProvider;
     const path = this.options['path'];
 
     if (path) {
@@ -30,7 +25,19 @@ export class AzureInvoke {
 
     this.hooks = {
       'before:invoke:invoke': this.getAdminKey.bind(this),
-      'invoke:invoke': this.invokeFunction.bind(this)
+      'invoke:invoke': this.invoke.bind(this)
     };
   }
+
+  private async invoke() {
+    const func = this.options.function;
+    const functionObject = this.serverless.service.getFunction(func);
+    const eventType = Object.keys(functionObject['events'][0])[0];
+
+    if (!this.options['data']) {
+      this.options['data'] = {};
+    }
+
+    return this.provider.invoke(func, eventType, this.options['data']);
+  }
 }

src/plugins/login/loginPlugin.ts

@@ -1,6 +1,6 @@
-import * as Serverless from 'serverless';
 import * as open from 'open';
 import { interactiveLoginWithAuthResponse, loginWithServicePrincipalSecretWithAuthResponse } from '@azure/ms-rest-nodeauth';
+import * as Serverless from 'serverless';
 import AzureProvider from '../../provider/azureProvider';
 
 export class AzureLoginPlugin {
@@ -11,11 +11,16 @@ export class AzureLoginPlugin {
     this.provider = (this.serverless.getProvider('azure') as any) as AzureProvider;
 
     this.hooks = {
-      'before:deploy:initialize': this.login.bind(this)
+      'before:package:initialize': this.login.bind(this)
     };
   }
 
-  async login() {
+  private async login() {
+    // If credentials have already been set then short circuit
+    if (this.serverless.variables['azureCredentials']) {
+      return;
+    }
+
     this.serverless.cli.log('Logging into Azure');
 
     let authResult = null;
@@ -28,7 +33,8 @@ export class AzureLoginPlugin {
     try {
       if (subscriptionId && clientId && secret && tenantId) {
         authResult = await loginWithServicePrincipalSecretWithAuthResponse(clientId, secret, tenantId);
-      } else {
+      }
+      else {
         await open('https://microsoft.com/devicelogin');
         authResult = await interactiveLoginWithAuthResponse();
       }

src/plugins/logs/azureLogs.ts

@@ -1,18 +1,21 @@
 import * as Serverless from 'serverless';
-import { retrieveLogs } from './lib/retrieveLogs';
+import AzureProvider from '../../provider/azureProvider';
 
 export class AzureLogs {
   public hooks: { [eventName: string]: Promise<any> };
-  private retrieveLogs: () => Promise<any>;
 
-  constructor(private serverless: Serverless, private options: Serverless.Options) {
-    Object.assign(
-      this,
-      retrieveLogs
-    );
+  private provider: AzureProvider;
 
+  constructor(private serverless: Serverless, private options: Serverless.Options) {
+    this.provider = (this.serverless.getProvider('azure') as any) as AzureProvider;
+
     this.hooks = {
       'logs:logs': this.retrieveLogs.bind(this)
     };
   }
+
+  private async retrieveLogs() {
+    await this.provider.pingHostStatus(this.options.function);
+    await this.provider.getLogsStream(this.options.function);
+  }
 }